1
0
Commit Graph

6678 Commits

Author SHA1 Message Date
Masy98
b4cc3a118b Added missing recipes for stairs and slabs! 2014-08-21 21:50:32 +02:00
Masy98
81492f70d1 Changed new logs from wood to log! 2014-08-21 21:41:43 +02:00
Masy98
f569826a95 Added missing blocks in item.ini 2014-08-21 21:38:50 +02:00
Mattes D
bacfca7c20 Merge pull request #1314 from mc-server/Fire
Fixed cancelled fire interact from all directions.
2014-08-21 07:50:58 +02:00
STRWarrior
3a113e3a75 Merge pull request #1339 from mc-server/Hooks
Added HOOK_SERVER_PING
2014-08-20 22:57:48 +02:00
Howaner
f7774ec336 Merge branch 'master' into Fire 2014-08-20 22:25:05 +02:00
Howaner
4da61e67d7 Renamed a_Motd to a_ServerDescription. 2014-08-20 22:22:38 +02:00
Howaner
cf5ab14ca5 Added a_ClientHandle to the HOOK_SERVER_PING hook. 2014-08-20 22:19:50 +02:00
Mattes D
5410a36f92 Merge pull request #1335 from mc-server/CodeFixes
Code formatting fixes.
2014-08-20 16:23:31 +02:00
Howaner
cfdf39a75f Added "HOOK_SERVER_PING" call to older protocols 2014-08-20 16:12:05 +02:00
Howaner
2cca4d70c8 Cleaned up code. 2014-08-20 16:04:18 +02:00
Howaner
228dd61995 Added HOOK_SERVER_PING 2014-08-20 16:01:30 +02:00
Howaner
67fc19301e Removed old classes from the CMakeLists.txt 2014-08-20 12:14:56 +02:00
Howaner
b5ffe06f88 Code formatting fixes. 2014-08-19 22:14:37 +02:00
Mattes D
e4fc05574b Player: Silenced a few type conversion warnings. 2014-08-18 22:48:15 +02:00
Mattes D
80559406f9 Player saving creates the "players" folder, if needed.
Fixes #1268.
2014-08-17 22:47:00 +02:00
STRWarrior
9522bd842e SwamplandM: Fixed sometimes having no mountains. 2014-08-18 12:53:36 +02:00
Mattes D
e045a25e10 Merge pull request #1329 from mc-server/Move
Better OnPlayerMoving hook.
2014-08-16 22:29:41 +02:00
Howaner
6c8baf66c8 Updated HOOK_PLAYER_MOVING documentation. 2014-08-16 18:49:24 +02:00
Howaner
a68c70c900 Better OnPlayerMoving hook. 2014-08-16 18:44:14 +02:00
Howaner
9395cf0bca First implementation of HOOK_SERVER_PING. 2014-08-16 18:02:16 +02:00
Mattes D
e553d58eaf Merge pull request #1308 from mc-server/logger
New Logging framework
2014-08-15 07:20:37 +02:00
madmaxoft
1f4a1383c2 Removed an unneeded cast. 2014-08-15 07:19:13 +02:00
madmaxoft
008c1cdaf4 CheckBasicStyle checks the src folder as well. 2014-08-14 01:03:30 +02:00
madmaxoft
36e918ce9b File logger prefixes are 4 chars wide. 2014-08-13 13:31:19 +02:00
madmaxoft
5921f78e52 Logger: Fixed windows debug ODS logger, fixed-size file prefixes. 2014-08-13 13:28:45 +02:00
madmaxoft
08c55ef983 Logger: Fixed missing timestamp in log messages. 2014-08-13 13:27:56 +02:00
Mattes D
6f1fa8f26f Merge pull request #1319 from mc-server/webadminfixes
A couple of fixes for issues with the webadmin
2014-08-13 13:22:26 +02:00
Tycho
2321d2af41 Fixed shadowing variable 2014-08-13 12:01:13 +01:00
Tycho
60ea4bb937 Removed unused method 2014-08-13 11:56:47 +01:00
madmaxoft
10e58f04da Fixed windows compilation and style issues. 2014-08-12 22:43:04 +02:00
Tycho
01c50eb53a Fix messing rename 2014-08-12 17:32:08 +01:00
Tycho
9844368267 Renamed Loggers 2014-08-12 16:05:04 +01:00
Franz Reiter
8f0c4911f7 Merge pull request #1296 from mc-server/LuaAPI
Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld.
2014-08-12 16:05:33 +02:00
Howaner
cb98014582 Revert "Removes the fire if the block under the fire was broken."
This reverts commit 01001d2a49.
2014-08-11 23:12:32 +02:00
Howaner
01001d2a49 Removes the fire if the block under the fire was broken. 2014-08-11 22:37:28 +02:00
Howaner
74fabb079c Moved the clicked-through block check to the top of the function. 2014-08-11 22:34:33 +02:00
Alexander Harkness
ed79622734 Merge pull request #1316 from ChriPiv/master
Add entry for bat in monsters.ini
2014-08-11 19:24:33 +01:00
Christophe Piveteau
f7726317c9 Add entry for bat in monsters.ini 2014-08-11 18:57:41 +02:00
madmaxoft
0a52ed6eb9 cProtocol172: Check return values.
Fixes CID 43489, CID 43490, CID 43491, CID 43493, CID 66410, CID 66411, CID 66416, CID 66417, CID 66418, CID 66419, CID 66420, CID 66421, CID 66422, CID 66423, CID 66424, CID 66425, CID 66429, CID 66430, CID 66431
2014-08-11 15:33:20 +02:00
Howaner
202a0d1c1d Fixed cancelled fire interact from all directions. 2014-08-11 14:24:36 +02:00
Mattes D
ef513720fb Merge pull request #1310 from mc-server/ChestFix
Fixed potential null dereference
2014-08-11 13:22:26 +02:00
Mattes D
54cf69a634 Merge pull request #1301 from mc-server/Ores
Ore Tweaks
2014-08-11 12:10:20 +02:00
Mattes D
06cc5c22ef Merge pull request #1312 from mc-server/unnamed-enum
Various unnamed enum fixes
2014-08-11 08:28:31 +02:00
archshift
a7eb4032ee Fixed tolua error with static initialization 2014-08-10 17:13:14 -07:00
Howaner
47c928cab7 Exported daylight cycle flag to the protocol. 2014-08-11 00:20:28 +02:00
archshift
92f67789fc Gave names to unnamed enums 2014-08-10 15:06:59 -07:00
archshift
dba6723611 Player.cpp: change unnamed enum to constant integers 2014-08-10 15:06:59 -07:00
Mattes D
0953bf403b Merge pull request #1311 from mc-server/CMakeFix
Fixed circular dependecy luaState_Call.inc
2014-08-10 23:19:54 +02:00
Tycho
df96f437a3 Fixed circular dependecy luaState_Call.inc 2014-08-10 22:15:52 +01:00