Commit graph

4375 commits

Author SHA1 Message Date
Chris
59058657cf
Merge pull request #1657 from tysonstrange/general-devel
Added confused debuff for Brain of Confusion
2019-03-30 13:49:32 +10:30
Chris
1ae2e34128
Merge branch 'general-devel' into player-data 2019-03-30 13:47:33 +10:30
Chris
76eeab1090
Merge branch 'general-devel' into fix-1653 2019-03-30 13:46:12 +10:30
Chris
429a5051fd
Merge branch 'general-devel' into general-devel 2019-03-30 13:36:28 +10:30
Ziteng Wang
5fd6280bc8
Merge pull request #1665 from Pryaxis/update-copyright-again
Update copyright to 2019
2019-03-29 18:12:19 -07:00
Lucas Nicodemus
6fce167c10 Verison Tick: TShock 4.3.26 2019-03-29 17:51:35 -07:00
Lucas Nicodemus
79f142f908 Change current TShock codename to "Zombie"
This change incorporates feedback from #1661 which indicates
that we should update the source code when changing copyright
dates.
2019-03-29 17:27:34 -07:00
Lucas Nicodemus
70dd72443d Update copyright to 2019 again
Fixes #1658, most likely.
2019-03-29 17:16:37 -07:00
Tyson Strange
6315086cb1 Added to Bouncer NPCAddBuffTimeMax for Solar Eruption Item ID: 3473, Daybreak Item ID: 3543 2019-02-03 17:41:23 +10:00
Tyson Strange
dbf9264d12 update change log 2019-02-03 17:19:52 +10:00
Tyson Strange
12c34256ac Added confused debuff for Brain of Confusion 2019-02-03 15:56:43 +10:00
Tyson Strange
2440e044b1 Added confused debuff for Brain of Confusion 2019-02-03 15:55:19 +10:00
Chris
550967b430
Merge branch 'general-devel' into player-data 2018-12-24 13:57:10 +10:30
Chris
10d7a4f35b
Update CHANGELOG.md 2018-12-24 13:56:47 +10:30
Chris
9975c445f8
Proposed fix for #1653 - Testing required
From #1653:
>From latest version (2301)
If a player puts on a banned peice of armour, they get the message to say "You are wearing banned equipment"
After they take it off, the messages stop, but they keep getting disabled.
Solution:
Approx line 1131 in tShock.cs on `OnSecondUpdate` the `tsplayer.IsDisabledForBannedWearable` gets set to true, but it never gets set to false.
Change:
```csharp
if (check != "none")
player.IsDisabledForBannedWearable = true;
```
>To:
```csharp
if (check != "none")
player.IsDisabledForBannedWearable = true;
else
player.IsDisabledForBannedWearable = false;
```

