1
0
Commit Graph

536 Commits

Author SHA1 Message Date
p-mcgowan
27185dd374 clearing CheckBasicStyle.lua messages 2014-12-03 00:26:15 -08:00
p-mcgowan
8c3b9ae15b class description and doxy-commenting 2014-12-03 00:12:32 -08:00
p-mcgowan
d348433406 doxy-commenting 2014-12-02 22:35:34 -08:00
p-mcgowan
2ea8a36df6 forgot initializer 2014-12-02 15:55:09 -08:00
p-mcgowan
6803df129f typos and oversights for lua and CI 2014-12-02 11:32:53 -08:00
p-mcgowan
8d7c2d4b13 fastRandom unused 2014-12-02 11:26:37 -08:00
p-mcgowan
585662e63f indentation, repeatable random, small corrections 2014-12-02 11:21:51 -08:00
Mattes D
bc8937d315 Merge pull request #1634 from mc-server/DungeonSpawners
Dungeons spawners now spawn mobs
2014-12-02 11:15:20 +01:00
p-mcgowan
978c9967ad fix comments after replacing spaces with tabs 2014-12-02 02:03:29 -08:00
p-mcgowan
2d93274a90 animal terrain finisher 2014-12-02 01:58:30 -08:00
p-mcgowan
9831220a1c animal terrain finisher 2014-12-02 01:37:17 -08:00
STRWarrior
f1177984f1 Fixed forgotten semicolon 2014-12-02 10:20:20 +01:00
STRWarrior
a466986f53 Using IntNoise3DInt instead of IntNoise3D 2014-12-02 09:55:25 +01:00
STRWarrior
5db3ceb333 Suggestions by xoft
Using IntNoise3D to prevent needless floating point math
2014-12-02 09:42:49 +01:00
p-mcgowan
bb5a7d8f15 reformat for lua and CI 2014-12-01 17:47:36 -08:00
p-mcgowan
3bf111c69e formatting and commenting fixes 2014-12-01 17:28:46 -08:00
p-mcgowan
cb584a87bd cacti no longer spawn outside of desert variants 2014-12-01 11:44:20 -08:00
STRWarrior
7586069829 Using static cast for Dungeon spawners 2014-12-01 19:07:54 +01:00
STRWarrior
ca728da9b6 Using static cast for MineShaft spawners 2014-12-01 19:05:44 +01:00
STRWarrior
25e3869485 Mineshaft spawners now spawn cave spiders 2014-12-01 18:47:39 +01:00
STRWarrior
c0b08a6c1e Dungeons spawners now spawn mobs
25% for a spider, 25% for a skeleton and 50% for a zombie spawner.
2014-12-01 17:51:20 +01:00
STRWarrior
1bf0827a2f Simplefied SoulsandRims
Replaced two for loops with a single if
2014-12-01 17:29:35 +01:00
STRWarrior
fa4a85c915 Added better soulsand rims
As a finisher called SoulsandRims
2014-12-01 16:36:48 +01:00
Mattes D
cc313c91ab DistortedHeightmap: Added missing initialization.
This was probably the original cause for the "empty chunks".
Fixes #1433.
2014-12-01 00:14:27 +01:00
Mattes D
f0ad6221c3 Noise3D: Fixed missing initialization.
This should fix terrain being at Y=0 or Y=255 for the spawn chunk.
Fixes #1433.
2014-12-01 00:09:58 +01:00
STRWarrior
e972c52e54 Hopefully fixed random build fails 2014-11-30 18:44:44 +01:00
STRWarrior
65dc452923 Fixed nether ceiling 2014-11-30 16:34:41 +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
Tiger Wang
187bdab4fa Merge remote-tracking branch 'origin-master' into c++11 2014-11-25 23:03:33 +00: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
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
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
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
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
Mattes D
30fa6a642c DungeonRooms: Changed to work with the new shape generators. 2014-11-15 11:17:05 +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
Mattes D
7a3b3aeb3c Gen refactor: Implemented CompositedHeiGen.
This fixes crashes in the Village generator due to the missing generator.
2014-11-13 21:28:50 +01:00
STRWarrior
5584144be2 First implementation for the LargeOakTree 2014-11-13 10:44:36 +01:00
Mattes D
5fb2526e07 Generator: Shape initial refactoring.
The code compiles, but several structure generators are broken, crash on start.
2014-11-12 21:24:26 +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
Mattes D
f8c54f4243 Merged branch 'master' into c++11. 2014-10-23 08:40:39 +02:00
Tiger Wang
a26541a7c3 En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Mattes D
2ac3a807b7 ComposableGenerator: Removed nullptr initializers. 2014-10-22 22:58:36 +02:00
Tiger Wang
987f79afdd En masse NULL -> nullptr replace 2014-10-20 21:55:07 +01:00
Tiger Wang
2334c8dd9d Merge branch 'master' of https://github.com/mc-server/MCServer 2014-10-20 19:01:53 +01:00
Julian Laubstein
48470c858b Fixed #1550 2014-10-20 19:36:16 +02:00
Mattes D
262e6d06aa TwoLevel BioGen: fixed swapped inside and outside biomes. 2014-10-19 16:07:29 +02:00
Tiger Wang
aa19a3afb0 Migrated random generators to std::random 2014-10-19 14:10:18 +01:00
Mattes D
3ee47df118 Mountain height gen: Added ditches. 2014-10-19 14:35:49 +02:00
Mattes D
e0cfbc4d85 Generator: Rewritten to use SharedPtrs. 2014-10-19 14:01:59 +02:00
STRWarrior
132a92226b Merge branch 'master' into DungeonLoot
Conflicts:
	src/ItemGrid.cpp
