Commit graph

2781 commits

Author SHA1 Message Date
Lucas Nicodemus
12a39f4e9a Revert "Use Sublime Text's "Convert all open views to tabs" option"
This reverts commit b35a02d379.
2015-02-21 23:00:30 -07:00
Lucas Nicodemus
b35a02d379 Use Sublime Text's "Convert all open views to tabs" option 2015-02-21 22:57:14 -07:00
Lucas Nicodemus
6a41c34380 isn't this ruby 2015-02-21 22:53:56 -07:00
Lucas Nicodemus
817479ea70 Add Getuser calls to delete user 2015-02-21 22:51:38 -07:00
Lucas Nicodemus
91d5fab27d Add account create & delete hooks 2015-02-21 22:35:05 -07:00
Zack
57029fa0af You know it is getting late when you forgot to switch it back to not creating drafts. But hey, it worked \O/ 2015-02-21 23:34:16 -05:00
Zack
ea39210a4f Lets not encode the content headers into the binary data being sent causing our zip file to be corrupt, ok? 2015-02-21 23:30:18 -05:00
Zack
0bc0b8d4bf Ignore SSL certs 2015-02-21 23:21:20 -05:00
Zack
5788beed1c Revert back to using requests... 2015-02-21 23:13:52 -05:00
Lucas Nicodemus
1f97447ea8 Remove 4 year old Terraria.csproj file 2015-02-21 19:39:28 -07:00
Lucas Nicodemus
4dba4d0116 Merge branch 'general-devel' of github.com:NyxStudios/TShock into general-devel 2015-02-21 19:38:13 -07:00
Lucas Nicodemus
41d4206cc9 Remove old useless junk files 2015-02-21 19:38:01 -07:00
Zack
3c415ee0bc Merge branch 'general-devel' of https://github.com/NyxStudios/TShock into general-devel 2015-02-21 21:37:28 -05:00
Zack
cc7e4356b1 Use urllib2 because @nicatrontg failed to install requests. 2015-02-21 21:37:21 -05:00
Lucas Nicodemus
19075094ff Merge branch 'general-devel' of github.com:NyxStudios/TShock into general-devel 2015-02-21 19:33:44 -07:00
Lucas Nicodemus
0280e7abbd Remove erroneous CONTRIBUTING file 2015-02-21 19:33:30 -07:00
Zack
44c8f40a6a Use environment variables from bamboo, maybe? 2015-02-21 21:17:44 -05:00
Zack
349ac17388 Rather hacky solution to security issues :( 2015-02-21 21:06:21 -05:00
Zack
0ae32f80d3 Merge branch 'general-devel' of https://github.com/NyxStudios/TShock into general-devel 2015-02-21 20:53:44 -05:00
Zack
aa633084e5 Add deploy to github button. 2015-02-21 20:53:36 -05:00
Lucas Nicodemus
bd066589b8 UpdateManager no longer silently shuts down after failure 2015-02-21 18:46:12 -07:00
Lucas Nicodemus
deb4113c73 /user group has proper error handling
This blast of commits fixes #543
2015-02-21 17:50:19 -07:00
Lucas Nicodemus
70104f795c /user password now returns correct message if user does not exist 2015-02-21 17:40:58 -07:00
Lucas Nicodemus
32c7645795 /user del now responds appropriately if the user doesn't exist 2015-02-21 17:36:32 -07:00
Lucas Nicodemus
964115dbb5 /user add now returns sensible errors 2015-02-21 17:34:39 -07:00
Lucas Nicodemus
d3ed04c947 Merge branch 'group-mgr-ee' into general-devel 2015-02-21 17:14:29 -07:00
Lucas Nicodemus
484ebd6d81 Do not auto-recreate the default groups on startup 2015-02-21 17:13:01 -07:00
Zack
f8a513d9da Change output of REST to UTF8, which is what Terraria uses behind the scenes. Also changed content type to include the encoding. Fixes #858 2015-02-21 19:00:57 -05:00
Lucas Nicodemus
3104e76d21 Version tick: 4.2.5
Changed versioning system to remove the date from the version
string.

Fixes #836
2015-02-21 15:27:04 -07:00
Lucas Nicodemus
e93d4c9741 Switch UpdateManager to use mimic server 2015-02-21 15:21:44 -07:00
Zack
da85655472 Update tshock_update.json 2015-01-28 15:38:52 -05:00
Zack
f9bf470b1d Tick version and update copyright 2015-01-28 15:29:13 -05:00
Zack
f188bd743c Remove StatTracker 2015-01-28 15:24:50 -05:00
Zack
e5a4f825d2 Commit latest TSAPI to repo. 2015-01-28 15:05:19 -05:00
MarioE
482d92ffa7 Merge pull request #854 from PhoenixICE/general-devel
Added Kicking for Damage Threshold
2014-12-18 09:39:19 -05:00
PhoenixICE
0dcbbc9f18 Added Kicking for Damage Threshold 2014-12-18 21:54:12 +08:00
Lucas Nicodemus
95b14a3b69 Made disclaimer a little nicer. 2014-11-11 21:10:59 -07:00
Zack
421702b8de Update README.md 2014-11-11 23:04:12 -05:00
Lucas Nicodemus
ac38866597 Merge pull request #849 from NyxStudios/revert-848-general-devel
Revert "Added npcStreamSpeed configuration parameter."
2014-11-08 17:29:07 -07:00
Lucas Nicodemus
05b29081bd Revert "Added npcStreamSpeed configuration parameter." 2014-11-08 17:28:28 -07:00
Lucas Nicodemus
fa88f2ecc9 Merge pull request #848 from Nuluvius/general-devel
Added npcStreamSpeed configuration parameter.
2014-11-08 15:40:55 -07:00
Sam Eaton
4ac6e70cc5 Attempt at correcting indentation. 2014-11-08 22:36:16 +00:00
Lucas Nicodemus
d2493db346 Merge pull request #846 from Enerdy/patch-3
Fix HandleProjectileNew for banned projectiles
2014-11-08 15:27:51 -07:00
Sam Eaton
2a8d3dd09a Added npcStreamSpeed configuration parameter. 2014-11-08 22:18:27 +00:00
Rodrigo
b688a31fd5 Fix HandleProjectileNew for banned projectiles 2014-10-26 15:22:51 +00:00
Lucas Nicodemus
5ffd373083 Removed two semicolons at the end of a line 2014-09-23 22:23:02 -06:00
Zack Piispanen
de4868a45d Merge branch 'general-devel' of https://github.com/NyxStudios/TShock into general-devel 2014-09-15 09:05:45 -04:00
Zack Piispanen
d5527ade42 Add length to database primary keys.
Tweak some of the itembans code to be less inefficient.
Removed a chunk of code from the buff code that prevented users from being buffed with a buff that comes from an item.  This code seemed to cause max cpu usage when being disabled.  I don't think this code is useful, but I leave that to people who own servers.  IMO all buff code should be removed.
2014-09-15 09:05:28 -04:00
Zack
03cf2487ad Merge pull request #837 from WhiteXZ/general-devel
Suppresses the SocketException warnings
2014-09-10 04:47:59 -04:00
White
70a9fc04c5 Suppress those pesky warnings 2014-09-10 14:31:20 +09:30