Tiger Wang
187bdab4fa
Merge remote-tracking branch 'origin-master' into c++11
2014-11-25 23:03:33 +00: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
Mattes D
f3e9fa74d2
Merge pull request #1594 from mc-server/LargeOakTree
...
Large Oak Tree
2014-11-20 21:30:50 +01:00
Mattes D
fef4133f6d
cInterpolNoise: Implemented optimized 2D generating.
2014-11-19 16:58:27 +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
f9cfc36643
Added cImprovedNoise implementation.
2014-11-17 16:50:28 +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
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
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
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
Mattes D
dbed5c0726
Grown biomes: fixed Linux build.
2014-11-02 16:47:56 +01:00
Mattes D
d5b6353493
Grown biomes: Unified with GrownProt biomes.
...
Also fixed a Zoom filter randomness.
2014-11-02 16:36:59 +01:00
Mattes D
d868346491
GrownProt: Added the rest of rare and M biomes.
2014-11-01 21:01:33 +01:00
Mattes D
4873890cfb
GrownProt biome gen: Added biome edges.
2014-11-01 16:37:56 +01:00
Mattes D
13f0e93d69
GrownProt biomes: added alterations.
2014-10-31 12:52:07 +01:00
Mattes D
8c04abf9aa
QtBiomeVisualiser: Added a prototyping int generator flavor.
...
This generator is easier to manipulate, since it doesn't require rewriting the sizes in the template parameters. On the other hand, it doesn't optimize so well, so it's a bit slower.
2014-10-30 16:24:35 +01:00
Mattes D
f34b1291be
Grown biomes: made biomes smaller, made beaches smaller.
2014-10-29 15:28:27 +01:00
Mattes D
791f891212
Merged branch 'master' into GrownBiomes.
2014-10-28 22:29:46 +01:00
Alexander Harkness
dbe7c8b170
Comment alignment.
2014-10-27 21:38:00 +00:00
Alexander Harkness
a4932bbd8b
CheckBasicStyle'd
2014-10-27 21:34:02 +00:00
Alexander Harkness
7de8757ac9
Fixed more warnings.
...
It's ugly though.
2014-10-27 20:05:34 +00:00
Alexander Harkness
59ca542c28
Another switch.
2014-10-27 19:53:16 +00:00
Alexander Harkness
0cdf262053
Fix missing biomes in enum.
2014-10-27 19:52:04 +00:00
Alexander Harkness
6e21897bc6
Fixed remaining warnings.
2014-10-27 19:49:52 +00:00
Alexander Harkness
c0a9a83abf
Actually fixed the warning.
2014-10-27 18:09:34 +00:00
Alexander Harkness
8a443c028f
Test warning fix.
2014-10-27 17:11:31 +00:00
Mattes D
a068ebf3e0
cIntGen: Added a virtual destructor.
2014-10-27 09:48:57 +01:00
Mattes D
7d08d34693
Removed too advanced C++11 features.
...
We need to keep gcc 4.6 compatibility; these features were not implemented in that version yet.
2014-10-27 09:35:21 +01:00
Mattes D
7d6db6f33d
IntGen: Attempt at fixing Linux compilation.
2014-10-26 22:59:59 +01:00
Mattes D
74df4618de
BioGenGrown: Smaller biomes, add land to map center.
2014-10-26 22:56:02 +01:00
Mattes D
dcbe1717cc
Fixed a copypasta error in cIntGenAddToOcean.
2014-10-26 21:35:24 +01:00
Mattes D
dcad6d3626
Added a missing header to CMakeLists.
2014-10-26 20:12:29 +01:00
Mattes D
7e1d603080
Added new biomegen: Grown
2014-10-26 19:58:16 +01:00
Mattes D
765bf006ad
Merged branch 'master' into c++11.
2014-10-24 10:19:13 +02:00
Mattes D
1235ccb1e2
Removed iniFile library from linux dependencies.
2014-10-23 15:26:43 +02:00
Mattes D
449d08cb3d
Merged IniFile into main MCS sources.
2014-10-23 15:15:10 +02:00
