Commit graph

4148 commits

Author SHA1 Message Date
high
ab4d714a97 merge take 2 2011-06-01 04:14:39 -04:00
high
da882cc9db Merge branch 'master' of git.assembla.com:terraria
Conflicts:
	TShockAPI/TShock.cs
2011-06-01 04:07:27 -04:00
Deathmax
797b26b6c8 Added a basic /spawnmob 2011-06-01 15:59:36 +08:00
high
0d4e09dbd5 fixed teleporting 2011-06-01 03:56:13 -04:00
Shank
734aaa2fb8 Moved some code around
Fixed dead code
2011-06-01 00:10:25 -06:00
Shank
0e09801e0c Added more version code 2011-05-31 22:06:43 -06:00
Shank
24d8a55060 Re-adding the version checker. 2011-05-31 22:03:41 -06:00
Shank
81f6f5e583 Re-write anti tnt code 2011-05-31 21:57:38 -06:00
Shank
b3968666d7 Added Teleportation 2011-05-31 15:07:52 -06:00
Shank
480dee53b5 Updated GetData hook to support PvP and the tile whitelist.
Updated GetData to use BinaryReaders because they're 10x less confusing, 10x more versatile, and generally more awesome as a whole.
2011-05-31 00:54:20 -06:00
Shank
d6b913a954 PermaPVP works. 2011-05-31 00:18:20 -06:00
Shank
920f298e42 Updated for API 1.1 2011-05-30 23:20:01 -06:00
Shank
40e1f11b61 Updated messageBuffer to parse out newline names. 2011-05-30 20:41:08 -06:00
Shank
97524f1e02 Fixed conflict 2011-05-30 15:59:42 -06:00
Shank
4035c5dd71 Merge branch 'api' of git.assembla.com:terraria into api
Conflicts:
	TShockAPI/TShock.cs
	TShockAPI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
2011-05-30 15:44:16 -06:00
Shank
fd01ced7fb I don't remember this stuff. 2011-05-30 15:43:35 -06:00
Maverick Motherfucker
a4cf86f853 fixed error 2011-05-30 13:45:55 -07:00
Shank
5683539441 Added spawn stuff. 2011-05-30 04:01:42 -06:00
Shank
7428b0e1f7 Fixed stupid language use
Added some stuff in the event that this conflicts with what people are playing on.
2011-05-30 03:33:47 -06:00
Shank
f42435fd68 ALSO FUCK THAT SYMLINK 2011-05-30 03:24:11 -06:00
Shank
338997739b Merge branch 'api' of git.assembla.com:terraria into api
Conflicts:
	TShockAPI/TShock.cs
2011-05-30 03:18:14 -06:00
Shank
b50e7d2f54 Updating stuff 2011-05-30 03:07:55 -06:00
Maverick Motherfucker
9006ffbd96 Merge or some shit 2011-05-30 02:00:36 -07:00
Maverick Motherfucker
0dee1092ee Merge or some shit 2011-05-30 01:57:56 -07:00
Shank
3ccdba9f51 Merge branch 'master' of git.assembla.com:terraria into api
Conflicts:
	.gitignore
2011-05-30 02:50:31 -06:00
Maverick Motherfucker
314613ef23 Got anti tile greif semi working 2011-05-30 01:47:14 -07:00
Shank
ef60c83b40 Updated more stuff with motd 2011-05-30 02:40:41 -06:00
Shank
e577fa0fd0 Added MOTD 2011-05-30 02:33:28 -06:00
Shank
b852c1bd54 Added whitelist 2011-05-30 02:24:13 -06:00
Maverick Motherfucker
e125aa6197 Got debug and compile working in this motherfucker 2011-05-30 01:16:41 -07:00
Shank
089c5b027b Added whitelist 2011-05-30 02:08:32 -06:00
Shank
c61a4b6aca Added a hook for TNT. 2011-05-30 01:58:22 -06:00
Shank
45c7e6e830 General stuff. 2011-05-30 01:49:44 -06:00
Shank
dfa89f28f1 Fixed kick. 2011-05-30 01:30:47 -06:00
Shank
f87a14577e Added shitty config system 2011-05-30 01:23:45 -06:00
Shank
f3591f1d8b Fixed version 2011-05-30 01:20:27 -06:00
Shank
ddf5e6dacb Added version information. 2011-05-30 01:18:34 -06:00
Shank
b5e43662f0 Kick + Ban 2011-05-30 01:14:58 -06:00
Shank
d819544490 Requested 2011-05-30 00:40:33 -06:00
high
2e9c05aee8 Why the fuck was this versioned? 2011-05-29 22:04:34 -04:00
high
cad7e04e42 Merge branch 'master' of github.com:TShock/TShock into general-devel 2011-05-29 10:09:28 -04:00
high
a775511694 Merge branch 'master' of github.com:TShock/TShock into sql 2011-05-29 10:07:52 -04:00
high
2a1b81c86a Added /clearbans
fixed sql query in find by name.
2011-07-01 17:50:33 -04:00
high
f1c86a6216 BanManager now fully sql based 2011-07-01 17:08:42 -04:00
high
6a960c2db9 Merge branch 'master' of github.com:TShock/TShock into sql 2011-07-01 16:47:24 -04:00
high
cfd472b3cb Merge branch 'master' of github.com:TShock/TShock into sql 2011-07-01 16:08:13 -04:00
high
c644fcd45c Sqlite added
BanManager now uses sqlite (imcomplete)
2011-07-01 15:54:52 -04:00
high
3b76e84051 Updated binaries to v1.5.0.4 2011-05-29 10:06:22 -04:00