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

2850 commits

Author SHA1 Message Date
Luke
24f75069e8 Submodule update for pressure plate, fixed connections after max slot is reached 2016-12-12 23:52:14 +10:00
Enerdy
c73003fc67 Merge branch 'mintaka' of https://github.com/NyxStudios/TShock into mintaka 2016-12-11 23:44:44 +00:00
Enerdy
e6fe896133 Update version codename 
Project Mintaka - The First Star
 2016-12-11 23:44:13 +00:00
Rodrigo
2e022aa554 Merge pull request #1338 from ProfessorXZ/mintaka 
A possible fix for #1337
 2016-12-11 23:41:18 +00:00
White
739892a611 Added TSPlayer.KillPlayer() which uses NetMessage.SendPlayerDeath(...). 
Changed /kill to use `TSPlayer.KillPlayer()`
 2016-12-11 13:46:57 +10:30
White
02c58b5c93 Submodule update + API version update 2016-12-11 13:46:11 +10:30
ProfessorXZ
1741b0c854 A possible fix for #1337 2016-12-10 21:22:01 +01:00
Luke
703a31580e Build script alterations, submodule update 2016-12-10 21:54:43 +10:00
Luke
272cc31b28 Fixes rest api error on startup without -ip arg 2016-12-10 02:30:15 +10:00
Lucas Nicodemus
e4313b6433
Update to latest stuff from death 2016-12-06 20:34:12 -07:00
Lucas Nicodemus
678f6c7cf8
Update to Mintaka (thanks @enerdy) 2016-12-06 17:36:44 -07:00
Zaicon Kiroshu
a0a98d19f3 Bank3 Implementation 2016-11-23 18:51:11 -06:00
Zaicon Kiroshu
02815a23ef API Tick, Submodule Update, Changelog Update 2016-11-20 15:15:53 -06:00
Zaicon Kiroshu
50d8b0db30 1.3.4.3 Update (API 1.26) 2016-11-19 17:05:08 -06:00
Lucas Nicodemus
65fe410c31
Fix KnownIps == 0 causing .Last() to fail (Fixes #1319 again). 
Thanks to @Simon311 for being able to read. We love you. 💘

"You should laugh at yourself at least once every day."
 2016-10-24 10:58:17 -06:00
Lucas Nicodemus
f8a5388582 Revert "Ensure IPs are > 0 otherwise the Linq will fail." 2016-10-24 10:47:07 -06:00
Lucas Nicodemus
1328d71fdc Merge pull request #1317 from DogooFalchion/motd 
Update MotD file parsing to convert color formats into smart text.
 2016-10-23 19:27:52 -06:00
Hussein Farran
a451a27cb1 Merge pull request #1316 from DogooFalchion/sandstone_purification 
Add Hardened Stone to the list of tiles that can be altered by players.
 2016-10-23 21:12:36 -04:00
Lucas Nicodemus
6344051678
Change verbiage slightly on some /uploadssc messages 2016-10-23 19:02:44 -06:00
Hussein Farran
7d323f253a Merge pull request #1321 from DogooFalchion/ssc_join_inv 
Enable user to upload their data from when they join as SSC
 2016-10-23 20:58:40 -04:00
DogooFalchion
49a0cc0cc5 Add permission for uploading other's SSC data. Allow this to run from console. Allow command to upload remote user's data. 2016-10-23 19:59:57 -04:00
Lucas Nicodemus
3fdc89a576 Merge pull request #1320 from DogooFalchion/fix_playerlogin 
Ensure IPs are > 0 otherwise the Linq will fail.
 2016-10-23 16:23:34 -06:00
DogooFalchion
701cfa0591 Ensure IPs are > 0 otherwise the Linq will fail. 2016-10-23 18:16:10 -04:00
DogooFalchion
f1ce158efd Implement logic to store the data of a player when they join, and allow for a command to be run that will upload that data in place of their existing SSC data. 2016-10-23 18:11:44 -04:00
DogooFalchion
156df47777 Add mechanism to upload a specific PlayerData to a player. 2016-10-23 18:10:30 -04:00
DogooFalchion
8df7e0c298 Backup old MotD and convert it to using Terraria chat tags automatically, then write it back out to the MotD file. 2016-10-23 14:37:16 -04:00
DogooFalchion
fcca88c2d6 Add support for start of line colors and terraria chat tags being nested. 2016-10-23 14:01:36 -04:00
Lucas Nicodemus
a0c4864567
Removed all obsolete methods from TShock 2016-10-23 06:09:17 -06:00
Lucas Nicodemus
a8b4bf1d95
Remove PacketBufferer 
The packet bufferer was obsolete.
 2016-10-23 06:02:27 -06:00
Lucas Nicodemus
b15dfbc1ec
Don't catch the exceptions we throw in SetUserGroup 
For some reason, we were catching our own exceptions and then
throwing UesrManagerExceptions despite the fact that we explicitly
threw more specific exceptions.

Fixes #1315.
 2016-10-23 05:49:16 -06:00
White
6151c86630 Removed the old REST model. 
This includes the following endpoints:
* `/status`
* `/v2/players/read`
* `/v2/server/rawcmd`
 2016-10-23 21:52:25 +10:30
Lucas Nicodemus
28cd87cea0
Add 'stop' command alias for 'off' and 'exit' 2016-10-23 04:38:25 -06:00
Lucas Nicodemus
c905a086d1
Remove commented out "updateplugins" command that does nothing. 2016-10-23 04:34:26 -06:00
DogooFalchion
a2003f130b Do not append Tshock to the MotD path. 2016-10-22 19:03:32 -04:00
DogooFalchion
31794b6a27 ShowFileToUser shouldn't assume the file is in the TShock folder. Use the file path variables where we can. Use smart text instead of removing color parsing. 2016-10-22 19:01:27 -04:00
DogooFalchion
998bf71b96 Don't reference yourself. 2016-10-22 18:55:42 -04:00
DogooFalchion
6242a54603 Update references to MOTD to point to the variable, instead of having magic strings. 2016-10-22 17:37:00 -04:00
White
09bbf8abe8 Removed colour parsing from the ShowFileToUser method. 
Also added an info log message if a file contains the old format.
Fixes #1314
 2016-10-20 21:03:25 +10:30
DogooFalchion
50afef312c Replace spaces with tabs. 2016-10-19 23:34:02 -04:00
DogooFalchion
0843e4c38e Update the existing logic to use the Conversion sets, KISS. 2016-10-19 23:28:45 -04:00
DogooFalchion
d87e827d9a Add Hardened Sand to the list of tiles that can be altered by a player 2016-10-19 23:20:45 -04:00
Rodrigo
78a4185152 Merge pull request #1312 from Simon311/general-devel 
Add /accountinfo, fix offline bans exploit, fix #1309 more
 2016-10-18 18:59:13 +01:00
Simon
186bb70186 Add /accountinfo, fix offline bans exploit, fix #1309 more 2016-10-18 09:50:10 +03:00
Lucas Nicodemus
dce26d6928 Merge pull request #1310 from Simon311/general-devel 
Fix for HealOtherPlayer exploit, also fix #1309
 2016-10-17 08:51:19 -06:00
Simon
68799d9d20 Fix description 2016-10-17 16:17:44 +03:00
Simon
464a52a70a Misleading wiki caused this commit 2016-10-17 16:05:18 +03:00
Simon
1460a7ad91 Fix for HealOtherPlayer exploit, also fix #1309 2016-10-17 15:51:49 +03:00
Lucas Nicodemus
9b7ca644b5 Version Tick: 4.3.20 2016-10-17 02:41:22 -06:00
Vinayak Agarwal
01778531c6 Remove headers from autogenerated file 2016-10-17 11:28:34 +05:30
Vinayak Agarwal
e225b1fb50 Merge pull request #1 from NyxStudios/general-devel 
Merge changes
 2016-10-17 11:24:54 +05:30