Commit graph

64 commits

Author SHA1 Message Date
Shank
fd01ced7fb I don't remember this stuff. 2011-05-30 15:43:35 -06: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
Maverick Motherfucker
3b27d58536 Fixed merge conflict 2011-05-30 00:21:58 -07:00
Shank
0afb85f242 Ugh 2011-05-30 01:20:58 -06:00
Shank
f3591f1d8b Fixed version 2011-05-30 01:20:27 -06:00
Shank
572358c7f7 Updated .gitignore 2011-05-30 01:19:09 -06:00
Shank
ddf5e6dacb Added version information. 2011-05-30 01:18:34 -06:00
Maverick Motherfucker
19918b06c2 Merge branch 'api' of git.assembla.com:terraria into api 2011-05-30 00:15:54 -07:00
Shank
b5e43662f0 Kick + Ban 2011-05-30 01:14:58 -06:00
Maverick Motherfucker
1f1d59b0b5 Merge branch 'api' of git.assembla.com:terraria into api 2011-05-29 23:52:54 -07:00
Maverick Motherfucker
21c2f70154 New icon 2011-05-29 23:50:23 -07:00
Shank
d819544490 Requested 2011-05-30 00:40:33 -06:00
Maverick Motherfucker
b7bd604488 We have an icon now motherfuckas 2011-05-29 23:39:24 -07:00
Shank
0ffcfc46b3 Merge branch 'master' of git.assembla.com:terraria 2011-05-30 00:03:02 -06:00
Shank
7a71df80cc Updated project to reflect stuff. 2011-05-30 00:02:40 -06:00
Shank
edc123da73 Updated project to reflect stuff. 2011-05-30 00:00:35 -06:00
Shank
fab669b95a VERSION TICK: 3 2011-05-29 23:00:51 -06:00
Maverick Motherfucker
ad75da1bca Fixed /star it's messy, but it works 2011-05-29 21:52:52 -07:00
Maverick Motherfucker
2aa6baef8a made /bloodmoon do a time-sync 2011-05-29 21:41:51 -07:00
Maverick Motherfucker
a7df7abda9 Cleaned up stuff by chaning one tiny thing 2011-05-29 19:47:59 -07:00
Maverick Motherfucker
6d93d474ee Merge branch 'FunctionRename' 2011-05-29 19:35:46 -07:00
Maverick Motherfucker
5e91f13916 Made functions uppercase, like all of terraria's functions, to keep it consistent 2011-05-29 19:24:57 -07:00
Shank
bb45ebf74f Added /off 2011-05-29 20:21:42 -06:00
Shank
e599e985b3 Removed non-admin command that did nothing. 2011-05-29 20:10:02 -06:00
Maverick Motherfucker
49a054f635 penis 2011-05-29 19:00:57 -07:00
Maverick Motherfucker
539d136379 Fixed git shit 2011-05-29 18:59:28 -07:00
Maverick Motherfucker
bc72de9379 Fixed sln and added shit to gitignore 2011-05-29 18:57:08 -07:00
Shank
267890af18 Removed shit. 2011-05-29 19:56:41 -06:00
Shank
f6dc4f659f Started crap. 2011-05-29 19:24:32 -06:00
Shank
4a06637867 Fixed tile whitelist (hex of 0 is 0, which now has an exception)
VERSION TICK: 2.1
2011-05-29 11:34:21 -06:00
Shank
af9fd921bf Removed Steam.cs because we already gutted it anyhow. 2011-05-29 00:41:55 -06:00
Shank
ac25526aa3 enableGuide is now killGuide
--Which now gives him low health, low defense, and makes him unfriendly.
2011-05-29 00:39:21 -06:00
Shank
79b2946bf5 Added a one time invasion reminder for people who can't read docs properly. 2011-05-29 00:29:54 -06:00