Commit graph

4690 commits

Author SHA1 Message Date
Chris
9900ce7d9d
Merge pull request #1957 from moisterrific/patch-10
Add more bosses to /spawnboss
2020-06-01 19:07:58 +09:30
Chris
2edfef0dfe
Merge branch 'general-devel' into patch-10 2020-06-01 19:04:45 +09:30
Chris
a049c6488f
Merge pull request #1943 from Pryaxis/fishoutnpc-event
Fishoutnpc event
2020-06-01 19:03:43 +09:30
Chris
26aac0dab9
Merge branch 'general-devel' into fishoutnpc-event 2020-06-01 18:58:06 +09:30
Lucas Nicodemus
62ff490470
Merge pull request #1951 from Olink/fix-bugs
Fix rope coils.
2020-06-01 02:21:31 -07:00
Lucas Nicodemus
dff5f043aa
Merge branch 'general-devel' into fix-bugs 2020-06-01 02:21:21 -07:00
Chris
d72a92ef9e
Merge pull request #1965 from Pryaxis/fix-sts
Fix sts
2020-06-01 18:42:24 +09:30
Chris
3eb91bf0e8 Update changelog 2020-06-01 18:38:31 +09:30
Chris
9fb27543b9 Some refactoring from feedback 2020-06-01 18:35:58 +09:30
Chris
0770e3d125 Comment out dangerous debug code 2020-06-01 16:42:11 +09:30
Chris
e030d54bd6 Fix trapdoors too 2020-06-01 16:40:34 +09:30
Chris
8ed6751747 Update changelog 2020-06-01 15:27:52 +09:30
Chris
e658af32ef merge general-devel into fix-sts 2020-06-01 15:21:55 +09:30
Chris
36089d96bb Fix doors for real this time.
Should also fix tile entities (such as item frames, pylons) and other tile objects.
Further, fixes a longstanding issue with SendTileSquare that resulted in half squares being sent instead of full squares, causing visual bugs and desyncs most noticeable with doors
2020-06-01 15:12:45 +09:30
Lucas Nicodemus
6ca9a98a91
Bump max player damage to 42,000 for empress of light
Based on feedback from #1936, empress of light needs to do more damage,
so we're going to boost it to a higher arbitrary number than it was
before.
2020-05-31 13:11:01 -07:00
Patrikkk
1398b1e079
Merge branch 'general-devel' into fishoutnpc-event 2020-05-31 15:52:59 +02:00
Lucas Nicodemus
1a35713e3e
Update changelog for PR 9 2020-05-31 00:46:13 -07:00
Lucas Nicodemus
ac76ccf589
Fix doors in the lamest way possible (!)
Fixes #1774.

This commit is designed to fix the clientside door desync issue. Based
on the order of events that I've been able to see, the way that door
opening works is like this:

1. Client sends a door open request.
2. Server echoes request back to client.
3. Both server and client simulate door opening.
4. The client that requests the initial door open sends a tile square to
the server for some reason.

In TShock, under all circumstances, we send a tile square back to the
client that sends one in, unless you have the
`tshock.ignore.sendtilesquare` permission. This adds a deviation: it
does not network data back if the event is just a door change. Doing
this is safe from the perspective of actual gameplay. A previous
iteration of this commit synchronized data to other clients, but that
seemed superfluous.

