Commit graph

6215 commits

Author SHA1 Message Date
Lucas Nicodemus
0bebe3820a
Reorder changelog 2022-11-27 23:50:55 -08:00
Lucas Nicodemus
10268bb196
Merge remote-tracking branch 'sgk/bombfix' into general-devel 2022-11-27 23:49:16 -08:00
Lucas Nicodemus
faed064b50
Merge remote-tracking branch 'deathcradle/tshock-installer' into general-devel 2022-11-27 23:46:27 -08:00
Lucas Nicodemus
d0262656df
Merge remote-tracking branch 'origin/config/WorldTileProvider' into general-devel 2022-11-27 23:46:18 -08:00
Lucas Nicodemus
bf06a17c19
Merge remote-tracking branch 'drunderscore/fix/more-add-player-buff-whitelists' into general-devel 2022-11-27 23:44:31 -08:00
SGKoishi
b57d02094f
Fix Utils.GetByName add duplicate candidate for same target i18n 2022-11-27 22:30:40 -08:00
SGKoishi
d2037a62e5
Allow more tile and wall conversion 2022-11-27 21:14:13 -08:00
Luke
b24fd4fe43 Merge remote-tracking branch 'upstream/general-devel' into config/WorldTileProvider 2022-11-27 15:16:32 +10:00
Luke
c600966a75
Merge branch 'Pryaxis:general-devel' into tshock-installer 2022-11-27 15:08:07 +10:00
James Puleo
5cc1275496
Update docs/changelog.md 2022-11-26 21:14:49 -05:00
James Puleo
51de32387a
Improve rejection message and code duplication in OnPlayerBuff
There is now a local function `Reject` that will handle logging,
rejecting, and (optionally) re-syncing upon a rejected packet.

Alongside this, the debug message has been improved to include the
sender index, buff type, receiver index, and the time in ticks (and the
existing reason for rejection.)
2022-11-26 21:14:30 -05:00
James Puleo
71a480af6b
Whitelist Shadow Candle and BoC for PlayerAddBuff 2022-11-26 21:14:28 -05:00
Lucas Nicodemus
106f735559
Merge pull request #2791 from sgkoishi/patch-buffnpc-i18nconsistency
Use same logic for all GetByNameOrId
2022-11-26 20:41:16 -05:00
Lucas Nicodemus
e498d6685b
Merge branch 'general-devel' into patch-buffnpc-i18nconsistency 2022-11-26 20:38:09 -05:00
Lucas Nicodemus
6421c7623a
Version tick: 5.1.3 2022-11-24 23:58:45 -07:00
Luke
e561158699 Remove installers sdk archive when archive fails
This will allow the next run to redownload the file.
2022-11-24 16:19:39 +10:00
Luke
403677fad2 Embed symbols in the installer to remove .pdb 2022-11-22 16:44:24 +10:00
Luke
fbd82bbce8 Prevent installer from closing via ctrl+c while server remains open
This allows tshock to handle CancelKeyPress as per normal, instead of closing the parent process, leaving the second trigger to never be reached.
see https://github.com/Pryaxis/TShock/blob/general-devel/TShockAPI/TShock.cs#L710
2022-11-22 16:40:39 +10:00
Luke
9550631064 Fix TShock Installer version being written to console
v5 not v6...
2022-11-21 12:23:22 +10:00
Luke
d84c14fc58 Remove TShock.Server.dll reference 2022-11-21 08:44:37 +10:00
Luke
4277fbaa98 Add architecture variants to tshock installer 2022-11-21 08:43:54 +10:00
SGKoishi
3c6521caff
Fix Digging Molecart and Bomb Fish blocked 2022-11-20 12:27:14 -08:00
Luke
3dcc738a17
Merge branch 'Pryaxis:general-devel' into tshock-installer 2022-11-18 22:53:43 +10:00
Lucas Nicodemus
3af5c33c73
Merge pull request #2837 from Pryaxis/renovate/otapi-things
Update OTAPI things
2022-11-17 23:55:57 -05:00
renovate[bot]
7afd866644
Update OTAPI things 2022-11-17 21:26:07 +00:00
Luke
45a378b0f0 Add TShock.Installer to download dotnet runtime
This will include a new ./TShock.Installer executable that will be for users without the dotnet runtime. This program will download the dotnet runtime, extract it, and then run ./TShock.Server for them using the downloaded runtime.

