Commit graph

1815 commits

Author SHA1 Message Date
Erik
e3c09f28d5 Derp 2012-02-03 19:49:24 -06:00
k0rd
9a463d36e6 Merge pull request #348 from k0rd/general-devel
added non-hardmode ores to /genore command
2012-02-03 17:13:21 -08:00
k0rd
521fe6c015 added non-hardmode ores to /genore command. 2012-02-03 19:51:05 -05:00
Lucas Nicodemus
cf88214be4 Merge branch 'general-devel' of github.com:TShock/TShock into general-devel 2012-02-02 21:41:35 -07:00
Lucas Nicodemus
332bfe99f4 Removed try cache on config file, will now fail startup. Fixes #334 2012-02-02 21:41:14 -07:00
k0rd
5ece3bc7c3 Merge pull request #343 from darkvengance/master 2012-02-01 19:44:29 -08:00
Darkvengance aka Sildaekar
9d18ab3ce0 pearlstone brick now changed to grey brick 2012-02-01 15:14:04 -06:00
Darkvengance aka Sildaekar
043861edaa pearlstone brick now changed to grey brick 2012-02-01 15:09:22 -06:00
Darkvengance aka Sildaekar
da87682719 removespecial now removes pearlstone bricks 2012-02-01 14:59:25 -06:00
Darkvengance aka Sildaekar
99fb24c82a removespecial now removes pearlstone bricks 2012-02-01 14:55:41 -06:00
Darkvengance aka Sildaekar
accdb03d19 Removed demonite ore from the "removespecial" and "convertcorruption" commands. 2012-02-01 13:48:56 -06:00
Darkvengance aka Sildaekar
5a6b59cbad Added removespecial command 2012-02-01 13:44:05 -06:00
Darkvengance aka Sildaekar
44afc6d8dd Updated Local Files 2012-02-01 12:00:31 -06:00
k0rd
d6f0c0ecf5 /restart doesn't work for mono.. yet 2012-01-31 23:37:59 -05:00
k0rd
7855696f88 Merge remote branch 'origin/general-devel' into general-devel 2012-01-31 23:03:07 -05:00
k0rd
f3d4b0c6d1 another change to make remembered position work correctly 2012-01-31 23:00:56 -05:00
k0rd
ad56dd0741 this was trying to enter Player Names in multiple rows when the IP was different - but player name is the primary key!
(also fixed position on reconnect)

Remembering Position should now work correctly.
2012-01-31 21:02:16 -05:00
Lucas Nicodemus
2ca0121271 Merge pull request #342 from darkvengance/master
Why not?
2012-01-31 17:14:05 -08:00
Darkvengance aka Sildaekar
87e3fd347d Added 'restart' command 2012-01-31 11:31:58 -06:00
Lucas Nicodemus
76d486778a Merge pull request #341 from darkvengance/master
Rest API
2012-01-31 05:47:24 -08:00
Darkvengance aka Sildaekar
2e9f07c6f3 More functionality in spawnrate and maxspawns commands 2012-01-31 06:31:08 -06:00
Darkvengance aka Sildaekar
fcb44cc62a Fixed minor error in log name code 2012-01-31 05:02:45 -06:00
Darkvengance aka Sildaekar
550e6b3685 Removed deperecated Rest API endpoints and updated UserListV2 method 2012-01-31 04:50:20 -06:00
Lucas Nicodemus
f70dd7386b Merge pull request #340 from darkvengance/master
Log Name change
2012-01-31 02:08:09 -08:00
Darkvengance aka Sildaekar
9371c4972d Log's name is now timestamp with yyyyMMddHHmmss.log format 2012-01-31 03:41:25 -06:00
Lucas Nicodemus
13e00c7d2d Save SSI on /off
Should technically solve #339, but there are probably more instances around the codebase that have the same issue.
2012-01-31 02:10:05 -07:00
k0rd
74035d5c1e sand, silt, pearlsand, and ebonsand shouldn't trigger noclip detection 2012-01-30 04:05:55 -05:00
k0rd
436cd058ec We don't want to revert everything the player has done on the server in case of disable() for tilekill 2012-01-29 08:39:42 -05:00
k0rd
937b596dbe Merge remote branch 'upstream/general-devel' into general-devel 2012-01-29 03:44:49 -05:00
k0rd
ccda71027b attempting to fix client/server tile disagreements after teleporting 2012-01-29 03:07:19 -05:00
k0rd
220bcd00b1 Merge remote branch 'k0rd/general-devel' into general-devel 2012-01-28 05:29:28 -05:00
k0rd
1e8cb04fdd allow teleporting and warps at edges of the map 2012-01-28 05:19:15 -05:00
Lucas Nicodemus
a764d24422 Merge branch 'master' of github.com:TShock/TShock
Conflicts:
	TShockAPI/TShock.cs
2012-01-26 22:46:50 -07:00
Lucas Nicodemus
4722046b48 Merge branch 'general-devel'
Conflicts:
	TShockAPI/TShock.cs
2012-01-26 22:43:14 -07:00
Lucas Nicodemus
7e26c40744 VERSION TICK: 3.6.0.0126
(I'm counting third as a hotfix count, this isn't a hotfix)
2012-01-26 22:39:46 -07:00
Zack Piispanen
55a2ba8c35 Merge remote-tracking branch 'remotes/origin/general-devel' 2012-01-27 00:38:42 -05:00
Zack Piispanen
66d103d3e2 tick version 2012-01-27 00:31:58 -05:00
Zack Piispanen
233ec3416f Merge branch 'general-devel' of github.com:TShock/TShock into general-devel 2012-01-26 23:57:55 -05:00
Zack Piispanen
41404f1a19 Added /group
usage: /group list
       /group perm <group name>

Will show you all groups and the permissions for a group respectively

Permission required is managegroup
2012-01-26 23:57:43 -05:00
Lucas Nicodemus
d3bacc60a6 Merge pull request #336 from k0rd/general-devel
Fix for music box
2012-01-26 17:36:38 -08:00
k0rd
274cdf63a6 Fix for music box disappearing for the player when a player right-clicks it (part of insecure tile fixes) 2012-01-26 20:42:16 -05:00
Zack Piispanen
3934209a16 /world will show you world name and id.
Permission: cfg is required.
2012-01-26 20:27:40 -05:00
Zack Piispanen
2603b942bb Added console output/logging of boss summons. 2012-01-26 20:01:03 -05:00
Zack Piispanen
1306043c00 Added permission for seeing ids when using /who
Also added in the ability to see ids when using /who.  Good for quickly adding ids to a region.
2012-01-26 19:41:12 -05:00
Deathmax
174acade76 Merge pull request #335 from k0rd/general-devel
more accurately updated position during teleportation, warps, and noclip detection
2012-01-25 20:36:15 -08:00
k0rd
6a1e52394a Properly update position for hacky noclip detection and teleportation methods. 2012-01-25 23:28:35 -05:00
Deathmax
ab55481ddb Don't log IndexOutOfRange exceptions in SendTileSquare 2012-01-26 09:50:42 +08:00
Zack Piispanen
a8ac9435fd Updating bin, again. Hindsight is 20/20.
Added npc spawn hook and event,
2012-01-25 14:24:58 -05:00
Zack Piispanen
9db95d01f3 Update the bin for real to fix the autocreate/start server stuff. 2012-01-25 12:41:40 -05:00
Lucas Nicodemus
143f74bd11 Merge pull request #334 from ZeDingo/general-devel
Added group to /ui, /ui /ban /kick shows matching player names
2012-01-25 06:46:48 -08:00