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

2265 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zack Piispanen
7c0bcceb9f Added LastAccessed time field and KnownIPs field to the user database. This resulted in some changes everywhere, such as new logic with default groups. Apparently, somehow, the ip based stuff worked even though no ips were set to properly grab the user group. The wrong group was being assigned to new users resulting in a player with 0 permissions. This is now fixed. 2013-09-21 20:57:14 -04:00
Lucas Nicodemus
d4e193b44d Merge pull request #529 from k0rd/general-devel 
Remove WorldID from the WHERE clause in UPDATE SQL for RememberedPosManager
 2013-09-21 14:36:08 -07:00
Lucas Nicodemus
95969b203d Merge pull request #528 from Olink/general-devel 
Removed ip address from users, as well as changed /user add syntax to be...
 2013-09-21 14:34:39 -07:00
Zack Piispanen
ba42fb08df Removed ip address from users, as well as changed /user add syntax to be '/user add username password group' instead of colon bullshit. 2013-09-21 17:11:22 -04:00
k0rd
88e8e65dcb Remove WorldID from the WHERE clause in UPDATE SQL for RememberedPosManager, changed logic to also update the WorldID 2013-09-21 16:41:45 -04:00
k0rd
d36a549e1e Merge remote branch 'upstream/general-devel' into general-devel 2013-09-21 16:41:25 -04:00
Zack Piispanen
d7da68a262 Merge branch 'general-devel' of github.com:TShock/TShock into general-devel 2013-09-21 16:06:10 -04:00
Zack Piispanen
4fed645fde Added config override for stat hacks. This makes updating for 1.12 easy as well since these will change then, small part of #525 2013-09-21 16:06:01 -04:00
Lucas Nicodemus
07c639d569 Merge pull request #524 from Olink/general-devel 
Add in error ignore for the socket exception in the packet bufferer.
 2013-09-21 11:19:22 -07:00
Zack Piispanen
b23cdb41c3 Whelps, the info in the issue was not accurate. We are looking for the exception that writes a warning to the log file, not the console, not an error. This should be the right fix 2013-09-21 12:52:46 -04:00
Zack Piispanen
d0ba424cd1 Add in error ignore for the socket exception in the packet bufferer. 2013-09-21 12:22:22 -04:00
Zack Piispanen
77e845d340 Merge branch 'general-devel' of github.com:TShock/TShock into general-devel 2013-09-17 18:45:17 -04:00
Zack Piispanen
ef584c62d7 Added Application tokens that can never be deleted, and are loaded either by the command line arg, or the list in the config file. Other plugins can easily add their own tokens into the dictionary as well, however, I believe the config file approach works best for transparency to the user. 
Currently, this is an extremely complex looking field in the config file now.  I don't think we should add a placeholder tho as servers wouldn't realize they had a rest token there.  Perhaps when we do a dump of the config file, someone can add the format for this field.

Closes #520
 2013-09-17 18:44:58 -04:00
Lucas Nicodemus
fc38e90369 Properly added hipchat notifications this time 2013-09-17 01:09:44 -06:00
Lucas Nicodemus
7e5fd428fd Add hipchat notifications 2013-09-17 01:07:27 -06:00
Lucas Nicodemus
5d41d932b4 Add irc notifications 2013-09-17 00:45:03 -06:00
Lucas Nicodemus
6b912a49e5 Update README.md 2013-09-17 00:42:57 -06:00
Lucas Nicodemus
495c004dcd Update README.md 2013-09-17 00:42:24 -06:00
Lucas Nicodemus
81df90bfb8 Trigger build now! I order thee! 2013-09-17 00:38:00 -06:00
Lucas Nicodemus
cc25fc3fec Merge branch 'general-devel' of github.com:TShock/TShock into general-devel 2013-09-17 00:36:29 -06:00
Lucas Nicodemus
2693922c03 Add travis support maybe? 2013-09-17 00:35:58 -06:00
Zack Piispanen
d53bb4b59c Remove postbuild stuff 2013-09-17 02:25:37 -04:00
Zack Piispanen
b22457382e remove unused using statements 2013-09-17 02:24:02 -04:00
Zack Piispanen
004f02264d Removed unused references. 2013-09-17 02:22:51 -04:00
Zack Piispanen
225668fcdd Some small rest improvements. Use newest TServer binary. 2013-09-16 00:09:29 -04:00
Lucas Nicodemus
dd05c524ec Merge branch 'master' into general-devel 2013-09-15 15:24:15 -06:00
Zack Piispanen
33050b1306 Fixed(?) lava and water liquid sets. Not sure if its even possible to get this far into the process, but if it was possible to bypass the item in hand checks in OnSecondUpdate() and OnPlayerUpdate() then they would successfully place lava/water. This should now be fixed, and if the right bucket isn't in their hand we ignore. 2013-08-28 00:42:45 -04:00
Zack
b0b938453b Merge pull request #517 from TShock/tracker-upgrade 
Remove old stat tracker code
 2013-08-23 05:38:10 -07:00
