Commit graph

864 commits

Author SHA1 Message Date
Zack Piispanen
cfcc0e7276 groups work, with inheritance, still need to remove order by 2011-07-20 20:55:49 -04:00
Zack Piispanen
7bac787aa5 Merge branch 'master' of github.com:TShock/TShock 2011-07-19 19:48:16 -04:00
Zack Piispanen
453d3ea3b6 group recursively gets permissions 2011-07-19 19:48:07 -04:00
high
cfd2fdcb67 Tidied GetIPv4Address, it does return the ip if an ip is passed 2011-07-19 19:36:39 -04:00
Zack Piispanen
e1776f8d01 Merge branch 'master' of github.com:TShock/TShock 2011-07-19 19:30:25 -04:00
Zack Piispanen
e5826fbc0a Converts Warps to db files, and fixes a bug in region code.
Currently, the program fails to copy the old xml files to the new directory, so you may want to manually do that.
2011-07-19 19:30:07 -04:00
Lucas Nicodemus
407d327236 Attempting a work around for DNS host resolution. There will now be a configuration parameter that will enable the check. This is expensive, and not recommended, but a better reserved slot system will be done in the future.
Closes #254
2011-07-19 17:27:54 -06:00
Lucas Nicodemus
d6c1f44219 Merge branch 'master' of github.com:TShock/TShock 2011-07-19 16:59:35 -06:00
Lucas Nicodemus
9c76bae4b2 Adds custom ban reasons to config.json
Closes #246
2011-07-19 16:59:15 -06:00
Zack Piispanen
12674c3ce2 regions now convert from xml to db 2011-07-19 18:40:46 -04:00
Zack Piispanen
a4a2cf0ce0 Itembans now convert to db stuff 2011-07-19 18:16:57 -04:00
Zack
c780993152 editted to save the db BEFORE refreshing the regions. 2011-07-19 09:36:36 -07:00
Zack
557d552956 Fixed for Bug 253, apparently someone forgot to clear the paramaeters before calling the next query. 2011-07-19 09:31:46 -07:00
Lucas Nicodemus
15eb769580 Import users into users, not bans (Thanks Twitchy) 2011-07-19 00:34:46 -06:00
Zack Piispanen
e7b7f44e7a users now convert to new sql database 2011-07-18 21:48:59 -04:00
Zack Piispanen
f08b94c8f8 Bans and Groups now convert from txt to db items.
Just put bans.txt and groups.txt in the tShock folder( where they already exist i believe ) and run the server.  It moves the files to tShock/old_configs in case you want to keep them.
2011-07-17 15:17:28 -04:00
Zack Piispanen
77998470bc Added worldID to where clause 2011-07-17 13:25:52 -04:00
Zack Piispanen
8e9bbcc5f9 Bug fix for region allow, updated the whole database, was missing a where clause 2011-07-17 13:18:04 -04:00
Lucas Nicodemus
3c4525749d Increased IP field size 2011-07-16 21:59:48 -06:00
Lucas Nicodemus
e684ecd289 Added vip group 2011-07-16 21:58:48 -06:00
Lucas Nicodemus
8a1046fc0d DO NOT DOWNLOAD LATEST MASTER 2011-07-16 21:51:38 -06:00
Lucas Nicodemus
4ca7a9aeec Default permissions are fixed 2011-07-16 18:49:26 -06:00
Lucas Nicodemus
820b3c5c1f Removed debug message 2011-07-16 18:34:45 -06:00
Lucas Nicodemus
cb5a50f540 /region allow now works (and adds users) 2011-07-16 18:21:39 -06:00
Lucas Nicodemus
add7c74bec Region allow now refreshes the region cache, but no longer operates properly. 2011-07-16 18:16:52 -06:00
Lucas Nicodemus
75e3e58c80 Regions WORK! 2011-07-16 18:01:18 -06:00
Zack Piispanen
7cef36cfd0 Merge branch 'general-devel' of github.com:TShock/TShock into general-devel 2011-07-16 16:16:04 -04:00
Zack Piispanen
7e4c851297 Added in support for giving certain amounts of items.
/item <id/name> [amount]
It tries to parse it as an int, if it fails( or there is no amount specified ) it defaults to item.maxStack.

If it succeeds it sets the amount to whichever is larger, the amount or the items max stack.

Closes Issue #202
2011-07-16 16:11:46 -04:00
Lucas Nicodemus
d6aa8da433 /time day is a little more day than it was before 2011-07-16 13:54:29 -06:00
Lucas Nicodemus
141e2eec64 Changed debug command back to /debugreg 2011-07-16 02:34:58 -06:00
Lucas Nicodemus
acc5784d16 Fixed region detection 2011-07-16 02:34:16 -06:00
Lucas Nicodemus
a8d8dbf31d Debug stuff 2011-07-16 02:12:51 -06:00
Lucas Nicodemus
bce7b03e30 Merge remote-tracking branch 'remotes/origin/master' into general-devel
Conflicts:
	release-docs/changes.txt
2011-07-16 02:03:59 -06:00
Lucas Nicodemus
0e9624ace3 Copied and pasted old region checking code. 2011-07-16 02:01:48 -06:00
Lucas Nicodemus
cc096c63ac Merge pull request #244 from darkunderdog/patch-1
Edited release-docs/changes.txt via GitHub
2011-07-16 00:50:54 -07:00
Lucas Nicodemus
b98c84fa5b Attempting to fix region detection
Attempting to fix /protect
2011-07-15 22:56:51 -06:00
Lucas Nicodemus
9cdbcdb92c Protected actually sets values 2011-07-15 21:58:38 -06:00
Lucas Nicodemus
2212c81442 Passwords are now hashed properly 2011-07-15 21:50:18 -06:00
Lucas Nicodemus
741841028e Attempting to fix region protection 2011-07-15 21:26:28 -06:00
darkunderdog
d224dd0a15 Edited release-docs/changes.txt via GitHub 2011-07-15 19:41:44 -07:00
Lucas Nicodemus
485bc61fac Code cleanup thanks to High6 2011-07-14 18:21:43 -06:00
Lucas Nicodemus
d45c7a5753 Fixed /region protect 2011-07-14 18:19:33 -06:00
Lucas Nicodemus
c701164abc Fixed /region allow
Closes #239
Removed support for adding IP based users to regions
2011-07-14 18:16:35 -06:00
Lucas Nicodemus
e87c497cbd Region up to date 2011-07-14 17:57:48 -06:00
Lucas Nicodemus
26e7b669cb Fixed returning false on any non-region. 2011-07-14 17:24:57 -06:00
Lucas Nicodemus
fcbaa5c056 Dunno 2011-07-14 17:21:24 -06:00
Lucas Nicodemus
f271d10c7b Path combine fail fixed for the auth code system. 2011-07-14 13:55:39 -06:00
Lucas Nicodemus
2469e293ab Actually add the user when /user add is run 2011-07-14 13:52:44 -06:00
Lucas Nicodemus
080ba6ca2b Blank passwords no longer result in "heightheightheightheight"
Try/Catch around login function
2011-07-14 13:50:00 -06:00
Deathmax
e6d612ea4b Don't kick a player if they destroy a chest that is client side only due to hitting the max number of chests. 2011-07-14 22:37:29 +08:00