1
0
Commit Graph

6800 Commits

Author SHA1 Message Date
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
Tycho
5623a045f5 Fixed potential null dereference
Fixes CID 70466
2014-08-10 22:06:56 +01:00
STRWarrior
d95768d01a Bunch of tweaks:
Renamed Quarts to Quartz
Using const_iterator instead of iterator
Used CheckBasicStyle script to find style errors
2014-08-10 22:36:02 +02:00
Mattes D
babc8b2d18 Merge pull request #1309 from mc-server/coverity_fixes
Fixed potential crash in Player.cpp
2014-08-10 22:30:26 +02:00
Tycho
07103ed9d7 Spaces 2014-08-10 21:26:28 +01:00
Mattes D
0e8871374f Merge pull request #1299 from mc-server/Slabs
Send the old slab to the client when the interact cancelled.
2014-08-10 22:04:03 +02:00
Tycho
63a07b7ffc Fixed potential crash in Player.cpp
Fixes CID 71780
If ShouldBroadcastDeathMessages is false the pointer would fall through to a check agaist it being a player
2014-08-10 20:47:16 +01:00
Tycho
be780b380e Fixed Tools to work with new logging framework 2014-08-10 20:10:47 +01:00
Tycho
bf0050e066 Added forgoten files 2014-08-10 19:44:49 +01:00
Tycho
806d0936dc First Implementatation of new Loggin framework 2014-08-10 19:34:11 +01:00
Howaner
42bad0edec Added a comment and simplified code. 2014-08-10 20:06:03 +02:00
Mattes D
9469256cac Merge pull request #1305 from mc-server/Food
Fixed swing arm animation when you ate.
2014-08-10 19:36:29 +02:00
Howaner
938bf1df69 Changed comment. 2014-08-10 17:12:08 +02:00
Howaner
ae61156391 Fixed swing arm animation when you ate. 2014-08-10 17:08:22 +02:00
Howaner
f90078c09f Added IsDaylightCycleEnabled saving. 2014-08-10 16:48:20 +02:00
Howaner
cccc321384 Renamed functions. 2014-08-10 16:46:03 +02:00
Howaner
546dfaad3e Merge branch 'master' into LuaAPI 2014-08-10 16:35:07 +02:00
STRWarrior
e529401dbb Added NaturalPatches generator
It generates gravel and dirt.
2014-08-10 11:57:05 +02:00
STRWarrior
0ac3c67a21 Added NetherOreNests.
It generates Nether Quarts.
2014-08-10 11:48:05 +02:00
STRWarrior
ecfae28606 Changed cStructGenOreNests to take a list of ores + the block to replace. 2014-08-10 11:40:33 +02:00
STRWarrior
5eb5411f1e Removed an old and outdated comment. 2014-08-10 11:06:04 +02:00
madmaxoft
53862961ab Merge branch 'master' into Ranks 2014-08-09 22:57:58 +02:00
madmaxoft
b0dedb0197 WebAdmin: Manually exported string conversion functions.
ToLua generated an extra return value for GetHTMLEscapedString() and GetURLEncodedString(), making them difficult to use.
2014-08-09 22:56:15 +02:00
madmaxoft
dcef688ccc WebAdmin: Added GetURLEncodedString(). 2014-08-09 22:56:06 +02:00
madmaxoft
af202c2363 Debuggers: Disabled UUID and RankMgr tests. 2014-08-09 22:55:38 +02:00
madmaxoft
50359ce656 WebAdmin: Manually exported string conversion functions.
ToLua generated an extra return value for GetHTMLEscapedString() and GetURLEncodedString(), making them difficult to use.
2014-08-09 22:54:43 +02:00
madmaxoft
2ab8e76392 WebAdmin: Added GetURLEncodedString(). 2014-08-09 22:34:59 +02:00
madmaxoft
0001a7c9fc RankMgr: Added GetRankVisuals() function. 2014-08-09 17:36:19 +02:00
madmaxoft
4b1505f39d Merge remote-tracking branch 'origin/master' into Ranks 2014-08-09 14:25:49 +02:00
madmaxoft
251f0d5b97 Debuggers: Simple cRankManager test case. 2014-08-08 23:13:43 +02:00
madmaxoft
f1dc299fdb Exported cRankManager to LuaAPI. 2014-08-08 23:12:22 +02:00
madmaxoft
3df7d8446c cLuaState: Added GetStackValues() auto-generated templates.
These will read consecutive values off the stack, each value of a type independent of the other values.
Auto-generated because we don't have variadic templates in C++03.
2014-08-08 23:11:42 +02:00
Howaner
32e1e9a553 Renamed m_DoDaylightCycle to m_CycleDaylight. 2014-08-08 22:07:30 +02:00
Howaner
ebfc0fdc67 Added comment. 2014-08-08 22:04:53 +02:00
madmaxoft
89333c5870 RankMgr: Finished API implementation. 2014-08-08 21:30:47 +02:00
Howaner
3d68466ab0 Send the old slab to the client when the interact cancelled. 2014-08-08 18:55:05 +02:00
madmaxoft
a5b35e09ce RankMgr: Implemented GetXforY and GetAll APIs. 2014-08-08 16:38:38 +02:00
madmaxoft
65b81b4ab7 RankMgr: Implemented the basic API functions. 2014-08-08 10:02:25 +02:00
madmaxoft
670e94bfeb RankMgr: Renamed PermissionGroup to Group in API and PermGroup in DB.
"Group" is SQL keyword and shouldn't be used as table name.
2014-08-08 09:56:28 +02:00
Mattes D
27a818e173 Merge pull request #1295 from mc-server/crystal
On destroy ender crystal, create bedrock and fire.
2014-08-07 09:20:34 +02:00
Howaner
a73c85d7eb Fixed nether wart digging.
Fixes #1265
2014-08-07 02:42:42 +02:00
Howaner
0c622522ea Removed debug message. 2014-08-07 01:08:31 +02:00
Howaner
4271d719b6 Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld.
I need this for a GameRule plugin.
2014-08-07 01:07:32 +02:00
archshift
beab61bbfe On destroy ender crystal, create bedrock and fire 2014-08-06 14:16:36 -07:00
Mattes D
eae42d91f9 Merge pull request #1291 from mc-server/RedstoneCleanUp
Redstone clean up
2014-08-06 17:14:39 +02:00