Note: only tested on osx, likely a no-go for linux/windows until more testing occurs.
2022-11-17 00:27:14 +10:00
Stargazing Koishi
d236653559
Merge branch 'general-devel' into patch-buffnpc-i18nconsistency 2022-11-11 18:58:00 -08:00
Luke
b8afcd874d Add ToLower to WorldTileProvider switch
Allows "room for error in capitalization" as per review discussion.
2022-11-12 10:03:42 +10:00
Luke
0f46b1255a Add WorldTileProvider to tshock config
This allows the tshock tile providers to be switched via the config instead of cli args via tsapi, for environments where the command line args cannot be changed.
2022-11-12 07:28:26 +10:00
Luke
5d84192624
Merge pull request #2831 from Pryaxis/renovate/otapi-things
Update TerrariaServerAPI digest to 5ed35f3
2022-11-12 07:12:21 +10:00
renovate[bot]
5531832b1a
Update TerrariaServerAPI digest to 5ed35f3 2022-11-11 11:32:55 +00:00
Lucas Nicodemus
c8cb747c57
Version tick: 5.1.2 2022-11-10 14:15:20 -08:00
Lucas Nicodemus
736e535db2
Merge pull request #2825 from Pryaxis/renovate/otapi-things
Update OTAPI things
2022-11-10 14:01:52 -08:00
renovate[bot]
6f8d434ef1
Update OTAPI things 2022-11-10 21:12:20 +00:00
Stargazing Koishi
7a49d61761
Merge branch 'Pryaxis:general-devel' into patch-buffnpc-i18nconsistency 2022-11-10 02:23:30 -08:00
Lucas Nicodemus
3ad573855b
Version tick 5.1.1 2022-11-10 00:46:05 -08:00
Cardinal System
111c7925ac
Update translation template 2022-11-10 08:27:06 +00:00
Lucas Nicodemus
15c8bf8436
Fix bug from i18nification
Wrong paren match
2022-11-10 00:25:45 -08:00
Stargazing Koishi
1db4e5e20b
Merge branch 'general-devel' into patch-buffnpc-i18nconsistency 2022-11-10 00:13:35 -08:00
SGKoishi
2f1420faef
Update 1.4.4.8 2022-11-10 00:10:38 -08:00
SGKoishi
fb96d8b0c8
Merge upstream 2022-11-10 00:09:40 -08:00
Lucas Nicodemus
ea96b3dc70
Version tick: 5.1.0 2022-11-10 00:09:39 -08:00
Lucas Nicodemus
0da713a49f
Bump TSAPI to release version 5.1.0 2022-11-09 23:33:51 -08:00
Lucas Nicodemus
09b1e86c0c
Fix build due to outdated PR merge lol 2022-11-09 23:24:39 -08:00
Lucas Nicodemus
41c4e541b8
Update changelog 2022-11-09 23:21:25 -08:00
Lucas Nicodemus
01917d48ed
Merge remote-tracking branch 'sgk/pr2811' into general-devel 2022-11-09 23:20:19 -08:00
Lucas Nicodemus
ea86ce94c2
Fix changelog 2022-11-09 23:18:03 -08:00
James Puleo
50e55cafab
Update docs/changelog.md 2022-11-09 23:18:03 -08:00
James Puleo
ad9c9cccce
Properly remove all buffs in PlayerData.RestoreCharacter
This was previously using the constant `22` directly, instead of
`Player.maxBuffs`, which is now `44`. This theoretically allowed players
to smuggle buffs on to servers with SSC enabled, by using buff indexes
past `22`.
2022-11-09 23:18:03 -08:00
James Puleo
5a72121200
Only restrict CC'd players during login whilst SSC is enabled
The player being CC'd does not cause any issues for us if SSC isn't
enabled, so we can relax it's restriction.

This also allows the `RequireLogin` config option to function usefully
again, as it would disable the player, causing them to be CC'd until
they logged in, creating a vicious cycle.
2022-11-09 23:18:03 -08:00