Commit graph

4558 commits

Author SHA1 Message Date
Lucas Nicodemus
7181757dd3
Changelog bot message is more prodding
If people keep ignoring the bot, I'm going to make it block merging too.
2017-12-10 12:26:54 -07:00
Patrikk
740ad4d6c3 Add missing "if handled - return" code. 2017-12-10 20:14:54 +01:00
Lucas Nicodemus
2cfa633df4 Remove commented out code from HandleProjectileKill 2017-12-10 11:26:01 -07:00
Lucas Nicodemus
d3c566db83 Move a large majority of OnPlayerUpdate to Bouncer
I really really don't understand why we're doing Terraria's data
sync for them (see HandlePlayerUpdate). Someone know why?
2017-12-10 10:04:27 -07:00
Lucas Nicodemus
949d0e0ffa More remove notes 2017-12-10 08:56:17 -07:00
Lucas Nicodemus
79802cd9e0 Comment more things in Bouncer 2017-12-10 08:54:32 -07:00
Ryozuki
7d98e3db77 update changelog 2017-12-10 09:39:20 +01:00
Lucas Nicodemus
3e5c1bf0c5 Merge remote-tracking branch 'origin/general-devel' into fragments 2017-12-09 21:06:47 -07:00
Lucas Nicodemus
70052d7dbb
Merge branch 'general-devel' into sql_improve 2017-12-09 21:05:16 -07:00
Chris
edc16f8816
Merge pull request #1537 from Pryaxis/fix-permdump
Fix permission dumping
2017-12-10 14:28:53 +10:30
Chris
ba31d1faab
Merge branch 'general-devel' into fix-permdump 2017-12-10 14:24:27 +10:30
Chris
f689d77a5b
Merge pull request #1532 from Pryaxis/cmdline-fix
Updates the commandline parser to not be broken.
2017-12-10 14:23:33 +10:30
Lucas Nicodemus
c7a04c8e1b Merge branch 'fix-permdump' of github.com:Pryaxis/TShock into fix-permdump 2017-12-09 20:43:09 -07:00
Chris
078bd15300
Merge branch 'general-devel' into cmdline-fix 2017-12-10 14:12:58 +10:30
Lucas Nicodemus
691a368425 Change permission node to tshock.cfg.createdumps 2017-12-09 20:42:47 -07:00
Lucas Nicodemus
434e817b68
Merge branch 'general-devel' into fix-permdump 2017-12-09 19:29:34 -07:00
Lucas Nicodemus
677d15efbb
Merge pull request #1539 from Zaicon/fix-itemdump
Fixed IndexOutOfRange exception
2017-12-09 19:28:38 -07:00
Zaicon
82f53addd7
Update CHANGELOG.md 2017-12-09 20:12:12 -06:00
Zaicon Kiroshu
4638b85adc Fixed IndexOutOfRange exception 2017-12-09 18:48:40 -06:00
Lucas Nicodemus
14c071350c Mark Utils.DumpPemrissionMatrix as internal 2017-12-09 17:15:21 -07:00
Lucas Nicodemus
985dcebda9 Comment what DumpPermissionMatrix does 2017-12-09 17:14:59 -07:00
Lucas Nicodemus
2e64d65910 Modify call to Utils.Dump() from the server context to not stop 2017-12-09 16:09:53 -07:00
Lucas Nicodemus
aa2f040787 Change command /datadump to /dump-reference-data 2017-12-09 16:03:12 -07:00
Lucas Nicodemus
bdabf020d2 tshock.admin.createdumps is now a default owner level permission 2017-12-09 15:58:42 -07:00
Lucas Nicodemus
419b5415da Updated the changelog 2017-12-09 15:57:57 -07:00
Lucas Nicodemus
63179deaa5 Adds /dumpdata which dumps the permission table & ref data. 2017-12-09 15:54:51 -07:00
Lucas Nicodemus
dd7ffe2d3a Move PlayerKillMeV2 anti-crash to Bouncer
Removed PacketTypes.PlayerKillMe since it's out of the protocol.
Removed handler method for PlayerKillMe since it's out of the
	protocol.
Updated changelog to reflect new hook changes.
2017-12-09 13:50:18 -07:00
Ryozuki
1441895559
Merge branch 'general-devel' into sql_improve 2017-12-09 19:04:07 +01:00
Lucas Nicodemus
54c33a5a09 Merge remote-tracking branch 'origin/general-devel' into fragments 2017-12-09 10:33:55 -07:00
Lucas Nicodemus
d937789c15
Merge pull request #1536 from Ryozuki/pr-update-otapi
Update Newtonsoft.Json Fixes #1526
2017-12-09 10:31:42 -07:00
Lucas Nicodemus
436e91c1f1 Change STS to 1 tile for @bartico6's quality of life changes
Since these reverts are on a per-tile basis, we only need to revert
the first block not surrounding ones.

Note: May cause problems with dropped sand because of gravity.
2017-12-09 10:30:20 -07:00
Ryozuki
a146e9bc38 update changelog 2017-12-09 18:25:10 +01:00
Ryozuki
b794fae21d update release script 2017-12-09 18:13:47 +01:00
Ryozuki
6d0a729e5a checkout submodule 2017-12-09 18:09:20 +01:00
Ryozuki
055d25330c update otapi 2017-12-09 17:57:33 +01:00
Edgar Luque
4575792987 Formatted a bit better and moved SqlColumnException to SqlColumn.cs 2017-12-09 16:45:31 +01:00
Lucas Nicodemus
031398591a Merge remote-tracking branch 'origin/general-devel' into fragments 2017-12-09 08:44:49 -07:00
Chris
40616115ac
Merge pull request #1530 from Ryozuki/user_rewrite
Rename TShock.DB.User to TShock.DB.UserAccount
2017-12-10 02:11:38 +10:30
Ryozuki
5770be0ac3
Update CHANGELOG.md 2017-12-09 16:20:52 +01:00
Edgar Luque
83f02e49aa Format better 2017-12-09 16:04:27 +01:00
Ryozuki
d3fadaf264
Merge branch 'general-devel' into sql_improve 2017-12-09 11:49:29 +01:00
Edgar Luque
6a6133f3f7 Add xml comments and DateTime datatype support for SQL 2017-12-09 11:35:31 +01:00
Lucas Nicodemus
a5cbeb166b Fix some SendTileSquare calls with proper args 2017-12-09 02:15:31 -07:00
Lucas Nicodemus
760f5518da More patching to fix potential desync (thanks @bartico6)! 2017-12-09 01:50:58 -07:00
Lucas Nicodemus
aa527496dc Replace a coule TileID magic numbers with direc Tcalls.
Thanks @mistzzt & @QuiCM!
2017-12-09 01:48:43 -07:00
Lucas Nicodemus
ce822caf2a Implement re-transmit of data if event handled in OnTilEdit
Thanks to the suggestion of @bartico6, we now re-transmit packets
of world data to prevent desync issues with respect to stopping a
server action but not fixing the client's view of the world.
2017-12-09 01:39:54 -07:00
Lucas Nicodemus
eed7b3fad2 Document what TSPlayer.SendTileSquare does 2017-12-09 01:35:27 -07:00
Lucas Nicodemus
cdfb056903 Include feedback from @bartico6 on a magic number 2017-12-09 01:31:40 -07:00
Lucas Nicodemus
46617e61d0 Update changelog re. new hook changes 2017-12-09 01:29:23 -07:00
Lucas Nicodemus
c891a81f67 Move NewProjectile into Bouncer 2017-12-09 01:19:05 -07:00