summaryrefslogtreecommitdiffstats
path: root/src/Generating/ComposableGenerator.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-07-221-0/+4
|\ | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp
| * Merged branch 'origin/Foliage'.madmaxoft2014-07-211-0/+4
| |\
| | * Renamed cFinishGenFoliage to cFinishGenTallGrassSTRWarrior2014-07-201-4/+4
| | | | | | | | | | | | | | | Better grass density Added double tall grass.
| | * First attempt for a new foliage finisherSTRWarrior2014-07-201-0/+4
| | |
* | | Merge branch 'master' into portalsTiger Wang2014-07-181-5/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/WorldInterface.h src/ClientHandle.cpp src/ClientHandle.h src/Entities/Player.cpp src/Entities/Player.h src/Generating/FinishGen.cpp src/Protocol/Protocol.h src/Protocol/Protocol125.cpp src/Protocol/Protocol125.h src/Protocol/Protocol16x.cpp src/Protocol/Protocol16x.h src/Protocol/Protocol17x.cpp src/Protocol/Protocol17x.h src/Protocol/ProtocolRecognizer.cpp src/Protocol/ProtocolRecognizer.h src/Root.h src/World.cpp
| * | Basic style fixes.madmaxoft2014-07-171-3/+3
| | |
| * | Normalized comments.madmaxoft2014-07-171-2/+2
| |/ | | | | | | | | This was mostly done automatically and then visually inspected for obvious errors. All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign.
* | Merge branch 'master' into portalsTiger Wang2014-06-211-14/+27
|\| | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h
| * Added a TestRails generator.madmaxoft2014-06-211-0/+5
| | | | | | | | This is for debugging purposes only.
| * Merge branch 'master' of github.com:mc-server/MCServerTycho2014-06-161-14/+22
| |
* | Merge branch 'master' into portalsTiger Wang2014-06-101-3/+11
|\| | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/Player.cpp src/Entities/Player.h src/Protocol/Protocol125.cpp src/Protocol/Protocol17x.cpp
| * Added RainbowRoads finisher generator.madmaxoft2014-06-071-3/+11
| |
* | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-06-041-0/+19
|\|
| * Added an initial version of the underwater base generator.madmaxoft2014-05-311-0/+8
| |
| * Villages have min and max density setting.madmaxoft2014-05-221-4/+6
| | | | | | | | | | | | Also made roads use 3+9 scheme, instead of 3+5, for the house connectors. Fixes #1020.
| * Changed village generator defaults to more reasonable values.madmaxoft2014-05-151-2/+2
| |
| * VillageGen rewritten using BFSPieceGenerator.madmaxoft2014-05-151-0/+9
| | | | | | | | Piece composition is not good yet, the buildings aren't height-adjusted and the road pieces will need special processing. This is mainly for adjusting the per-piece params.
* | Implemented end and nether portalsTiger Wang2014-05-311-15/+1
|/
* NetherFortGen: Added several more prefabs.madmaxoft2014-03-281-1/+1
| | | | Also extended the defauls MaxDepth value to 12.
* Initial NetherFortGen import.madmaxoft2014-03-281-1/+16
| | | | Simple fortresses of 2 different rooms will generate.
* A working POCPiece generator.madmaxoft2014-03-091-0/+5
|
* Unified StructureGens and FinisherGens.madmaxoft2014-03-011-86/+71
| | | | Now they are all Finishers. Fixes #398.
* Alpha-sorted the finishers.madmaxoft2014-01-181-4/+4
|
* Merged branch 'NetherFinish'.madmaxoft2014-01-181-3/+7
|\
| * Renamed cFinishGenNetherSprinkleFoliage to cFinishGenNetherClumpFoliage. Fixed typo'sSTRWarrior2014-01-181-2/+2
| |
| * Added cFinishGenNetherSprinkleFoliage.STRWarrior2014-01-101-2/+6
| |
* | Decoupled cChunkGenerator from cWorld and cRoot.madmaxoft2014-01-101-5/+6
| | | | | | | | Now the chunk generator can be used by other projects without depending on the two hugest structures in MCS.
* | Fixed generator adding values to ini file.madmaxoft2014-01-101-1/+2
| |
* | Composition generator creating moved to a separate function.madmaxoft2014-01-091-61/+77
| | | | | | | | Also it forces the defaults into the INI file.
* | Height generator creating moved info HeiGen.cpp.madmaxoft2014-01-091-53/+1
|/ | | | The generator also explicitly sets the default back into the INI file.
* Moved BiomeGen creation from INI file data to BioGen.cpp.madmaxoft2013-11-281-48/+1
| | | | This way it can be shared between MCServer and BiomeVisualiser.
* Fixed the remaining derpsAlexander Harkness2013-11-271-1/+1
|
* Hopefully fixed last of the Linux compile errorsTiger Wang2013-11-261-1/+1
|
* Further attempts to fix compileTiger Wang2013-11-251-1/+1
|
* Attempt to fix compilationTiger Wang2013-11-241-1/+1
|
* Moved source to srcAlexander Harkness2013-11-241-0/+501