2014-10-16 11:43:59 +02:00
Mattes D
799ae87d3f BioGen: Fixed a compiler warning. 2014-10-16 11:00:30 +02:00
STRWarrior
5ed6d280ce Reversed wrong fix for #1517. 2014-10-16 10:26:17 +02:00
STRWarrior
3f0d4fe250 Reversed the order of the loot
For some reason the rare items weren't generating at all.
Added forgotten Golden Apple
2014-10-15 22:10:14 +02:00
STRWarrior
08676128b0 Added loot to dungeons. 2014-10-15 21:15:12 +02:00
Mattes D
f91aa6f1d3 DistortedHeightmap: Fixed crash on number rounding.
Fixes #1521.
2014-10-09 12:33:42 +02:00
STRWarrior
e95ee55974 Added comments to the GetAcaciaTreeImage function 2014-10-08 21:32:09 +02:00
STRWarrior
36fa1c5c73 Using array with possible directions. 2014-10-08 21:25:59 +02:00
STRWarrior
68a54c90c9 Added AcaciaTrees for the savanna biomes 2014-10-08 20:31:16 +02:00
win32re
f8c1da4a71 Fixes #1503 - No gravel is being generated 2014-10-04 14:02:40 +02:00
STRWarrior
7c18681e09 Fixed compilation 2014-09-28 22:10:03 +02:00
STRWarrior
76e0c592ef Added Granite, Diorite and Andesite to the NaturalPatches generator. 2014-09-28 19:27:08 +02:00
madmaxoft
113b54aefd BioGen: TwoLevel is now fully settable in INI. 2014-09-27 22:01:47 +02:00
worktycho
411c69b420 Merge pull request #1419 from mc-server/redstoneTests
Added test mocking to IncrementalRedstoneSimulator
2014-09-26 16:04:26 +01:00
madmaxoft
e5293706de TwoLevel BioGen: reads params from INI file. 2014-09-25 20:47:29 +02:00
Tycho
9c459cbe50 Merge branch 'master' into redstoneTests
Conflicts:
	src/Mobs/Monster.h
2014-09-25 15:22:08 +01:00
Chris Darnell
195b646aa4 Made it compile with clang 2014-09-22 03:22:36 -04:00
madmaxoft
6f5aa487ed Voronoi biomegen: Added JitterSize and OddRowOffset. 2014-09-17 23:24:22 +02:00
Tycho
6e7c0e33b5 Added first test to show the object can be created 2014-09-17 18:40:10 +01:00
Mattes D
103fa8812d WorldStorage no longer queues chunks into generator. 2014-09-05 23:26:00 +02:00
Mattes D
137b021d26 Rewritten chunk status to specify whether the chunk is in queue.
This fixes #1370.
2014-09-05 22:16:48 +02:00
Mattes D
e15b8600a6 BiomeMultiCache is not used for simple generators. 2014-09-05 22:08:00 +02:00
Mattes D
60e235362c Fixed style. 2014-09-05 22:07:13 +02:00
Mattes D
b590eed42f Merge pull request #1371 from DayBr3ak/master
issue381, multicache for cBioGen
2014-09-04 14:09:54 +02:00
madmaxoft
bae928fd27 ChunkGenerator: Log world seed when creating a new one. 2014-09-03 23:02:00 +02:00
DayBr3ak
d2bacc34f6 change to linear calculation 2014-09-03 18:48:47 +02:00
DayBr3ak
5a608dc279 adapting format 2014-09-03 02:53:21 +02:00
LO1ZB
554f585017 re-add the missing "s" too cChunkCoordsWithBoolList 2014-09-03 00:28:08 +02:00
LO1ZB
a600e3bdfe hopefully the last commit for removing y-coord from chunks. :) 2014-09-03 00:14:51 +02:00
DayBr3ak
b8636ee53a forgot this one 2014-09-02 18:18:43 +02:00
DayBr3ak
82911f3662 opting for size_t 2014-09-02 18:13:24 +02:00
DayBr3ak
29811c4f21 fixing memory leak 2014-09-02 18:05:53 +02:00
DayBr3ak
ac4ec5117d changing implem, using vectors 2014-09-02 10:54:26 +02:00
DayBr3ak
d9afe6dd65 adding config file entry #381 2014-09-02 01:19:52 +02:00
DayBr3ak
77409d47eb adding the multicache behavior 2014-09-02 01:13:19 +02:00
DayBr3ak
7695471ff9 added multicache class definition 2014-09-01 21:37:36 +02:00
LO1ZB
4c9abab2d1 fix possibility of a twice generated chunk 2014-09-01 15:01:56 +02:00
LO1ZB
75e1316386 fix chunk regenerating 2014-08-29 20:19:45 +02:00
LO1ZB
3c1c073714 remove y-coord from chunks 2014-08-28 11:36:35 +02:00
Mattes D
e54c78923e DungeonRooms: Fixed an off-by-one error. 2014-08-27 20:55:28 +03:00
Mattes D
e54a7dc6c4 More basic style fixes. 2014-08-27 15:21:20 +03:00
Mattes D
62e1c45ca5 DungeonRooms: Added a height probability distribution function. 2014-08-27 13:25:27 +03:00
Mattes D
c6beb9760b DungeonRooms: Added the spawner in the center of the room. 2014-08-27 08:12:26 +03:00
Mattes D
0c3c136c72 DungeonRooms: Chests are never placed next to each other. 2014-08-26 17:46:14 +03:00
Mattes D
a40f358064 DungeonRooms: Random pattern for floors. 2014-08-26 17:25:38 +03:00
Mattes D
2d569ce6dd DungeonRooms: Replaced explicit switch with CanBeTerraformed(). 2014-08-26 17:13:46 +03:00