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

942 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Lucas Nicodemus
1fce9ce36e Merge branch 'general-devel' of github.com:TShock/TShock into general-devel 2011-07-23 15:14:43 -06:00
Lucas Nicodemus
f1ed9207c1 New tests 2011-07-23 15:14:27 -06:00
Zack Piispanen
54e5fd65bc test items 2011-07-23 17:13:55 -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
0162186416 maybe i should commit the test files too? 2011-07-23 15:37:59 -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
aa85cfeccb Fixed compiler error 2011-07-22 23:35:58 -06:00
Lucas Nicodemus
219f5a8cfb WorldIDs 2011-07-22 23:35:21 -06:00
Zack
39754f6913 use ids ffs :\ 2011-07-22 22:34:08 -07:00
Lucas Nicodemus
870c1f74f4 Fixed warps too 2011-07-22 23:29:41 -06:00
Lucas Nicodemus
acbe9afa24 Version Tick: 3.1.3 2011-07-22 23:28:20 -06:00
high
95bdb6d62e added null check to backupmanager 2011-07-23 01:19:59 -04:00
high
78c7293542 Merge branch 'master' of github.com:TShock/TShock 
Conflicts:
	TShockAPI/Properties/AssemblyInfo.cs
 2011-07-23 00:51:14 -04:00
high
a49269cc0c Create save path first 2011-07-23 00:50:30 -04:00
Lucas Nicodemus
e58bc6231b VERSION TICK: 3.1.1.722 2011-07-22 21:49:28 -06:00
high
2e0ce6eae5 Fixed terrariaserver references 2011-07-22 23:22:54 -04:00
high
50084c13de Initialize log should be first so we can log any errors. 
Removed duplicate code in Initialize
 2011-07-22 23:19:01 -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
7f5324795c Merge branch 'master' of github.com:TShock/TShock 2011-07-22 23:12:20 -04:00
high
3034e82d4e Mysql binaries now copy local when tshock/dbeditor are built. 2011-07-22 23:11:58 -04:00
Steven French
fcde754784 Adds new permissions to DBEditor 2011-07-23 14:56:17 +12:00
high
65304873a4 Merge branch 'master' of github.com:TShock/TShock 2011-07-22 22:51:37 -04:00
high
9810604d50 Added .exe/.dll back to gitignore. (Fucking hate gitignore) 2011-07-22 22:51:27 -04:00
high
de5ce1a962 Moved sql and terrariaserver binaries 
Fixed DBEditor reference
 2011-07-22 22:49:54 -04:00
Lucas Nicodemus
7c89a29dd0 Killing an orphan 2011-07-22 20:46:51 -06:00
Lucas Nicodemus
9fe8036163 Merge branch 'master' of github.com:TShock/TShock 2011-07-22 20:42:06 -06:00
Steven French
ca9c5a5d4a Adds DBEditor to Master Project 
DBEditor can now add new groups
 2011-07-23 14:41:03 +12:00
Lucas Nicodemus
79e70bf90a Merge branch 'master' of github.com:TShock/TShock 2011-07-22 20:28:52 -06:00
Lucas Nicodemus
4c53f5e672 Lower case account names please :) 2011-07-22 20:28:04 -06: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
5458fb567a VERSION TICK: 3.1.0.0722 2011-07-22 17:41:04 -06: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
bd964d576e Merge branch 'general-devel' of github.com:TShock/TShock into general-devel 2011-07-22 15:06:53 -06:00
Zack Piispanen
7f2ff7614f Premissions now inherit from groups listed anywhere in the db, not just below them. 
TSDEV-39
 2011-07-22 16:29:29 -04:00
Lucas Nicodemus
91dd1b5edd Merge branch 'master' of github.com:TShock/TShock 2011-07-22 14:10:51 -06:00
Lucas Nicodemus
b5a27052a1 Updates to RM 2011-07-22 14:10:38 -06:00