1
0
Commit Graph

7960 Commits

Author SHA1 Message Date
Mattes D
9f24c0c4da OctavedNoise: Unshadowed a local variable. 2014-11-27 22:44:02 +01:00
Mattes D
a6ed5cb1d8 BlockEntities: Removed the extra semicolon. 2014-11-27 22:42:08 +01:00
Mattes D
186b2f3bd0 Replaced auto_ptr with unique_ptr. 2014-11-27 21:27:03 +01:00
Mattes D
61ce09e4d0 CompoGenBiomal: Fixed signed vs unsigned comparison. 2014-11-27 21:24:03 +01:00
Mattes D
e3e13f552f Fixed BlockStringToType return value.
-1 was not a valid BLOCKTYPE and would not be recognized by the callers, ever.
2014-11-27 21:19:52 +01:00
Mattes D
a971dee379 CMake: Fixed linux builds. 2014-11-26 12:45:53 +01:00
Mattes D
a9e77fe7da cRoot: Fixed a memory leak with cRankManager. 2014-11-26 11:00:46 +01:00
Mattes D
413e5c20fe Windows: Fixed builds with LeakFinder enabled. 2014-11-26 11:00:21 +01:00
Mattes D
0ca891da6d WSSAnvil: Fixed bad code in arrow loading. 2014-11-26 10:14:11 +01:00
Tiger Wang
187bdab4fa Merge remote-tracking branch 'origin-master' into c++11 2014-11-25 23:03:33 +00:00
Mattes D
e88b93089f Merge pull request #1617 from mc-server/ReachDistance
ClientHandle: Fixed max block place distance check.
2014-11-25 22:46:17 +01:00
Mattes D
c1a52dc9fb ClientHandle: Fixed max block place distance check.
Fixes #1492
2014-11-25 21:24:25 +01:00
Mattes D
9f4562289e Merge pull request #1604 from mc-server/GeneratorShapeRefactor
Generator shape refactor
2014-11-24 21:56:25 +01:00
Mattes D
e23bde503f Merge pull request #1611 from mc-server/SpawnPrepare
cWorld: Rewritten spawn preparation.
2014-11-24 15:39:05 +01:00
Mattes D
3e068a01a8 Changed back capitalization. 2014-11-24 13:44:15 +01:00
Mattes D
478bbad5ed Added TwoHeights shape generator.
This is a faster shape generator that can generate overhangs and has biome awareness.
2014-11-23 18:16:20 +01:00
Tiger Wang
2ae4d2a96a Removed unnecessary #includes 2014-11-23 17:13:40 +00:00
Tiger Wang
79e5b82354 Merge remote-tracking branch 'origin/master' into c++11
Conflicts:
	src/Noise/Noise.h
	src/World.h
2014-11-23 17:12:34 +00:00
Tiger Wang
6382989ba0 Compilation fixes 2014-11-23 14:22:05 +00:00
Tiger Wang
e8e03e5df2 Update GCC on Travis 2014-11-23 14:21:44 +00:00
Mattes D
9f4342434b Noise3D generator: Enlarged averaging to avoid steep beach slopes. 2014-11-23 15:10:55 +01:00
Mattes D
e9797c6a2a Merge remote-tracking branch 'origin/master' into GeneratorShapeRefactor 2014-11-23 12:33:04 +01:00
Mattes D
dea8b684b2 Merge pull request #1612 from p-mcgowan/pigsIntoZombiePigmenOnLightning
pigs turn into pigmen on lightning
2014-11-23 09:27:46 +01:00
p-mcgowan
7a08c05787 formatting - newline at EOF inserted: Pig.cpp 2014-11-22 15:48:05 -08:00
p-mcgowan
d1b7a965d1 pigs turn into pigmen on lightning 2014-11-22 15:33:34 -08:00
Mattes D
075daf9beb Merge pull request #1610 from p-mcgowan/villagersIntoWitchOnLightning
Villagers into witch on lightning
2014-11-22 18:39:17 +01:00
Mattes D
b520f336da cWorld: Rewritten spawn preparation.
It now supports pregeneration distance of any size and runs in two threads in parallel (generator / lighting).
Fixes #1597.
2014-11-22 16:00:19 +01:00
Mattes D
f0266c578e InfoReg: Added a diagnostic for bad Info.lua command info. 2014-11-22 13:31:58 +01:00
p-mcgowan
793b1012c4 formatter error 2014-11-21 23:58:35 -08:00
p-mcgowan
635e9321c6 villagers turn into witches on lightning 2014-11-21 23:36:35 -08:00
p-mcgowan
ac2e3ede1d villagers turn into witches when struck by lightning 2014-11-21 23:20:44 -08:00
Mattes D
a05a318cdd cWorld: Changed generator defaults. 2014-11-20 22:51:07 +01:00
Mattes D
1ed32b825e BiomalNoise3D generator: finished all biomes. 2014-11-20 22:48:14 +01:00
Mattes D
b7dd2dddf9 CompoGenBiomal: Fixed sealevel offset. 2014-11-20 22:45:50 +01:00
Mattes D
f3e9fa74d2 Merge pull request #1594 from mc-server/LargeOakTree
Large Oak Tree
2014-11-20 21:30:50 +01:00
Mattes D
1e887d1381 CompoGenBiomal: Fixed sealevel not generating properly. 2014-11-20 18:05:30 +01:00
Mattes D
76058e8183 Generators: Unified SeaLevel into a single variable.
It is shared between shape generators and composition generators and there's no sense in having two different values for those.
2014-11-20 15:31:03 +01:00
Mattes D
5325885ef4 Noise3D generators: Changed noise generator to InterpolNoise. 2014-11-20 14:45:20 +01:00
Mattes D
288cbf12cb Merge remote-tracking branch 'origin/master' into GeneratorShapeRefactor 2014-11-20 10:13:10 +01:00
Mattes D
f1bddc607c Merge pull request #1603 from mc-server/ImprovedNoise
Improved noise
2014-11-20 09:26:05 +01:00
Mattes D
fef4133f6d cInterpolNoise: Implemented optimized 2D generating. 2014-11-19 16:58:27 +01:00
Mattes D
b177ff8ec5 cOctavedNoise: Removed misleading comment, fixed assert texts. 2014-11-19 16:52:56 +01:00
Mattes D
d7d4fcbdfe cOctavedNoise: Added a forgotten comment. 2014-11-18 23:22:09 +01:00
Mattes D
c048f2bd95 Added a cInterpolNoise template for faster noise generator.
Used an instance of it in the Noise3D generator.
2014-11-18 23:21:57 +01:00
Howaner
8b028c5c78 Finished mob spawner implementation. 2014-11-18 15:33:41 +01:00
Howaner
42120e2ea5 Merge branch 'master' into MobSpawner
Conflicts:
	MCServer/Plugins/Core
2014-11-18 14:56:32 +01:00
Mattes D
2467d29a4e Moved all Noise-related files into a separate folder. 2014-11-18 12:07:08 +01:00
Mattes D
f683872f54 Refactored cRidgedNoise into a separate template.
This allows us to make the ridges out of any noise and to combine the cRidgedNoise with cOctavedNoise.
2014-11-18 09:49:53 +01:00
Mattes D
8c54fc0f7d OctavedNoise: linux compilation fixes. 2014-11-18 09:23:45 +01:00
Mattes D
9ece37e8f1 Merge pull request #1598 from mc-server/SignEditor
Fixed a security problem with signs.
2014-11-18 08:52:48 +01:00