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

1943 commits

Author SHA1 Message Date
Zack Piispanen
7ea9be6e75 Changed how EditTile was handled so that we have enums and pass those instead of confusing bytes. 
Comments should be updated to reflect new stuff.
 2013-09-29 18:11:08 -04:00
Zack Piispanen
203611706e Fixed long if statement 2013-09-29 08:53:47 -04:00
Zack Piispanen
1bade821da Nothing to see here... 2013-09-29 08:26:05 -04:00
Steven French
155ed75c99 uncomment StrikeNPC and SetTime packets 2013-09-29 23:21:44 +13:00
Zack Piispanen
40ba6c56d3 Update packet logic up to 17 (not including 17 ->tile edit...something needs to be done with the last two bytes) 2013-09-29 05:29:18 -04:00
k0rd
c80ebbc116 Changed collision detection margins; added slush to it too. 2013-09-29 04:59:56 -04:00
k0rd
954b5f8b4c Merge remote branch 'origin' into 1.2_terraria 2013-09-29 03:57:52 -04:00
k0rd
ef2af933c4 beginning tile types in NetTile.cs 
fix typo in GetDataHandlers.cs
 2013-09-29 03:57:04 -04:00
Zack Piispanen
6d01f604a7 Merge branch '1.2_terraria' of github.com:Olink/TShock_1.2 into 1.2_terraria 2013-09-29 03:41:38 -04:00
Zack Piispanen
1a2f874285 Implemented Packet Teleport mechanism. 2013-09-29 03:37:20 -04:00
k0rd
a2fc066965 Added better noclip detection, including support for half and slanted blocks, and an ignore for honey. 2013-09-29 02:29:59 -04:00
Zack Piispanen
e148d29c66 Added packet changes for 1.2 protocol up to 7(world info) 2013-09-29 01:02:07 -04:00
Zack Piispanen
7731bc46f1 More minor fixes 2013-09-28 23:52:51 -04:00
Zack Piispanen
c17b661166 Stripped out stupid shit 
Commented packets we dont know about yet.
 2013-09-28 17:32:03 -04:00
Zack Piispanen
dea360869b Refactored the many matches found redundancy by adding a utils method. Changed the csproj to build x86 instead of anycpu which was causing issues for release. 2013-09-27 01:42:13 -04:00
Lucas Nicodemus
1a1d980186 VERSION TICK: 4.1.0.926 & Terraria 1.2 Code Freeze 2013-09-26 02:11:05 -06:00
MarioE
0dfe99ca68 Split superadmin permission. 2013-09-25 20:52:03 -04:00
MarioE
9c33980161 Change tp and rootonly. 2013-09-24 20:03:56 -04:00
MarioE
e1531ab675 Overhauled permissions. 
Overhauled permissions to use permission nodes, and separated some
permissions into smaller ones (such as cfg into tshock.cfg.maxspawns,
tshock.cfg.spawnrate, etc),
 2013-09-23 18:53:36 -04:00
Zack Piispanen
cc70a37af0 spaces: 0 tabs: 1 2013-09-22 23:33:36 -04:00
Zack Piispanen
b7019d8267 change permissions to tshock.xxx and fix default group creating to reference permissions that exist, and not hardcoded strings. 2013-09-22 23:14:14 -04:00
Zack Piispanen
8980a2155a Removed redundant code. 2013-09-22 22:56:52 -04:00
Zack Piispanen
a3c1b8cc49 Apparently this file didnt want to be commited last time. 2013-09-22 16:27:23 -04:00
Zack Piispanen
856def83b3 Added basic framework for allowing for ban durations and banning admin. 
Added BanningUser, Date(of ban), and Expiration to the db
On join, Expiration is checked, if ban is expired we remove it and the user is allowed on.
When running the ban command, your UAN is used as the banning user, and the date is that moment, with no expiration.
#531
 2013-09-22 16:04:12 -04:00
Zack Piispanen
7c0bcceb9f Added LastAccessed time field and KnownIPs field to the user database. This resulted in some changes everywhere, such as new logic with default groups. Apparently, somehow, the ip based stuff worked even though no ips were set to properly grab the user group. The wrong group was being assigned to new users resulting in a player with 0 permissions. This is now fixed. 2013-09-21 20:57:14 -04:00
Lucas Nicodemus
d4e193b44d Merge pull request #529 from k0rd/general-devel 
Remove WorldID from the WHERE clause in UPDATE SQL for RememberedPosManager
 2013-09-21 14:36:08 -07:00
