Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1061 from mc-server/portals | Mattes D | 2014-07-29 | 1 | -15/+1 |
|\ | | | | | Portals and others | ||||
| * | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-07-22 | 1 | -0/+4 |
| |\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp | ||||
| * \ | Merge branch 'master' into portals | Tiger Wang | 2014-07-18 | 1 | -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 | ||||
| * \ \ | Merge branch 'master' into portals | Tiger Wang | 2014-06-21 | 1 | -14/+27 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h | ||||
| * \ \ \ | Merge branch 'master' into portals | Tiger Wang | 2014-06-10 | 1 | -3/+11 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/Player.cpp src/Entities/Player.h src/Protocol/Protocol125.cpp src/Protocol/Protocol17x.cpp | ||||
| * \ \ \ \ | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-06-04 | 1 | -0/+19 |
| |\ \ \ \ \ | |||||
| * | | | | | | Implemented end and nether portals | Tiger Wang | 2014-05-31 | 1 | -15/+1 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1254 from mc-server/SingleTopBlockFinisher | Mattes D | 2014-07-29 | 1 | -2/+30 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Renamed cFinishGenSingleBiomeSingleTopBlock to cFinishGenSingleTopBlock | ||||
| * | | | | | | | Some finishing touches | STRWarrior | 2014-07-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed whitespace fixed dead bush comment | ||||
| * | | | | | | | Forgot Mesa Plateau biome. | STRWarrior | 2014-07-28 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Renamed cFinishGenSingleBiomeSingleTopBlock to cFinishGenSingleTopBlock | STRWarrior | 2014-07-28 | 1 | -2/+29 |
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | Now accepts a vector of biomes and a vector of allowed blocks. | ||||
* | | | | | | | RoughRavines: Made floor and ceiling settings-adjustable. | madmaxoft | 2014-07-27 | 1 | -10/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The world.ini has settings for the minimum and maximum height for each at the ravines' center and edges. | ||||
* | | | | | | | RoughRavines: More settings - size, width, roughness | madmaxoft | 2014-07-27 | 1 | -4/+14 |
| | | | | | | | |||||
* | | | | | | | RoughRavines: Initial generator implementation. | madmaxoft | 2014-07-27 | 1 | -3/+11 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | This provides the basic shape of the ravines, with the basic settings based on GridStructGen, and good default values. | ||||
* | | | | | | Merged branch 'origin/Foliage'. | madmaxoft | 2014-07-21 | 1 | -0/+4 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Renamed cFinishGenFoliage to cFinishGenTallGrass | STRWarrior | 2014-07-20 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better grass density Added double tall grass. | ||||
| * | | | | | First attempt for a new foliage finisher | STRWarrior | 2014-07-20 | 1 | -0/+4 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Basic style fixes. | madmaxoft | 2014-07-17 | 1 | -3/+3 |
| | | | | | |||||
* | | | | | Normalized comments. | madmaxoft | 2014-07-17 | 1 | -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. | ||||
* | | | | Added a TestRails generator. | madmaxoft | 2014-06-21 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | This is for debugging purposes only. | ||||
* | | | | Merge branch 'master' of github.com:mc-server/MCServer | Tycho | 2014-06-16 | 1 | -14/+22 |
| |_|/ |/| | | |||||
* | | | Added RainbowRoads finisher generator. | madmaxoft | 2014-06-07 | 1 | -3/+11 |
| |/ |/| | |||||
* | | Added an initial version of the underwater base generator. | madmaxoft | 2014-05-31 | 1 | -0/+8 |
| | | |||||
* | | Villages have min and max density setting. | madmaxoft | 2014-05-22 | 1 | -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. | madmaxoft | 2014-05-15 | 1 | -2/+2 |
| | | |||||
* | | VillageGen rewritten using BFSPieceGenerator. | madmaxoft | 2014-05-15 | 1 | -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. | ||||
* | NetherFortGen: Added several more prefabs. | madmaxoft | 2014-03-28 | 1 | -1/+1 |
| | | | | Also extended the defauls MaxDepth value to 12. | ||||
* | Initial NetherFortGen import. | madmaxoft | 2014-03-28 | 1 | -1/+16 |
| | | | | Simple fortresses of 2 different rooms will generate. | ||||
* | A working POCPiece generator. | madmaxoft | 2014-03-09 | 1 | -0/+5 |
| | |||||
* | Unified StructureGens and FinisherGens. | madmaxoft | 2014-03-01 | 1 | -86/+71 |
| | | | | Now they are all Finishers. Fixes #398. | ||||
* | Alpha-sorted the finishers. | madmaxoft | 2014-01-18 | 1 | -4/+4 |
| | |||||
* | Merged branch 'NetherFinish'. | madmaxoft | 2014-01-18 | 1 | -3/+7 |
|\ | |||||
| * | Renamed cFinishGenNetherSprinkleFoliage to cFinishGenNetherClumpFoliage. Fixed typo's | STRWarrior | 2014-01-18 | 1 | -2/+2 |
| | | |||||
| * | Added cFinishGenNetherSprinkleFoliage. | STRWarrior | 2014-01-10 | 1 | -2/+6 |
| | | |||||
* | | Decoupled cChunkGenerator from cWorld and cRoot. | madmaxoft | 2014-01-10 | 1 | -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. | madmaxoft | 2014-01-10 | 1 | -1/+2 |
| | | |||||
* | | Composition generator creating moved to a separate function. | madmaxoft | 2014-01-09 | 1 | -61/+77 |
| | | | | | | | | Also it forces the defaults into the INI file. | ||||
* | | Height generator creating moved info HeiGen.cpp. | madmaxoft | 2014-01-09 | 1 | -53/+1 |
|/ | | | | The generator also explicitly sets the default back into the INI file. | ||||
* | Moved BiomeGen creation from INI file data to BioGen.cpp. | madmaxoft | 2013-11-28 | 1 | -48/+1 |
| | | | | This way it can be shared between MCServer and BiomeVisualiser. | ||||
* | Fixed the remaining derps | Alexander Harkness | 2013-11-27 | 1 | -1/+1 |
| | |||||
* | Hopefully fixed last of the Linux compile errors | Tiger Wang | 2013-11-26 | 1 | -1/+1 |
| | |||||
* | Further attempts to fix compile | Tiger Wang | 2013-11-25 | 1 | -1/+1 |
| | |||||
* | Attempt to fix compilation | Tiger Wang | 2013-11-24 | 1 | -1/+1 |
| | |||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 1 | -0/+501 |