Commit graph

5001 commits

Author SHA1 Message Date
Chris
de390a6ad2
Merge pull request #1667 from Pryaxis/backport-verison-tick
Backport (frontport) version number from future master to gen-dev
2019-04-01 14:15:59 +10:30
Chris
9f4892fff4
Merge pull request #1668 from Pryaxis/v4.3.26
Update to version 4.3.26
2019-04-01 13:54:09 +10:30
Chris
3583fd6668
Merge branch 'general-devel' into backport-verison-tick 2019-04-01 13:43:10 +10:30
Chris
bc06c18fec
Merge pull request #1669 from Pryaxis/update-sqlite-binaries
Update to 32bit sqlite 3.27.2 binaries
2019-04-01 13:41:05 +10:30
Chris
db0fcbd30b Update changelog 2019-04-01 13:35:53 +10:30
Chris
098430255b Update create_release.py to point to Newtonsoft 10.0.3 2019-04-01 12:02:23 +10:30
Chris
c86c1b9b0d Update submodule 2019-04-01 11:41:03 +10:30
Lucas Nicodemus
1c563dfe2d Update to 32bit sqlite 3.27.2 binaries 2019-03-31 13:15:30 -07:00
Lucas Nicodemus
ae2056ae83
Merge branch 'general-devel' into update-sqlite-binaries 2019-03-31 13:14:16 -07:00
Lucas Nicodemus
abe67c9fa0 Update changelog 2019-03-31 13:12:37 -07:00
Lucas Nicodemus
2aecedca95 Update to 32bit sqlite 3.27.2 binaries 2019-03-31 12:49:38 -07:00
Chris
ad28771e2c Update players when they die to hopefully stop their items floating at their grave 2019-03-30 16:31:20 +10:30
Chris
34a4ef3b7d Remove healing when disabled 2019-03-30 16:25:30 +10:30
Chris
29fb74e578 Add a check for NPC Item strike packets (solves #1651) 2019-03-30 16:02:50 +10:30
Chris
1dc320dbae Update to Newtonsoft JSON v10.0.3 for parity with OTAPI/TSAPI 2019-03-30 15:47:14 +10:30
Chris
42fb0b10f4 Add bounds checking for packet 51, type = 4 2019-03-30 15:46:46 +10:30
Chris
ac02468038 Update dead packets 2019-03-30 15:09:40 +10:30
Lucas Nicodemus
60f0c3c9df
Merge branch 'general-devel' into backport-verison-tick 2019-03-29 20:45:16 -07:00
Chris
db9ce8180d
Merge pull request #1623 from Pryaxis/player-data
Initialize PlayerData on connect
2019-03-30 14:14:13 +10:30
Lucas Nicodemus
f30f44d00d
Merge branch 'general-devel' into backport-verison-tick 2019-03-29 20:41:51 -07:00
Chris
9b75342bff
Merge branch 'general-devel' into player-data 2019-03-30 13:58:19 +10:30
Chris
b50cac1d2f
Merge pull request #1654 from Pryaxis/fix-1653
Solves #1653
2019-03-30 13:57:59 +10:30
Chris
f3627bb45a
Merge branch 'general-devel' into fix-1653 2019-03-30 13:52:25 +10:30
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
eeeea004b8
Merge pull request #1666 from Pryaxis/remove-tracker-backport
Backport removal of stat tracker to master branch
2019-03-30 13:47:08 +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
fec0d80be6 Verison Tick: TShock 4.3.26 2019-03-29 17:47:17 -07:00
Lucas Nicodemus
f3e33b7ad7 Remove the stat tracker
The stat tracker has been offline for the last several weeks/months and
nobody has done anything to fix that. Because of that, GDPR, and the
fact that we haven't used it, we're discarding it.
2019-03-29 17:46:44 -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