themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions
6402 commits 1 branch 1 tag 88 MiB
Commit graph

4421 commits

Author SHA1 Message Date
Chris
4aa75fe023
Add suggestion 
Co-authored-by: Lucas Nicodemus <shank@shanked.me>
 2022-02-22 19:15:58 +10:30
Chris
ed12236c52
Merge branch 'general-devel' into feature/grow-code-dupe 2022-02-22 18:51:01 +10:30
Lucas Nicodemus
4cb6a5eb4b Really version tick to 4.5.13 this time. 2022-02-16 19:55:06 -08:00
Lucas Nicodemus
6591b455fc Version tick: 4.5.13 2022-02-16 19:45:57 -08:00
Lucas Nicodemus
78169c87cb Merge remote-tracking branch 'origin/general-devel' into otapi3 2022-02-16 18:44:33 -08:00
0x3fcf1bbd
c6b04053a3
Removed clamping as the game does it itself. 2022-02-16 12:12:50 +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
0x3fcf1bbd
874b3b2746 Reverted STS change, added STSC, fixed STS/STSC usage. 2022-02-01 16:00:05 +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
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
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
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
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
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
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
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
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
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
2c44f71043 CI upload artifacts + set tshock version to beta 2021-12-03 07:47:45 +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
Lucas Nicodemus
ce056f1ce5 Merge remote-tracking branch 'agaspace/general-devel' into general-devel 2021-12-01 22:59:04 -08:00
AkjaHAsLk1IALk0MasH
823293ed43 Updated code comments 2021-12-02 10:03:36 +07:00
tru321
0b1da29cf8
Update GetDataHandlers.cs 2021-12-01 14:35:02 +08:00
tru321
a2a13ce494
Added DataHandler for NpcTalk 
This should stopping unregistered and logged out players to interact with NPC. Which prevent them smuggling or duplicating items via NPC items slot.
 2021-12-01 13:44:41 +08:00
Luke
2b4b6353c2 Add TShock Launcher project (TShock.exe) with ./bin folder for dependencies 
+ submodule update
TODO: retest on osx and see if we can include file permissions
 2021-12-01 08:26:06 +10:00
shell627
acb6a96245 Fix item dupe via /logout & NPC (#2495 issue) 2021-12-01 00:18:02 +06:00
AkjaHAsLk1IALk0MasH
a00512fcf4 Added protection to OnPlayerDamage 2021-11-30 21:14:53 +07:00
AkjaHAsLk1IALk0MasH
cdeec8aa04 Added protection in OnKillMe 2021-11-30 20:53:19 +07:00
AkjaHAsLk1IALk0MasH
8f69c6e767 Created a new field in config. 2021-11-30 20:50:51 +07:00
Chris
9b18dc5d59
Merge branch 'general-devel' into general-devel 2021-11-30 18:23:38 +10:30
AkjaHAsLk1IALk0MasH
df5c118055 Added comments to help other developers understand what I used and why 2021-11-30 14:36:19 +07:00
AkjaHAsLk1IALk0MasH
77032ccbea Renamed value in config 2021-11-30 14:23:49 +07:00
AkjaHAsLk1IALk0MasH
1a62d1dfed Added ai[0] check 2021-11-30 14:22:41 +07:00
Lucas Nicodemus
f3f0fc8886 Version tick: 4.5.11 2021-11-29 21:26:31 -08:00
AkjaHAsLk1IALk0MasH
6cec7e71cd Fixed the ability to spawn Zenith projectile with non-original items. 2021-11-28 15:35:50 +07:00