Ryozuki
0842ee5563
Merge branch 'general-devel' into sql_improve
2017-12-13 07:24:35 +01:00
Lucas Nicodemus
45579e04b8
Use svg for travis badge so we have retina images on retina
2017-12-12 22:29:02 -07:00
Lucas Nicodemus
74eb680bff
Really update the changelog properly this time
2017-12-12 03:31:05 -07:00
Lucas Nicodemus
30c9f74ad3
Merge branch 'general-devel' into fragments
2017-12-12 03:19:34 -07:00
Lucas Nicodemus
270cc4c481
Update changelog for critical crash fix
2017-12-12 03:18:44 -07:00
Lucas Nicodemus
65fd892091
Merge branch 'master' into general-devel
2017-12-12 03:02:00 -07:00
Lucas Nicodemus
9441f1882b
Verison Tick: 4.3.25
2017-12-12 02:57:41 -07:00
Lucas Nicodemus
84a0f1f29e
Update submodule for critical exploit fix in TSAPI
2017-12-12 02:56:10 -07:00
Lucas Nicodemus
98aa01c620
Add note about crash check & change reaosn on OnKillMe
2017-12-11 19:07:53 -07:00
Lucas Nicodemus
b808ad8e4c
Merge remote-tracking branch 'origin/general-devel' into fragments
2017-12-11 16:28:20 -07:00
Chris
e92c8403f3
Merge pull request #1555 from Pryaxis/no-permissions
...
Remove /restart & Permissions.updateplugins
2017-12-12 09:44:02 +10:30
Lucas Nicodemus
69eda3d38e
Remove server restart rest routes
2017-12-11 16:09:03 -07:00
Lucas Nicodemus
3bed40ec65
Remove Utils.RestartServer (thanks @QuiCM!)
2017-12-11 16:01:09 -07:00
Lucas Nicodemus
12701e54ba
Update submodule again?
2017-12-11 15:53:34 -07:00
Lucas Nicodemus
b923f74782
Merge remote-tracking branch 'origin/general-devel' into fragments
2017-12-11 15:52:26 -07:00
Lucas Nicodemus
9cf949cc60
Update changelog
2017-12-11 15:47:05 -07:00
Lucas Nicodemus
611fb6b418
Remove /restart command. Fixes #1454 .
2017-12-11 15:45:42 -07:00
Lucas Nicodemus
4ea7d10482
Remove stupid updates permission. Fixes #1540 .
2017-12-11 15:45:23 -07:00
Chris
361a10e884
Merge pull request #1553 from Ryozuki/update-company
...
Update Assembly company to Pryaxis
2017-12-12 09:11:38 +10:30
Lucas Nicodemus
7ef0b581eb
Merge branch 'general-devel' into update-company
2017-12-11 15:33:51 -07:00
Ryozuki
b392890551
update copyright notice
2017-12-11 23:09:07 +01:00
Chris
fac846ce02
Merge pull request #1552 from bartico6/general-devel
...
Update submodule TerrariaAPI-Server
2017-12-12 08:33:48 +10:30
Lucas Nicodemus
903b5b124e
Remove more randomly commented out code with no apparent reason
2017-12-11 10:04:21 -07:00
Ryozuki
bbabec6003
update changelog
2017-12-11 16:29:37 +01:00
Ryozuki
c1c5716006
update assembly company to Pryaxis
2017-12-11 16:26:19 +01:00
Lucas Nicodemus
5c9d2ed870
Simpler check (thanks @bartico6) on OPK's nullcheck.
2017-12-11 08:23:36 -07:00
Lucas Nicodemus
e19fd22fe0
Change Utils.SearchProjectile to return -1 in error
...
Thanks for checking this out, @bartico6. Fixes #1549 .
Note: this method only returns 1 because the game won't allocate
more identity/index combo. Apparently, according to RL.
2017-12-11 08:18:23 -07:00
quake1337
1e233d15e7
Update submodule
2017-12-11 15:33:53 +01:00
Lucas Nicodemus
6ed110f862
Change a bounds check to handle a packet instead of letting it go.
...
This change reverts mod to line 1525 of GetDataHandlers.cs in
672d360e9d
2017-12-11 00:28:08 -07:00
Lucas Nicodemus
4b08d61673
Change null check to return true in HandlePlayerUpdate
...
After confirming with @QuiCM on this, we couldn't figure out why
this was set to false in the first place. As a result, we changed
it to true to conform with usual logic (bad stuff? reject it.).
2017-12-11 00:17:58 -07:00
Lucas Nicodemus
9b8aaceb12
Merge remote-tracking branch 'origin/general-devel' into fragments
2017-12-10 23:45:03 -07:00
Lucas Nicodemus
ba851d3570
Remove TShock.CheckProjectilePermission
...
Add TSPlayer.HasProjectilePermission() and its inverse:
TSPlayer.LacksProjectilePermission()
2017-12-10 23:38:03 -07:00
Lucas Nicodemus
c5f9a51802
Move most of HandleProjectileKill to Bouncer
...
Added GetDataHandlers.ProjectileKill hook and related arguments.
Fired when a projectile kill packet is accepted by the server.
2017-12-10 23:07:17 -07:00
Chris
7349d0e877
Merge pull request #1547 from bartico6/general-devel
...
Make TShock pull OTAPI from the correct folder on build
2017-12-11 10:57:16 +10:30
quake1337
a5e196178e
Add credit
2017-12-11 01:16:10 +01:00
quake1337
1f79e14bd7
Make TShock pull OTAPI from the correct folder on build
2017-12-11 01:12:27 +01:00
Lucas Nicodemus
135826f15d
Merge pull request #1544 from Patrikkk/general-devel
...
Add missing "if handled - return" code to OnNameCollision.
2017-12-10 12:41:52 -07:00
Lucas Nicodemus
abaeef5f7e
Merge branch 'general-devel' into general-devel
2017-12-10 12:41:44 -07:00
Patrikk
6f044b2123
Adding missing Changelog.
2017-12-10 20:37:59 +01:00
Ryozuki
81de6d524a
Merge branch 'general-devel' into sql_improve
2017-12-10 20:32:34 +01:00
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
