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 |
|
Mattes D
|
e9082263c9
|
Added cOctavedNoise template.
This allows us to use any noise generator in the combination of octaves.
|
2014-11-17 23:02:53 +01:00 |
|
Howaner
|
d7efece5f2
|
Use cLuaState's stack trace.
|
2014-11-17 18:01:56 +01:00 |
|
Mattes D
|
faf0ce3d7f
|
Fixed include path.
|
2014-11-17 17:13:42 +01:00 |
|
Mattes D
|
f9cfc36643
|
Added cImprovedNoise implementation.
|
2014-11-17 16:50:28 +01:00 |
|
Howaner
|
0e491273c1
|
Added UpdateSign() method to DeprecatedBindings.cpp
|
2014-11-17 14:57:24 +01:00 |
|
Mattes D
|
ae15c2f78e
|
Fixed a wrong assert in cClientHandle::SetViewDistance().
|
2014-11-17 12:34:14 +01:00 |
|
STRWarrior
|
ff036c9cef
|
Changed comment
Suggestion by xoft
|
2014-11-16 19:50:57 +01:00 |
|
Mattes D
|
95e59056a1
|
BiomalNoise3D: Added more biomes.
|
2014-11-16 19:03:00 +01:00 |
|
Mattes D
|
a63eb1ac6e
|
Merge pull request #1577 from mc-server/ViewDistance
Added a MaxViewDistance option.
|
2014-11-16 15:13:39 +01:00 |
|
Howaner
|
277151582f
|
Use LastPlacedSign instead of LastPlacedBlock.
|
2014-11-15 22:36:31 +01:00 |
|
Howaner
|
09cea625fc
|
Renamed m_UsedViewDistance to m_CurrentViewDistance
|
2014-11-15 22:26:54 +01:00 |
|
Mattes D
|
1240e583d2
|
Mobs: Fixed crash with terrain too high.
|
2014-11-15 21:45:57 +01:00 |
|
Mattes D
|
564b9ad337
|
Generator: Fixed crash with trees too high.
|
2014-11-15 21:45:24 +01:00 |
|
Mattes D
|
b0bcd75732
|
Snow generator: Fixed failure at top of the world.
|
2014-11-15 20:24:15 +01:00 |
|
Mattes D
|
889aa7404d
|
ChunkDesc: Fixed comment about indexing.
|
2014-11-15 20:23:47 +01:00 |
|
Howaner
|
927d8d7702
|
Renamed m_SetViewDistance to m_RequestedViewDistance
|
2014-11-15 15:33:42 +01:00 |
|
Howaner
|
fe9750136c
|
Updated APIDump
|
2014-11-15 15:27:41 +01:00 |
|