Lucas Nicodemus
7e1954d047 Removed now useless config option 2013-08-22 23:45:37 -06:00
Lucas Nicodemus
14c0b76332 Closes #497 2013-08-22 22:51:43 -06:00
Lucas Nicodemus
8fb046f5b3 Removed old, crusty stat tracker. 2013-08-22 22:50:59 -06:00
Lucas Nicodemus
66483e0325 Added the header for MaxMind's Geo stuff back 2013-08-22 21:54:47 -06:00
Lucas Nicodemus
ae7ab5f234 Updated copyright information to point to 2013. 2013-08-22 21:51:17 -06:00
Lucas Nicodemus
9470e20423 Line ending normalization to CRLF (Windows) 2013-08-22 21:17:32 -06:00
Lucas Nicodemus
f82bff1b17 Merge pull request #505 from CoderCow/patch-1 
REST Security and General Improvements
 2013-08-22 20:09:10 -07:00
Lucas Nicodemus
05589c815a Merge pull request #510 from CoderCow/patch-2 
Minor Bug Fix
 2013-08-19 21:42:11 -07:00
CoderCow
581522355b Fixed broadcast not being displayed in the configured custom color. 2013-08-11 13:18:40 +02:00
CoderCow
f8fbe9b5da Added config setting "RestUseNewPermissionModel" to allow switching between the REST permission models for backward compatibility. 2013-08-02 13:01:22 +02:00
CoderCow
abeddd4c07 Minor improvements. 2013-08-02 13:01:17 +02:00
CoderCow
0f34aa03e8 Moved all new REST endpoints to "/v3"as "/v2" was incompatible. 2013-08-02 13:01:12 +02:00
CoderCow
9a40c81b49 Fixed all REST endpoints to use RestObjects instead of Dictionaries. 2013-08-02 13:01:06 +02:00
CoderCow
11f3099d30 Added "/rest listusers" to "/rest" default output. 2013-08-02 13:01:01 +02:00
Zack
64a09111d4 Merge pull request #508 from CoderCow/patch-2 
Group Improvements
Closes #482
 2013-08-02 13:00:52 +02:00
CoderCow
b828299a1c -Improved group loading from the database: 
--TShock will now attempt to load any available valid group data even if there are invalid records and will also report proper errors / warnings.
--"superadmin" is now a reserved group name.
--Groups with parents causing infinite parent loops, invaild parents, or parenting theirselfes will have their parent group reset.
--Double definitions of groups with the same name are no longer allowed.
--Group instances are now tried to be preserved instead of being recreated during a reload of the group data.

-Added command "/group parent" to get and set the parent of groups.
-REST Endpoint "/v2/groups/create" will no longer allow creating groups having theirselfes as parent.
-REST Endpoint "/v2/groups/update" will no longer allow setting a group's parent to theirself or setting a parent group resulting in an infinite parent loop.
-This commit should fix #482.
 2013-08-02 13:00:45 +02:00
Zack
1b58fb8509 Merge pull request #508 from CoderCow/patch-2 
Group Improvements
Closes #482
 2013-07-27 17:01:00 -07:00
CoderCow
33091035c0 -Improved group loading from the database: 
--TShock will now attempt to load any available valid group data even if there are invalid records and will also report proper errors / warnings.
--"superadmin" is now a reserved group name.
--Groups with parents causing infinite parent loops, invaild parents, or parenting theirselfes will have their parent group reset.
--Double definitions of groups with the same name are no longer allowed.
--Group instances are now tried to be preserved instead of being recreated during a reload of the group data.

-Added command "/group parent" to get and set the parent of groups.
-REST Endpoint "/v2/groups/create" will no longer allow creating groups having theirselfes as parent.
-REST Endpoint "/v2/groups/update" will no longer allow setting a group's parent to theirself or setting a parent group resulting in an infinite parent loop.
-This commit should fix #482.
 2013-07-27 22:02:29 +02:00
CoderCow
4d95b5594e -Added REST endpoint "/v2/token/destroy/all" 
-Added command "/rest destroytokens", "/rest listusers"
 2013-07-27 20:57:55 +02:00
CoderCow
d9ff9a6ac5 REST resolves the user's group on each request now. 2013-07-27 20:01:48 +02:00
CoderCow
125884cc4d Fixed broken build due to last commit. 2013-07-26 00:28:49 +02:00
CoderCow
72939c8876 Split REST permissions from Permissions into RestPermissions class. 2013-07-26 00:20:45 +02:00