Requires testing
2018-12-24 13:54:39 +10:30
Lucas Nicodemus
da645ccaf5
Merge pull request #1648 from AxeelAnder/proj-disable-reason
Concrete information when player disabled by creating banned projectile
2018-10-31 15:22:20 -07:00
AxeelAnder
eae1ba5a5c concrete reason when create banned projectile 2018-10-31 18:02:53 +08:00
Lucas Nicodemus
facbe3fbc2
Merge pull request #1645 from AxeelAnder/sort-out
Sorted Bouncer and GetDataHandlers, ordered by packet type enum value
2018-10-27 09:09:13 -07:00
AxeelAnder
210c95e5b1 sorted Bouncer and GetDataHandlers, ordered by packet type enum value 2018-10-26 14:06:46 +08:00
Ziteng Wang
0d3abc512a
Merge pull request #1644 from AxeelAnder/player-zone
Added PlayerZone handler and bouncer, detect lunar towers cheat
2018-10-25 22:58:43 -07:00
AxeelAnder
b2033d9eac update changelog 2018-10-25 22:10:33 +08:00
AxeelAnder
124ca19393 Merge branch 'player-zone' of https://github.com/AxeelAnder/TShock into player-zone 2018-10-24 15:58:55 +08:00
AxeelAnder
42e413012d added filter: only check when zones contains towers 2018-10-24 15:56:24 +08:00
Axeel
2332861cc8
Merge branch 'general-devel' into player-zone 2018-10-23 17:58:02 +08:00
AxeelAnder
2ea9a0161b added PlayerZone handler and bouncer, detect lunar towers cheat 2018-10-23 17:22:59 +08:00
Ziteng Wang
4747c27458
Merge pull request #1643 from Pryaxis/improve-config-doc
Improve ConfigFile Documentation (XML Comments / Description Tags)
2018-10-21 13:15:57 -07:00
Rodrigo Rente
944cac1fd3
Update CHANGELOG.md 2018-10-21 20:12:59 +01:00
Enerdy
f6590ab509 Merge branch 'general-devel' of https://github.com/Pryaxis/TShock into improve-config-doc 2018-10-21 19:54:21 +01:00
Enerdy
447d801dbc Clean up xml comments and descriptions in ConfigFile.cs
Remove property name from start of xml comments
xml comments now almost always match the property's description
Improve grammar in both comments and descriptions overall
2018-10-21 19:52:46 +01:00
Ziteng Wang
e14af631e8
Merge pull request #1642 from AxeelAnder/npc-buff-bouncer
Add cheat detection on NPCAddBuff
2018-10-20 22:02:19 -07:00
AxeelAnder
f715d91dc6 disable -> kick 2018-10-21 11:01:08 +08:00
Lucas Nicodemus
e9372be276 Rename cheat var to detectedNPCBuffTimeCheat. 2018-10-20 09:14:38 -07:00
AxeelAnder
6efa0d2bb6 better code 2018-10-20 20:21:18 +08:00
AxeelAnder
b9dedd77dc add some anti-cheat code 2018-10-20 18:39:24 +08:00
AxeelAnder
fc38521dbd add NPCAddBuff bouncer 2018-10-20 18:39:07 +08:00
AxeelAnder
87915b70b0 add ignoreNpcAddBuffPermission 2018-10-20 18:38:44 +08:00
AxeelAnder
6b8f346868 add NPCAddBuff GetDataHandler 2018-10-20 18:29:11 +08:00
AxeelAnder
bcbea04002 update changelog 2018-10-20 18:29:11 +08:00
Hussein Farran
56f3db6927
Merge pull request #1640 from Pryaxis/deleted-users-go-guest
Deleted users go guest
2018-10-15 22:21:51 -04:00
Rodrigo Rente
659e1ebd61
Update CHANGELOG.md 2018-10-15 15:20:21 +01:00
Enerdy
f5ccf925bd Logout players when their user account is removed 2018-10-15 14:33:32 +01:00
Lucas Nicodemus
ce6dc577cb Reorder changelog for consistency 2018-10-04 07:49:37 -07:00
Hussein Farran
18fe7f8412
Merge pull request #1638 from pandabear41/update-tls
Update Manager now uses TLS.
2018-10-03 20:31:10 -04:00
Lucas Nicodemus
2a5e19da39
Merge branch 'general-devel' into player-data 2018-10-02 20:37:56 -07:00
Chris Nord
207925ddf1 Update Manager now uses TLS.
Solves issue #1633
2018-10-02 16:35:46 -07:00
Lucas Nicodemus
f02545f7f6
Merge pull request #1635 from deadsurgeon42/user-friendly-duplicate-user
User friendly duplicate user message when trying to /user add a user that already exists
2018-09-24 09:02:13 -07:00
Ruby Rose
e8cf8879f4 added changelog entry 2018-09-23 14:33:41 +03:00
Ruby Rose
4df8a6f38f add another case to the exception message regex 2018-09-23 14:29:59 +03:00
Chris
e08ba6b362
Update README.md
Re-add discord
2018-08-17 00:45:58 +09:30
Chris
825e7fe3a3
Update README.md
Discord -> telegram
2018-07-24 21:38:03 +00:00