Commit graph

3661 commits

Author SHA1 Message Date
Lucas Nicodemus
41e5c8cc4a
Update changelog 2016-10-23 19:14:14 -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
f5c02dd89d
Update changelog again to reflect non-ssc issue fixed 2016-10-23 19:04:25 -06:00
Lucas Nicodemus
6344051678
Change verbiage slightly on some /uploadssc messages 2016-10-23 19:02:44 -06:00
Lucas Nicodemus
a63d653010
Update the changelog 2016-10-23 19:01:51 -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
6f723820a0
Merge branch 'general-devel' of github.com:NyxStudios/TShock into general-devel 2016-10-23 16:24:41 -06:00
Lucas Nicodemus
d6d506fb31
Update changelog 2016-10-23 16:24:26 -06: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
Lucas Nicodemus
1f631d347b
Properly ignore .DS_Store files 2016-10-23 04:07:04 -06:00
Lucas Nicodemus
d1fbebcbc1
Make readme a little more clear on dev builds 2016-10-22 22:43:07 -06:00
Lucas Nicodemus
eb8b1cb8cf
Moved gpl script into the scripts folder
I seriously thought the PR moved it there but I guess not? Oh well.
2016-10-22 22:36:28 -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
Lucas Nicodemus
8f7b8db2a1 Put a link to the travis build downloads in the readme 2016-10-21 23:40:51 -06:00
Lucas Nicodemus
c6822b9be7 Remove 'Unreleased' and 'Pre-Release' designation from cl entries 2016-10-21 22:26:26 -06:00
Lucas Nicodemus
3d43834a42 Update submodule & changelog for recent patches
Fixes #1311, and covers commits from PRs in the changelog that
weren't yet added up to now.
2016-10-21 22:23:34 -06: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
40fdc1160e Add white to a changelog item
(White code reviewed this issue)
2016-10-17 03:07:06 -06:00
Lucas Nicodemus
9b7ca644b5 Version Tick: 4.3.20 2016-10-17 02:41:22 -06:00
Lucas Nicodemus
198825deac Submodule update for #1308 / #921 2016-10-17 02:36:48 -06:00
Rodrigo
c42b6239ed Merge pull request #1307 from va6996/general-devel
Add script for GPL
2016-10-17 07:18:29 +01: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
White
9cd43c97e9 Merge pull request #1300 from ProfessorXZ/general-devel
Fixes #1021
2016-10-17 09:48:09 +10:30
Rodrigo
027c3fb390 Merge pull request #1306 from adilsoncarvalho/hacktoberfest-gpl-headers
Update all the GPL headers #1305
2016-10-16 23:13:41 +01:00
Vinayak Agarwal
4bdae494cb Add script for GPL 2016-10-17 03:31:35 +05:30