Commit graph

110 commits

Author SHA1 Message Date
Twitchy
629eb01191 Merge branch 'general-devel' of github.com:TShock/TShock 2011-07-31 16:13:14 +12:00
Twitchy
0438d0ffce Fix OrderBy removal 2011-07-31 16:11:58 +12:00
Lucas Nicodemus
98711bd05c Merge pull request #275 from Lycaonj/general-devel
General devel
2011-07-30 20:41:37 -07:00
Lycaonj
19df6bb009 Fixed incorrect parameter name in the Unban method (from @ip to @0) which was causing ban removals to fail. 2011-07-30 22:35:36 -05:00
Twitchy
b09b0ba9f2 Fixes RememberPosManager and player sprites showing on server, when they are not there 2011-07-31 15:31:57 +12:00
Twitchy
917865cab5 OrderBy... Bye bye. DBTool fixes 2011-07-29 12:21:28 +12:00
Twitchy
8f28bd2b7d Adds SetTable to DBTools, makes Tools and FileTools public, for TShock mods 2011-07-28 23:22:35 +12:00
Twitchy
383715715c Adds ReadTable function to DBTools 2011-07-28 13:08:49 +12:00
Twitchy
2afcb35da1 Fixes DBTool.Insert :) 2011-07-28 11:21:34 +12:00
Twitchy
bc2bfd5485 Adds DBTools.cs (Create and Insert Table) 2011-07-27 18:22:12 +12:00
Lucas Nicodemus
37146adb4c Resharper code cleanup, including:
- Optimized using statements
 - Removal of redundant code
2011-07-26 23:37:06 -06:00
Graham Cantin
3dd7af1a30 * Finally fixed /user group and /user password.
* Had to fix UserManager exceptions to UserNotExistException instead of UserExistsException.
* Added /user help as well. Commented out the old short circuit for now.
2011-07-24 20:28:07 -07:00
high
e8a5e7fb58 Now uses Query/QueryReader 2011-07-24 12:33:00 -04:00
high
d39d9e5127 Reapplied my region changes that were lost from a bad conflict merge 2011-07-24 11:27:00 -04:00
high
57a2d082ef Added query function for easier queries.
Normalized method names in GroupManager.cs
2011-07-24 10:12:18 -04:00
Zack Piispanen
d515616f72 A few more tests 2011-07-23 22:27:21 -04:00
Lucas Nicodemus
5c59ebf71a Merge remote-tracking branch 'remotes/origin/general-devel'
Conflicts:
	TShockAPI/Commands.cs
	TShockAPI/DB/GroupManager.cs
	TShockAPI/DB/RegionManager.cs
	TShockAPI/Properties/AssemblyInfo.cs
	Terraria.sln
2011-07-23 17:25:20 -06:00
Zack Piispanen
732121bdf5 region basic tests added 2011-07-23 18:07:15 -04:00
Zack Piispanen
a2f2ea1500 whoops pushed in some test stuff that would break commands fixed removeItem ban tho, so its all good 2011-07-23 17:03:10 -04:00
Zack Piispanen
347d701b7f push for shank 2011-07-23 16:59:29 -04:00
Zack Piispanen
ffd0471326 initial unit testing work and a few tweaks to stuff relating to items 2011-07-23 15:21:56 -04:00
Lucas Nicodemus
d8e8c5df91 Warps are no longer ToLower()'d. 2011-07-23 01:14:52 -06:00
Zack
1468bbaa85 width + x1 = x2... 2011-07-22 23:18:59 -07:00
Lucas Nicodemus
219f5a8cfb WorldIDs 2011-07-22 23:35:21 -06:00
Lucas Nicodemus
870c1f74f4 Fixed warps too 2011-07-22 23:29:41 -06:00
high
a49269cc0c Create save path first 2011-07-23 00:50:30 -04:00
Zack Piispanen
727ae2322b Added new commands to allow users in game to create, delete, modify groups.
Added new methods to create, delete, modify groups.

Uhhh....dunno why RegionManager.cs was conflicted.

Added permission for accessing group commands
2011-07-22 23:14:56 -04:00
high
64ca3e7148 Region list now uses the new code that warps use too. 2011-07-22 22:00:18 -04:00
high
85dac355be Cleaned up the adding of default groups 2011-07-22 21:46:14 -04:00
high
1c2cead3c9 Fixed /warp list <page>
ListAllWarps now only returns names and only for the specified world.
2011-07-22 21:36:07 -04:00
Lucas Nicodemus
e1cd87f487 Fixed regions
Added /convert
2011-07-22 17:38:51 -06:00
Lucas Nicodemus
92d6e7b9fb No longer spam users to login. 2011-07-22 16:18:28 -06:00
Lucas Nicodemus
14e55301e1 Merge branch 'general-devel' of github.com:TShock/TShock into general-devel 2011-07-22 16:15:55 -06:00
Lucas Nicodemus
3291195af8 Fixed regions not working. 2011-07-22 16:15:34 -06:00
Zack Piispanen
987d9e793b fixed useless query for being useless. Added in code that checks the list of groups and not the db itself.
TSDEV-49
2011-07-22 17:33:59 -04:00
Zack Piispanen
15af989826 remove debug code *that wasnt there on last commit, i swear* 2011-07-22 17:24:58 -04:00
Lucas Nicodemus
481a34f722 Merge branch 'general-devel' of github.com:TShock/TShock into general-devel 2011-07-22 15:09:32 -06:00
Zack Piispanen
2c2097dc08 Move the code to pull all items from the db outside of the if file exists loop.
TSDEV-46
2011-07-22 17:06:58 -04:00
Lucas Nicodemus
b5a27052a1 Updates to RM 2011-07-22 14:10:38 -06:00
Lucas Nicodemus
91c1430f3c Not using OrderBy as much anymore. 2011-07-21 15:03:52 -06:00
Lucas Nicodemus
b98614946d Changed every instance of Main.worldID.ToString() to Main.worldName. You broke backwards compatibility with all other warp and region files by doing that. 2011-07-21 15:03:15 -06:00
Lucas Nicodemus
3744e49592 Added a config option (default off) for banning by usernames. 2011-07-21 12:39:01 -06:00
Lucas Nicodemus
529f51d95e Merge branch 'general-devel' of github.com:TShock/TShock into general-devel 2011-07-21 12:31:58 -06:00
Lucas Nicodemus
0aea895a59 Import system now imports UserIDs 2011-07-21 12:31:11 -06:00
Lucas Nicodemus
cd018fed8d Regions are now UserID based. 2011-07-21 12:25:57 -06:00
Graham Cantin
9b1c5fd230 Readded all my changes, I think. 2011-07-21 04:14:42 -07:00
Zack Piispanen
3ce6de9e20 Merge branch 'master' of github.com:TShock/TShock
Conflicts:
	TShockAPI/Group.cs
	TShockAPI/TShock.cs
2011-07-20 20:58:26 -04:00
Zack Piispanen
cfcc0e7276 groups work, with inheritance, still need to remove order by 2011-07-20 20:55:49 -04:00
Lucas Nicodemus
8fa45f4aae Attempting to fix permissions 2011-07-19 20:36:15 -06:00
high
903a862d62 Changed a lot of RegionManager, fixed the file moving.
RegionManager is broken right now. Before it was adding ips to the userids table. Right now it doesn't import anything for userids. Also the function that uses AllowedIDs is expecting usernames instead of userids.
2011-07-19 21:26:34 -04:00