Commit graph

2992 commits

Author SHA1 Message Date
Lucas Nicodemus
1e68ac22c7 Remove superadmin customization config options 2017-12-02 14:25:33 -07:00
Ziteng Wang
744c812323 Fix item frame not working properly 2017-11-20 14:51:42 -08:00
koneko-nyan
6606c7a7b7 Merge branch 'general-devel' into patch-1 2017-10-13 09:30:08 +02:00
koneko-nyan
9d12461f8d Fix some spaces 2017-10-13 09:12:56 +02:00
Ziteng Wang
91e8077573 Merge branch 'general-devel' into group-renaming 2017-10-04 10:09:46 -07:00
koneko-nyan
aaa84d1ba9 Add 'rename' sub-command to /region 2017-10-02 17:45:57 +02:00
koneko-nyan
30475be268 Add RegionRename 2017-10-02 17:42:22 +02:00
koneko-nyan
d652fd6c83 Add OnRegionRenamed hook 2017-10-02 17:36:50 +02:00
ProfessorXZ
639ffb3c7c Fix GroupManager.RenameGroup() overwriting unsaved config changes 2017-09-28 16:43:20 +02:00
Lucas Nicodemus
4f3fa06028 Merge branch 'general-devel' into fix-build 2017-09-25 12:40:26 -06:00
Lucas Nicodemus
ec435e266e Make our string based error handling more explicit
(Please, someone, please, get rid of this).
2017-09-25 12:18:41 -06:00
ProfessorXZ
08e182f59e All GroupManager.RenameGroup() database calls are now done in a transaction
As pointed out by @hakusaro, in order to prevent any damage during the process all database calls need to be done in a transaction. Transactions allow us to rollback from a pending state in case something goes wrong.
2017-09-23 22:41:41 +02:00
ProfessorXZ
02806a2429 Added support for renaming groups. Fixes #1420 2017-09-21 10:51:37 +02:00
quake1337
7d5a74330a Ate one newline. 2017-09-20 17:42:32 +02:00
quake1337
a00950e480 Merge branch 'issue-1485' of https://github.com/bartico6/TShock into issue-1485 2017-09-20 17:40:19 +02:00
quake1337
4aa81a3d30 Add changes requested by @hakusaro 2017-09-20 17:39:38 +02:00
quake1337
f4775a1e1e Merge branch 'general-devel' into issue-1485 2017-09-20 10:31:39 +03:00
quake1337
e6ec63a90e Add @ijwu's changes + add /proc/meminfo trick for linux 2017-09-20 09:27:28 +02:00
koneko-nyan
c8549db087 Update Commands.cs
(time % 1.0) * 60.0 can be equal to 59.8, then it gets rounded to undesirable 60 displayed in the time format
2017-09-19 21:00:15 +02:00
ProfessorXZ
5a04b66514 Make Utils.GetBuffDescription actually return the buff's description & properly read 'buffTime' from the stream. Fixes #1469 2017-09-08 21:59:13 +02:00
quake1337
68437f0a22 Add "less than 2gb ram" warning 2017-08-14 14:39:22 +02:00
Ivan
a9e1d835b8 Merge branch 'general-devel' into user-equatable 2017-08-05 21:46:39 +02:00
quake1337
031ef517e3 Change field visibility 2017-08-04 12:52:07 +02:00
Leo Li
0753e6d213 Add more HintPaths for OTAPI
This will help msbuild to find missing libraries when create release
with `/p:Configuration=Release`.

With this patch, the searching order will be:
  - If OTAPI with same configuration found, use that.
  - Else if OTAPI with Release configuration found, use that.
  - Else use OTAPI with Debug configuration.
2017-07-23 20:42:42 -07:00
Lucas Nicodemus
156ce52845 Closes #1478
This addresses code feedback in the previously deleted pull request
2017-07-20 18:10:16 -06:00
Hussein Farran
3b32774a0d Merge branch 'general-devel' into validateplaceobject 2017-07-18 10:27:29 -04:00
Ruby Rose
685d9964f0 Change enum names for clarity 2017-07-17 09:06:29 +03:00
Ruby Rose
3764527d3d don't inherit handled event args for them 2017-07-17 09:06:29 +03:00
Ruby Rose
79f66f554f Turn the player hooks into a tristate 2017-07-17 09:06:29 +03:00
Ruby Rose
02be378a2e change doc of Equals 2017-07-17 06:34:30 +03:00
Ruby Rose
5e1be5b19b Fix formatting below IEquatable block 2017-07-17 06:34:30 +03:00
Ruby Rose
c8e31231ba override ToString of user 2017-07-17 06:34:30 +03:00
Ruby Rose
4216501c45 Make User implement IEquatable for more consistent comparisons 2017-07-17 06:34:30 +03:00
Jordan Coulam
1cdd33a78a Added ignoreVersion and loaded plugin list to StatTracking for issue #1444 (#1445) 2017-07-16 20:56:56 -06:00
Lucas Nicodemus
ae4f1ed779 Merge branch 'general-devel' into validateplaceobject 2017-07-15 13:39:33 -06:00
MarioE
ac8fe2a215 Remove netID handling of GiveItem, and provide a smaller overload 2017-07-15 13:32:35 -06:00
Lucas Nicodemus
983a678ff3 Fix issue 1467 - Password is now hashed when adding a user via REST API 2017-07-15 13:32:27 -06:00
Ryozuki
587d1b7390 fix comment typo 2017-07-15 13:32:09 -06:00
ProfessorXZ
6b3f18b1da Validate tile placement on PlaceObject, update CHANGELOG.md. Fixes #1418 2017-07-05 15:09:31 +02:00
MarioE
a948e0c301 Merge branch 'general-devel' of https://github.com/NyxStudios/TShock into general-devel 2017-06-23 14:47:48 -04:00
MarioE
50a4b07bc3 Add "new" EditActions. 2017-06-23 14:47:38 -04:00
MarioE
241d4c566f Fix incorrect slot calculation, and update submodule. 2017-06-23 14:44:17 -04:00
Ryozuki
40e3a9d5b8 fix comment typo 2017-06-22 21:05:14 +02:00
MarioE
9ad63c37a6 Fix /spawnmob not spawning negative IDs again. 2017-06-21 01:21:32 -04:00
MarioE
331eeb8cec Fix SaveManager saving when 1 player is on the server and another joins
The real fix would be to fix ServerLeave to not fire incorrectly when a player joins, but this will do for now.
2017-06-19 01:15:45 -04:00
Ruby Rose
8ae0a3b5a6 Write proper docs 2017-06-08 17:18:38 +03:00
Ruby Rose
7e08b9a8d0 Merge branch 'general-devel' into general-devel 2017-06-08 15:00:47 +03:00
Ruby Rose
81cb1381b4 Add hooks for item/projectile/tile bans 2017-06-07 15:32:40 +03:00
Ruby Rose
c841a86cdf hooks added 2017-06-07 10:46:46 +03:00
death
81e21f31dc Submodule update and new grass creep checks
Pulls through the latest OTAPI to make use of the new WorldGrassSpread hook which should allow corruption/crimsion/hallow creep config options work.
2017-05-16 22:41:27 +10:00