Zack Piispanen
ba42fb08df Removed ip address from users, as well as changed /user add syntax to be '/user add username password group' instead of colon bullshit. 2013-09-21 17:11:22 -04:00
k0rd
88e8e65dcb Remove WorldID from the WHERE clause in UPDATE SQL for RememberedPosManager, changed logic to also update the WorldID 2013-09-21 16:41:45 -04:00
Zack Piispanen
4fed645fde Added config override for stat hacks. This makes updating for 1.12 easy as well since these will change then, small part of #525 2013-09-21 16:06:01 -04:00
Zack Piispanen
b23cdb41c3 Whelps, the info in the issue was not accurate. We are looking for the exception that writes a warning to the log file, not the console, not an error. This should be the right fix 2013-09-21 12:52:46 -04:00
Zack Piispanen
d0ba424cd1 Add in error ignore for the socket exception in the packet bufferer. 2013-09-21 12:22:22 -04:00
Zack Piispanen
ef584c62d7 Added Application tokens that can never be deleted, and are loaded either by the command line arg, or the list in the config file. Other plugins can easily add their own tokens into the dictionary as well, however, I believe the config file approach works best for transparency to the user. 
Currently, this is an extremely complex looking field in the config file now.  I don't think we should add a placeholder tho as servers wouldn't realize they had a rest token there.  Perhaps when we do a dump of the config file, someone can add the format for this field.

Closes #520
 2013-09-17 18:44:58 -04:00
Zack Piispanen
d53bb4b59c Remove postbuild stuff 2013-09-17 02:25:37 -04:00
Zack Piispanen
b22457382e remove unused using statements 2013-09-17 02:24:02 -04:00
Zack Piispanen
004f02264d Removed unused references. 2013-09-17 02:22:51 -04:00
Zack Piispanen
225668fcdd Some small rest improvements. Use newest TServer binary. 2013-09-16 00:09:29 -04:00
Lucas Nicodemus
dd05c524ec Merge branch 'master' into general-devel 2013-09-15 15:24:15 -06:00
Zack Piispanen
33050b1306 Fixed(?) lava and water liquid sets. Not sure if its even possible to get this far into the process, but if it was possible to bypass the item in hand checks in OnSecondUpdate() and OnPlayerUpdate() then they would successfully place lava/water. This should now be fixed, and if the right bucket isn't in their hand we ignore. 2013-08-28 00:42:45 -04:00
Lucas Nicodemus
7e1954d047 Removed now useless config option 2013-08-22 23:45:37 -06:00
Lucas Nicodemus
8fb046f5b3 Removed old, crusty stat tracker. 2013-08-22 22:50:59 -06:00
Lucas Nicodemus
66483e0325 Added the header for MaxMind's Geo stuff back 2013-08-22 21:54:47 -06:00
Lucas Nicodemus
ae7ab5f234 Updated copyright information to point to 2013. 2013-08-22 21:51:17 -06:00
Lucas Nicodemus
9470e20423 Line ending normalization to CRLF (Windows) 2013-08-22 21:17:32 -06:00
Lucas Nicodemus
f82bff1b17 Merge pull request #505 from CoderCow/patch-1 
REST Security and General Improvements
 2013-08-22 20:09:10 -07:00
CoderCow
581522355b Fixed broadcast not being displayed in the configured custom color. 2013-08-11 13:18:40 +02:00
CoderCow
f8fbe9b5da Added config setting "RestUseNewPermissionModel" to allow switching between the REST permission models for backward compatibility. 2013-08-02 13:01:22 +02:00
CoderCow
abeddd4c07 Minor improvements. 2013-08-02 13:01:17 +02:00
CoderCow
0f34aa03e8 Moved all new REST endpoints to "/v3"as "/v2" was incompatible. 2013-08-02 13:01:12 +02:00
CoderCow
9a40c81b49 Fixed all REST endpoints to use RestObjects instead of Dictionaries. 2013-08-02 13:01:06 +02:00
CoderCow
11f3099d30 Added "/rest listusers" to "/rest" default output. 2013-08-02 13:01:01 +02:00