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 |
|
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 |
|
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
|
f3e9fa74d2
|
Merge pull request #1594 from mc-server/LargeOakTree
Large Oak Tree
|
2014-11-20 21:30:50 +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 |
|
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 |
|
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 |
|
Howaner
|
927d8d7702
|
Renamed m_SetViewDistance to m_RequestedViewDistance
|
2014-11-15 15:33:42 +01:00 |
|
Howaner
|
78fb789631
|
Fixed a security problem with signs.
|
2014-11-15 15:16:52 +01:00 |
|
Howaner
|
8c3c11d6b3
|
Renamed GetSettedViewDistance() to GetRequestedViewDistance()
|
2014-11-15 14:27:50 +01:00 |
|
Howaner
|
83d3f3347b
|
Use m_UsedViewDistance and m_SetViewDistance.
|
2014-11-14 22:53:12 +01:00 |
|
Howaner
|
a0e1e43fc1
|
Merge branch 'master' into ViewDistance
|
2014-11-14 22:33:54 +01:00 |
|
Mattes D
|
644240a0e5
|
Noise3D: Added jungles.
|
2014-11-14 22:17:11 +01:00 |
|
Mattes D
|
2789fafeb7
|
Noise3D: Added oceans.
|
2014-11-13 21:47:39 +01:00 |
|
STRWarrior
|
5584144be2
|
First implementation for the LargeOakTree
|
2014-11-13 10:44:36 +01:00 |
|
Mattes D
|
c9a3cb4d3f
|
Fixed trailing whitespace.
|
2014-11-12 21:59:42 +01:00 |
|
Mattes D
|
b525eee8e0
|
BiomalNoise3D: Added a few biomes.
|
2014-11-10 22:08:29 +01:00 |
|
STRWarrior
|
9a50a1fe0c
|
TallGrassGenerator: Fixed crash when too high
|
2014-11-10 21:55:13 +01:00 |
|
Mattes D
|
4b95f7c69a
|
Added BiomalNoise3D shape generator.
|
2014-11-10 17:00:14 +01:00 |
|
Mattes D
|
5993c06bd7
|
Noise3d Generator: Fixed unused function error.
|
2014-11-09 15:33:01 +01:00 |
|
Mattes D
|
c43391fd8c
|
Noise3D generator: rewritten from scratch.
Now it uses three 3D and one 2D perlin noises to generate the terrain, and is highly parametrizable.
|
2014-11-09 14:34:10 +01:00 |
|
Mattes D
|
136d6b5c30
|
Noise3D CompoGen: Fixed missing initialization.
|
2014-11-06 19:25:42 +01:00 |
|
Mattes D
|
58fe37814b
|
Merge branch 'master' of https://github.com/mc-server/MCServer
|
2014-11-06 08:55:33 +01:00 |
|
Lukas Pioch
|
13b20d6fe2
|
renamed FindAndDoWithUUID to DoWithPlayerByUUID, fixed style and comments, added description to APIDump
|
2014-11-05 21:57:38 +01:00 |
|
Mattes D
|
7d2b2f90b6
|
MinMax heigen: Reduced the number of octaves.
They didn't affect the terrain that much anyway.
|
2014-11-04 08:41:18 +01:00 |
|
Mattes D
|
f239a28d06
|
Added MinMax height generator.
Fixes #1578.
|
2014-11-04 08:40:23 +01:00 |
|
Mattes D
|
c5f3663bea
|
Fixed a missing endline.
|
2014-11-03 11:48:03 +01:00 |
|
Mattes D
|
f5c4a6a27d
|
Added a (disabled) perf test for biome generators.
|
2014-11-03 10:36:12 +01:00 |
|
Mattes D
|
ca29683738
|
HeiGen: Moved construction to the end of file.
This will allow us to define generators in the cpp file instead of needing them in the header, thus speeding up compilation on changes.
|
2014-11-03 08:17:19 +01:00 |
|
Lukas Pioch
|
269d76a208
|
Simplified FindAndDoWithUUID, formatted line
|
2014-11-02 21:38:17 +01:00 |
|