This does not really solve the underlying problem or answer the question
as to why sending a tile square back to the client seems to throw it
off, but it does. I was not able to replicate the desync issue anymore
with this branch. I expect that it will be safe to keep, because the
improved logic will only happen if the tile square had no effective
changes in addition to the door changes.
2020-05-31 00:40:03 -07:00
Lucas Nicodemus
3f0e51080b
Merge pull request #1880 from sgkoishi/general-devel
Optimize workflow
2020-05-30 16:21:20 -07:00
Lucas Nicodemus
38d99de060
Merge branch 'general-devel' into general-devel 2020-05-30 16:11:22 -07:00
Stargazing Koishi
770d17c236
Update .github/workflows/build.yml
Co-authored-by: Lucas Nicodemus <shank@shanked.me>
2020-05-30 16:07:12 -07:00
SGKoishi
a815b7556d
Upload artifacts with condition 2020-05-30 15:21:50 -07:00
moisterrific
1cb72718c2
Add more bosses to /spawnboss
Add more bosses that has health bars/map icons to the command parameters. Added Lunatic Cultist to /spawnboss "all". Did not include Dark Mage or Ogre bosses since they have two different tier versions. Also added some abbreviations to existing bosses.
2020-05-30 17:57:16 -04:00
SGKoishi
0932cc821a
Split workflow into Debug and Release 2020-05-30 14:11:19 -07:00
Zack
c999b4305c
Remove Console debug output. 2020-05-30 11:58:59 -04:00
Olink
96c7453b33 Merge branch 'general-devel' of github.com:Pryaxis/TShock into fix-bugs 2020-05-30 11:54:09 -04:00
Patrikkk
9a49f6ad15
Merge branch 'general-devel' into fishoutnpc-event 2020-05-30 10:53:51 +02:00
Patrikkk
791a6be831
Add additional FoodPlatter event check. Update range check. (#1941)
This is a combination of 3 commits:

* @Olink was right. Adding additional check. Modifying range check.

There are two ways to place food into a plate. One is by having it in hand (mouse) and right clicking, the other is by having the item selected in the... "inventory bar"(?) and right clicking the plate.

Tested range, if player is outside the range, they should not get their item back.

* FoodPlatterHotfix - Update IsInRange range value.

To suggestion of Olink, to consider player lag and increase the range check.

Co-authored-by: Lucas Nicodemus <shank@shanked.me>
2020-05-30 00:39:40 -07:00
Lucas Nicodemus
b6ab552d50
Merge pull request #1950 from Olink/general-devel
Update GetDataHandlers ExtraValue packet handling.
2020-05-30 00:36:23 -07:00
Lucas Nicodemus
01e3f9c58d
Merge branch 'general-devel' into general-devel 2020-05-30 00:32:57 -07:00
Lucas Nicodemus
b199944f83
Merge pull request #1928 from moisterrific/patch-8
Updated changelog for prior changes from @moisterrific
2020-05-30 00:31:37 -07:00
Lucas Nicodemus
52365078b6
Remove extra space from sentence in changelog 2020-05-30 00:28:40 -07:00
Lucas Nicodemus
41a649ce3e
Merge branch 'general-devel' into patch-8 2020-05-30 00:27:35 -07:00
Lucas Nicodemus
a31531ed71
Merge pull request #1927 from moisterrific/patch-7
Add journey permissions to owner
2020-05-30 00:25:47 -07:00
Lucas Nicodemus
a0726ad8bb
Merge branch 'general-devel' into patch-7 2020-05-30 00:18:44 -07:00
Lucas Nicodemus
0715ac6fbc
Merge pull request #1924 from moisterrific/patch-6
Update /spawnboss to include the 2 new bosses
2020-05-30 00:18:05 -07:00
Lucas Nicodemus
efeb8b6167
Merge branch 'general-devel' into patch-6 2020-05-30 00:11:18 -07:00
Lucas Nicodemus
b98267b795
Merge pull request #1922 from moisterrific/patch-5
Update NPCAddBuff to include Sparkle Slime debuff

It looks like this exception is required and is separate from the other exemption we had. In particular, this enables the debuff to work on town NPCs, which aren't hostile.
2020-05-30 00:09:43 -07:00
Lucas Nicodemus
61e7d10941
Merge branch 'general-devel' into patch-5 2020-05-30 00:02:27 -07:00
Lucas Nicodemus
f82ab41a25
Add /sync command to alleviate door related sadness
Run /sync if your doors disappear. This will resync your local client
with the server state. For more information, please see the associated
changelog entry.
2020-05-29 21:04:48 -07:00
Lucas Nicodemus
44ad2d2eff
Remove extra debug info from OnGetData
Per packet debug logs are redundant for people with the packet monitor
plugin. If you need packet monitoring, please install the packet monitor
plugin.
2020-05-29 19:52:03 -07:00
Olink
4dd786129c Update changelog. 2020-05-29 17:04:38 -04:00
Olink
6355f2d9ea Merge branch 'general-devel' of github.com:Pryaxis/TShock into fix-bugs 2020-05-29 17:04:00 -04:00
Olink
50337a1d2f Add support for all rope coil types. 2020-05-29 17:03:48 -04:00
Olink
7d46722407 Update changelog. 2020-05-29 16:47:43 -04:00
Olink
fd6913f7df Update GetDataHandlers ExtraValue packet handling to match the network protocol.
Update the validation logic to be accurate:
  * use pixels and not tiles
  * allow master mode
  * use npc position and not player position
Cleanup some style inconsistencies in NetHooks_SendData.
2020-05-29 16:44:03 -04:00
Lucas Nicodemus
0c3242a6f5
Tuned changelog 2020-05-29 10:56:40 -07:00
Patrikkk
47dd4a4345 FishOutNPC - Simplify bouncer logic. Fix check in event. 2020-05-29 12:00:33 +02:00
Chris
4e5533ff64
Merge pull request #1946 from Pryaxis/fix-tile-read-bugs
Fixes some bugs with reading tiles via NetTile & SendTileSquare
2020-05-29 17:23:19 +09:30
Chris
cdeac344b8
Update CHANGELOG.md 2020-05-29 17:18:11 +09:30