Commit graph

5775 commits

Author SHA1 Message Date
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
shell
add6c4cbee
Merge branch 'Pryaxis:general-devel' into general-devel 2022-01-03 20:03:19 +06: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
Lucas Nicodemus
f9bfd671b0 Update changelog 2021-12-09 20:11:35 -08:00
Lucas Nicodemus
fe25f8b3b2 Remove monomod dev build shims
This removes shims in-place to fetch monomod from outside of nuget,
since monomod has pushed the applicable versions to their primary nuget
repositories, and because the dev builds add unnecessary complexity to
the CI pipeline if kept in place.
2021-12-09 20:06:31 -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
e9b86b8f62
Improved the /grow command to reduce code duplication, use TileID
constants for less ambiguous types.
2021-12-07 03:12:39 -05: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
shell627
6155b31778 Merge remote-tracking branch 'upstream/general-devel' into general-devel 2021-12-03 15:40:37 +06:00
Luke
f9ab45b571 CI - tar release to preserve permissions
Hopefully...
2021-12-03 10:38:30 +10:00
Luke
dbad25894e Remove build.yml + try and implement chmod in otapi3 ci 2021-12-03 08:06:07 +10:00
Luke
2c44f71043 CI upload artifacts + set tshock version to beta 2021-12-03 07:47:45 +10:00
Luke
f54c4eb0a1 Publish launcher only 2021-12-03 07:35:43 +10:00
Zoom L1
77ded28826
Corrected customDeathReason in OnPlayerDamage
Previously it was called for absolutely any damage from the player.
2021-12-02 22:13:25 +07:00
Luke
ab676d5bc9
Correct ci matrix
Nothing to see here...
2021-12-03 00:28:14 +10:00
Luke
a9f0aa1219
Add recursive checkout option to ci 2021-12-03 00:20:51 +10:00
Luke
2c36dacfd2 Single file publish support, test project and simple build CI
This also adds remote raspberry pi debugging with default install details. More testing is required as MonoMod may not be working for arm64 still

CI might not work yet either
2021-12-03 00:07:11 +10:00
Lucas Nicodemus
ce056f1ce5 Merge remote-tracking branch 'agaspace/general-devel' into general-devel 2021-12-01 22:59:04 -08:00
Luke
c159f2b388 Add newline to TShock.sh + add linux-arm64 to launcher release 2021-12-02 15:55:26 +10:00
AkjaHAsLk1IALk0MasH
823293ed43 Updated code comments 2021-12-02 10:03:36 +07:00
Luke
9a2aa5e825 Add ubuntu runtime identifier 2021-12-01 21:14:34 +10:00