Commit Graph
6627 Commits
Author SHA1 Message Date
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
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
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
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 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
Howaner ebfc0fdc67 Added comment. 2014-08-08 22:04:53 +02:00
Howaner 3d68466ab0 Send the old slab to the client when the interact cancelled. 2014-08-08 18:55:05 +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
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
Tycho 6acddd0cad Fixed style issues 2014-08-06 13:19:22 +01:00
Tycho a0ba7426c6 Fixed multiple inhertance being output by tolua 2014-08-06 13:17:05 +01:00
Howaner ff7171fc5a Resending fire to the client when the interact cancelled. 2014-08-06 14:04:25 +02:00
Tycho 9272bd627c Removed dependecy of redstone simulator on NoteBlock 2014-08-05 22:54:36 +01:00
Tycho 06942871dd Refactored Redstone simulator not to depend on TNTEntity or DropSpenserENtity Directly 2014-08-05 21:48:23 +01:00
Franz Reiter e2f1e0589c Merge pull request #1289 from mc-server/LuaAPI
Added Clamp() function to the lua api.
2014-08-05 22:24:03 +02:00
Howaner 5f04488a97 Made lua clamp() compatible with all number types. 2014-08-05 18:39:18 +02:00
Howaner 43de9af878 Added api documentation for Clamp() 2014-08-05 13:54:04 +02:00
Howaner a92cff20ea Added Clamp() function to the lua api. 2014-08-05 13:47:10 +02:00
archshift d2d0ffee21 Fixed unsigned long comparison to size_t 2014-08-04 19:43:33 -07:00
madmaxoft 9113b45673 MojangAPI: Fixed PlayerNameToUUID(). 2014-08-04 23:35:50 +02:00
Franz Reiter e2c4fbd4e2 Merge pull request #1287 from Howaner/Bow
Added arrow consuming on shooting
2014-08-04 22:30:58 +02:00
Howaner 2e43eaaba7 Changed arrow comment. 2014-08-04 22:30:13 +02:00
Tiger Wang a032594bf7 Merge branch 'master' of https://github.com/mc-server/MCServer 2014-08-04 21:24:31 +01:00
Tiger Wang 0b9eb20b92 Fixed signs not staying on other signs 2014-08-04 21:22:08 +01:00
Tiger Wang de9d908792 Made AllToLua output consistent 2014-08-04 21:21:35 +01:00
Howaner 434ea542e1 Added arrow consuming on shooting 2014-08-04 21:48:33 +02:00
Howaner f5b71cc1f8 Fixed #1286 2014-08-04 20:16:52 +02:00
Tiger Wang 01e9d6311a Updated submodules 2014-08-04 14:24:46 +01:00
madmaxoft 7bfb0b05d0 CheckBasicStyle: multi-level indent change. 2014-08-04 13:20:29 +02:00