Commit graph

5435 commits

Author SHA1 Message Date
Lucas Nicodemus
78169c87cb Merge remote-tracking branch 'origin/general-devel' into otapi3 2022-02-16 18:44:33 -08:00
Lucas Nicodemus
5820c5344e
Add SignatureBeef (nee DeathCradle) to funding.yml 2022-02-16 18:15:23 -08:00
Lucas Nicodemus
bb96f55937
Merge pull request #2552 from 0x3fcf1bbd/general-devel
Fix `TSPlayer.SendTileSquare` not being centered.
2022-02-16 18:12:44 -08:00
0x3fcf1bbd
c6b04053a3
Removed clamping as the game does it itself. 2022-02-16 12:12:50 +01:00
0x3fcf1bbd
354b3d4d3b Merge branch 'Pryaxis-general-devel' into general-devel
Fix file conflict.
2022-02-16 11:52:50 +01:00
0x3fcf1bbd
6922c413be Merge branch 'general-devel' of https://github.com/Pryaxis/TShock into Pryaxis-general-devel 2022-02-16 11:43:06 +01:00
0x3fcf1bbd
9bc936053b
Fixed STR width & length clamping being incorrect.
The main game should however clamp it itself too before sending, so there shouldn't be issues.
2022-02-16 11:32:43 +01:00
Lucas Nicodemus
69f56d1bdd
Merge pull request #2565 from EtherTyper/patch-1
Remove extraneous space in README.
2022-02-14 11:33:40 -08:00
ELI JOSEPH BRADLEY
956b5a5243
Move to correct section of CHANGELOG. 2022-02-14 13:06:34 -06:00
ELI JOSEPH BRADLEY
86527974de
Update CHANGELOG.md 2022-02-14 12:25:31 -06:00
ELI JOSEPH BRADLEY
958913ef13
Remove extraneous space.
Remove space following backslash in multi-line command, causing failure in Bash 5.1.
2022-02-14 12:22:31 -06:00
0x3fcf1bbd
a48bac3631
Updated CHANGELOG.md 2022-02-01 16:06:34 +01:00
0x3fcf1bbd
874b3b2746 Reverted STS change, added STSC, fixed STS/STSC usage. 2022-02-01 16:00:05 +01:00
0x3fcf1bbd
7f0daba593
Updated CHANGELOG.md 2022-01-26 14:23:06 +01:00
0x3fcf1bbd
af99c4cb8d
Fixed STS not being centered.
Inferring from the usage of it, this method was expected by its callers to be a square centered around the given coordinates (x, y), hence this being a fix.
2022-01-26 14:17:27 +01:00
Lucas Nicodemus
401e738950
Merge pull request #2548 from 0x3fcf1bbd/general-devel
Add lanterns night event to `/worldevent`
2022-01-25 22:26:53 -08:00
0x3fcf1bbd
2b64c04b7f
Fixed CHANGELOG.md
Also merged the two "Upcoming changes" headers.
2022-01-23 16:10:43 +01:00
0x3fcf1bbd
fc16495528
Fixed silent support for lanterns world event.
And fixed smol typo.
2022-01-22 13:47:19 +01:00
0x3fcf1bbd
29c6260d79
Fixed permission being ignored for lanterns event. 2022-01-16 17:13:57 +01:00
0x3fcf1bbd
c0ab5ae98f
Updated CHANGELOG.md 2022-01-16 00:00:14 +01:00
0x3fcf1bbd
5e54445818 Added lanterns night event to the worldevent command. 2022-01-15 23:49:37 +01:00
Lucas Nicodemus
8110533ba4 Revert "Update submodule to bump TSAPI for OTAPI3"
This reverts commit ce5ae0618f.
2021-12-12 12:41:02 -08:00
Lucas Nicodemus
ce5ae0618f Update submodule to bump TSAPI for OTAPI3 2021-12-12 12:38:39 -08:00
Lucas Nicodemus
724858b42d Merge branch 'general-devel' into otapi3 2021-12-12 12:36:31 -08:00
Lucas Nicodemus
e42da74f85 Merge remote-tracking branch 'tru321/general-devel' into general-devel 2021-12-12 12:35:13 -08:00
tru321
3ab630e731
Update CHANGELOG.md 2021-12-12 19:13:29 +08:00
tru321
f20ce4aaa9
Update Bouncer.cs 2021-12-10 10:57:56 +08:00
tru321
e0d6252693
Update GetDataHandlers.cs 2021-12-10 10:53:58 +08:00
Lucas Nicodemus
dfaad68106 Merge branch 'general-devel' into otapi3 2021-12-08 22:55:11 -08:00
Lucas Nicodemus
f195edb086 Merge remote-tracking branch 'drunderscore/feature/fix-paint-rejection' into general-devel 2021-12-08 22:54:40 -08:00
Lucas Nicodemus
b231bfb456 Update CI (OTAPI 3) badges in readme 2021-12-07 22:48:41 -08:00
tru321
16f7c876e1
Apply suggestions from code review
Co-authored-by: Lucas Nicodemus <shank@shanked.me>
2021-12-08 14:44:03 +08:00
Lucas Nicodemus
503b1c647b Update AppVeyor CI script for .NET 6 2021-12-07 21:33:58 -08:00
Lucas Nicodemus
deac238ea3 Version tick: 5.0.0 2021-12-07 21:09:04 -08:00
Lucas Nicodemus
c62fca5353 Merge remote-tracking branch 'deathcradle/otapi3' into otapi3 2021-12-07 21:06:48 -08:00
Lucas Nicodemus
d70f715616 Add AppVeyor CI
Because we're adding otapi3 on a different branch it is now necessary to
have the appveyor CI config versioned so that the other branch can have
its own build routine.
2021-12-07 21:02:19 -08:00
tru321
8d54033404
Update CHANGELOG.md 2021-12-08 12:04:47 +08:00
tru321
26a46ef40c
Update Bouncer.cs 2021-12-08 11:48:55 +08:00
tru321
d4befdeff0
Update Bouncer.cs 2021-12-08 11:10:12 +08:00
tru321
bd7b1c1460
Update GetDataHandlers.cs 2021-12-08 11:05:33 +08:00
Luke
0ef79230a6
Update TShockLauncher/Program.cs
Co-authored-by: Lucas Nicodemus <shank@shanked.me>
2021-12-07 18:18:34 +10:00
James Puleo
fe3a59f84a
Fixed rejection check inside of HandlePaintTile to account for the
Paint Sprayer (or Architect Gizmo Pack) being inside your inventory,
rather than on an accessory slot.
2021-12-07 02:42:27 -05:00
Lucas Nicodemus
f3b1a84821 Version tick: 4.5.12 2021-12-06 21:31:03 -08:00
Lucas Nicodemus
47b95e7518 Merge remote-tracking branch 'agaspace/patch-1' into general-devel 2021-12-05 16:32:06 -08:00
Lucas Nicodemus
d50ebfea37 Merge remote-tracking branch 'drunderscore/feature/bouncer-reject-out-of-bounds-npc-talk' into general-devel 2021-12-04 22:35:37 -08:00
Chris
fdcad65d4d
Merge pull request #2529 from drunderscore/feature/bouncer-reject-out-of-bounds-read-sign
Added the `OnSignRead` handler and `SignRead` event, and prevent out of bounds tile access
2021-12-05 14:58:21 +10:30
Zoom L1
5230598ba3
Comments updated 2021-12-04 10:37:16 +07:00
James Puleo
4dab0802a1
Added the OnSignRead handler in GetDataHandlers, and added the
`SignRead` event.

Added check to ensure the sign being read is within world bounds (x >= 0
&& y >= 0 && x < Main.maxTilesX && y < Main.maxTilesY)
2021-12-03 21:11:23 -05:00
James Puleo
97f33fea63
Added check to HandleNpcTalk to ensure the passed NPC index is within
bounds (>= -1 && < `Main.maxNPCs`).
2021-12-03 19:57:46 -05:00
Luke
f9ab45b571 CI - tar release to preserve permissions
Hopefully...
2021-12-03 10:38:30 +10:00