1
0
Commit Graph

6396 Commits

Author SHA1 Message Date
Mattes D
d4996a434c Merge pull request #1250 from mc-server/NetherCeiling
Added a ceiling to disguise the bedrock above it.
2014-07-27 15:47:11 +02:00
STRWarrior
3addd4890c Removed forgotten comment 2014-07-27 14:04:34 +02:00
STRWarrior
bfad1be567 Made nether ceiling smooth. 2014-07-27 14:03:23 +02:00
STRWarrior
fe7018bd00 Added a ceiling to disguise the bedrock above it. 2014-07-27 13:12:45 +02:00
STRWarrior
50fc1a5469 NetherClumpFoliage: Fixed assert 2014-07-27 11:59:54 +02:00
madmaxoft
ce54936f01 Updated NetherFort prefabs to latest Gallery content. 2014-07-27 00:08:25 +02:00
Mattes D
56f4174943 Merge pull request #1232 from mc-server/splash-entity
Moved potion static functions to EntityEffect to create splash potions through the world
2014-07-26 16:47:11 +02:00
Mattes D
3a6b3a16b8 Merge pull request #1207 from Howaner/Inventory
Inventory fixes
2014-07-26 16:46:07 +02:00
Howaner
6e2025d125 Change comment. 2014-07-26 13:29:25 +02:00
Howaner
ef4d68adfd Merge branch 'master' into Inventory 2014-07-26 13:27:27 +02:00
archshift
e23f0238a8 Git: Ignore AllFiles.lst (generated by cmake) 2014-07-26 03:58:59 -07:00
archshift
16e0beb5b6 SplashPotionEntity: Use const cItem & instead of a cItem 2014-07-26 03:55:40 -07:00
archshift
60d4a16514 Fixed indentations, removed redundant init code in SplashPotionEntity.cpp 2014-07-26 03:48:16 -07:00
archshift
0298d34406 Moved potion static functions to EntityEffect to create splash potions through world 2014-07-26 03:48:16 -07:00
archshift
1595ef73dc Endianness.h: undefined ntohll before redefining 2014-07-26 03:42:42 -07:00
archshift
443112d70e Removed the new old-style-cast warning from error treatment
This is a new warning included in clang that ships with OS X 10.10 Yosemite.
2014-07-26 03:34:23 -07:00
STRWarrior
a39e19e94a Tweaks to NetherClumpFoliage
Simplefied the way NetherClupFoliage creates the X and Z coordinate.
2014-07-25 21:01:40 +02:00
STRWarrior
0f298c8b84 Speed up the NetherClumpFoliage finisher.
Using IntNoiseXX instead of CubicNoiseXX.
2014-07-25 14:23:36 +02:00
Tiger Wang
d3012d6904 Merge remote-tracking branch 'origin/master' 2014-07-24 21:38:46 +01:00
Tiger Wang
3a6002de5b Fixed block drops
* Fixes #1242 (the issue addressed within)
2014-07-24 21:38:25 +01:00
Mattes D
741fd41781 Merge pull request #1235 from mc-server/redundant-semis
Removed redundant semicolons and re-added the warning
2014-07-24 22:28:42 +02:00
archshift
431d898a81 Made redundant semi not an error, fixed one more. 2014-07-24 11:24:22 -07:00
archshift
4191be7ddb Removed redundant semicolons and re-added warning 2014-07-24 11:21:37 -07:00
madmaxoft
c0b62ef139 Added a queue for setting chunk data.
Fixes #1196.
2014-07-24 18:32:05 +02:00
STRWarrior
9678341a11 Made the cWorld::SpawnMobFinalize function more readable. 2014-07-24 12:15:48 +02:00
Mattes D
bb7919d66b Merge pull request #1237 from tonibm19/master
Moar view distance!
2014-07-23 20:47:42 +02:00
tonibm19
997a643977 Moar view distance!
Let's blow up our computers! :D
2014-07-23 20:28:56 +02:00
STRWarrior
7e38c123fc TallGrass: Less grass on mountains. 2014-07-23 11:23:35 +02:00
STRWarrior
9080f14dc2 Fixed possible crash in the NetherClumpFoliage finisher. 2014-07-23 11:02:42 +02:00
madmaxoft
dfadcf7453 BlockLeaves: Fixed comment style. 2014-07-23 09:12:06 +02:00
madmaxoft
ba8cb3b0a6 Fixed MSVC bindings regeneration.
Still one typo had been left in the cmake file.
2014-07-22 23:33:08 +02:00
madmaxoft
e171285408 Fixed Bindings generation in MSVC.
The bindings weren't regenerated because of the typo in the dependencies cmake variable.
2014-07-22 23:29:23 +02:00
archshift
f78bf254e3 Merge pull request #1234 from mc-server/GeneratorTweaks
ExtremeHillsPlus and ExtremeHills spawn with grass only
2014-07-22 14:20:06 -07:00
archshift
4044d0a6e6 Export SendEntityAnimation to ToLua 2014-07-22 13:10:12 -07:00
Tiger Wang
bc5db3274f Fix misguided comment on bits...
...obviously written by someone very confused, also known as me
2014-07-22 21:09:37 +01:00
archshift
9045246e74 Export BroadcastEntityAnimation with ToLua
Fixes #752
2014-07-22 13:02:28 -07:00
Tiger Wang
b5e5586ab0 Merge pull request #1216 from mc-server/saplingsandleaves
Fixed issues relating to saplings and leaves
2014-07-22 20:10:02 +01:00
Tiger Wang
18a0b60c12 Merge remote-tracking branch 'origin/master' into saplingsandleaves
Conflicts:
	src/Defines.h
2014-07-22 18:30:31 +01:00
STRWarrior
5b148c30f7 Extreme Hills M variant only spawn with grass and stone
Removed gravel.
2014-07-22 14:44:26 +02:00
madmaxoft
31b22e14b7 Updated prefabs to current Gallery content. 2014-07-22 10:04:53 +02:00
STRWarrior
bea574bf54 ExtremeHillsPlus and ExtremeHills spawn with grass only
Turns out only the M variants have stone and gravel in them.
2014-07-21 18:53:56 +02:00
madmaxoft
7672418ca8 Merged branch 'origin/Foliage'. 2014-07-21 18:18:54 +02:00
madmaxoft
dd0ab04481 Defines.h: Fixed a warning. 2014-07-21 18:07:51 +02:00
madmaxoft
63cc008340 CheckBasicStyle: Added a lua shebang. 2014-07-21 17:57:50 +02:00
madmaxoft
26ad3dbee4 CheckBasicStyle: Doesn't require LuaFileSystem.
Instead it uses the list of files generated by CMake.
2014-07-21 17:40:45 +02:00
madmaxoft
5194eef07d CMake: generates a list of all source files.
This will be used for the style-checking script.
2014-07-21 17:40:44 +02:00
madmaxoft
9e7b9a4ebe Normalized spaces after "catch". 2014-07-21 17:40:44 +02:00
madmaxoft
fe6a3b5d72 CheckBasicStyle: Checks spaces after keywords, no space before ")". 2014-07-21 17:40:43 +02:00
madmaxoft
93d29555e5 Style: Normalized to no spaces before closing parenthesis. 2014-07-21 17:40:43 +02:00
madmaxoft
6be79575fd Style: Normalized spaces after if, for and while. 2014-07-21 17:38:50 +02:00