Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Generator: Rewritten to use SharedPtrs. | Mattes D | 2014-10-19 | 18 | -181/+145 |
| | |||||
* | Merge branch 'master' into DungeonLoot | STRWarrior | 2014-10-16 | 1 | -2/+2 |
|\ | | | | | | | | | Conflicts: src/ItemGrid.cpp | ||||
| * | BioGen: Fixed a compiler warning. | Mattes D | 2014-10-16 | 1 | -2/+2 |
| | | |||||
* | | Reversed wrong fix for #1517. | STRWarrior | 2014-10-16 | 1 | -8/+2 |
| | | |||||
* | | Reversed the order of the loot | STRWarrior | 2014-10-15 | 1 | -7/+15 |
| | | | | | | | | | | For some reason the rare items weren't generating at all. Added forgotten Golden Apple | ||||
* | | Added loot to dungeons. | STRWarrior | 2014-10-15 | 1 | -1/+27 |
|/ | |||||
* | DistortedHeightmap: Fixed crash on number rounding. | Mattes D | 2014-10-09 | 1 | -4/+5 |
| | | | | Fixes #1521. | ||||
* | Added comments to the GetAcaciaTreeImage function | STRWarrior | 2014-10-08 | 1 | -0/+18 |
| | |||||
* | Using array with possible directions. | STRWarrior | 2014-10-08 | 1 | -8/+9 |
| | |||||
* | Added AcaciaTrees for the savanna biomes | STRWarrior | 2014-10-08 | 1 | -5/+56 |
| | |||||
* | Fixes #1503 - No gravel is being generated | win32re | 2014-10-04 | 1 | -1/+1 |
| | |||||
* | Fixed compilation | STRWarrior | 2014-09-28 | 1 | -1/+10 |
| | |||||
* | Added Granite, Diorite and Andesite to the NaturalPatches generator. | STRWarrior | 2014-09-28 | 3 | -7/+37 |
| | |||||
* | BioGen: TwoLevel is now fully settable in INI. | madmaxoft | 2014-09-27 | 2 | -44/+31 |
| | |||||
* | Merge pull request #1419 from mc-server/redstoneTests | worktycho | 2014-09-26 | 1 | -0/+1 |
|\ | | | | | Added test mocking to IncrementalRedstoneSimulator | ||||
| * | Merge branch 'master' into redstoneTests | Tycho | 2014-09-25 | 3 | -74/+80 |
| |\ | | | | | | | | | | | | | Conflicts: src/Mobs/Monster.h | ||||
| * | | Added first test to show the object can be created | Tycho | 2014-09-17 | 1 | -0/+1 |
| | | | |||||
* | | | TwoLevel BioGen: reads params from INI file. | madmaxoft | 2014-09-25 | 1 | -9/+26 |
| |/ |/| | |||||
* | | Made it compile with clang | Chris Darnell | 2014-09-22 | 2 | -3/+3 |
| | | |||||
* | | Voronoi biomegen: Added JitterSize and OddRowOffset. | madmaxoft | 2014-09-17 | 1 | -71/+77 |
|/ | |||||
* | WorldStorage no longer queues chunks into generator. | Mattes D | 2014-09-05 | 1 | -0/+2 |
| | |||||
* | Rewritten chunk status to specify whether the chunk is in queue. | Mattes D | 2014-09-05 | 2 | -1/+6 |
| | | | | This fixes #1370. | ||||
* | BiomeMultiCache is not used for simple generators. | Mattes D | 2014-09-05 | 1 | -21/+22 |
| | |||||
* | Fixed style. | Mattes D | 2014-09-05 | 3 | -9/+13 |
| | |||||
* | Merge pull request #1371 from DayBr3ak/master | Mattes D | 2014-09-04 | 3 | -2/+92 |
|\ | | | | | issue381, multicache for cBioGen | ||||
| * | change to linear calculation | DayBr3ak | 2014-09-03 | 2 | -9/+7 |
| | | |||||
| * | adapting format | DayBr3ak | 2014-09-03 | 3 | -7/+14 |
| | | |||||
| * | forgot this one | DayBr3ak | 2014-09-02 | 2 | -2/+2 |
| | | |||||
| * | opting for size_t | DayBr3ak | 2014-09-02 | 2 | -5/+5 |
| | | |||||
| * | fixing memory leak | DayBr3ak | 2014-09-02 | 1 | -4/+5 |
| | | |||||
| * | changing implem, using vectors | DayBr3ak | 2014-09-02 | 2 | -98/+23 |
| | | |||||
| * | adding config file entry #381 | DayBr3ak | 2014-09-02 | 1 | -1/+10 |
| | | |||||
| * | adding the multicache behavior | DayBr3ak | 2014-09-02 | 3 | -4/+119 |
| | | |||||
| * | added multicache class definition | DayBr3ak | 2014-09-01 | 1 | -0/+35 |
| | | |||||
* | | ChunkGenerator: Log world seed when creating a new one. | madmaxoft | 2014-09-03 | 1 | -3/+14 |
| | | |||||
* | | re-add the missing "s" too cChunkCoordsWithBoolList | LO1ZB | 2014-09-03 | 2 | -5/+5 |
| | | |||||
* | | hopefully the last commit for removing y-coord from chunks. :) | LO1ZB | 2014-09-03 | 2 | -11/+17 |
| | | |||||
* | | fix possibility of a twice generated chunk | LO1ZB | 2014-09-01 | 1 | -1/+2 |
| | | |||||
* | | fix chunk regenerating | LO1ZB | 2014-08-29 | 1 | -8/+0 |
| | | |||||
* | | remove y-coord from chunks | LO1ZB | 2014-08-28 | 2 | -9/+9 |
|/ | |||||
* | DungeonRooms: Fixed an off-by-one error. | Mattes D | 2014-08-27 | 1 | -2/+2 |
| | |||||
* | More basic style fixes. | Mattes D | 2014-08-27 | 1 | -2/+2 |
| | |||||
* | DungeonRooms: Added a height probability distribution function. | Mattes D | 2014-08-27 | 3 | -9/+19 |
| | |||||
* | DungeonRooms: Added the spawner in the center of the room. | Mattes D | 2014-08-27 | 1 | -0/+15 |
| | |||||
* | DungeonRooms: Chests are never placed next to each other. | Mattes D | 2014-08-26 | 1 | -22/+27 |
| | |||||
* | DungeonRooms: Random pattern for floors. | Mattes D | 2014-08-26 | 1 | -1/+32 |
| | |||||
* | DungeonRooms: Replaced explicit switch with CanBeTerraformed(). | Mattes D | 2014-08-26 | 1 | -11/+3 |
| | |||||
* | Added initial dungeon rooms finisher. | Mattes D | 2014-08-26 | 4 | -0/+289 |
| | |||||
* | Added initializers for class members. | Mattes D | 2014-08-21 | 3 | -1/+11 |
| | | | | As reported by Coverity, these weren't initialized. | ||||
* | SwamplandM: Fixed sometimes having no mountains. | STRWarrior | 2014-08-18 | 1 | -1/+1 |
| | |||||
* | Bunch of tweaks: | STRWarrior | 2014-08-10 | 3 | -15/+15 |
| | | | | | | Renamed Quarts to Quartz Using const_iterator instead of iterator Used CheckBasicStyle script to find style errors | ||||
* | Added NaturalPatches generator | STRWarrior | 2014-08-10 | 1 | -0/+22 |
| | | | | It generates gravel and dirt. | ||||
* | Added NetherOreNests. | STRWarrior | 2014-08-10 | 1 | -0/+15 |
| | | | | It generates Nether Quarts. | ||||
* | Changed cStructGenOreNests to take a list of ores + the block to replace. | STRWarrior | 2014-08-10 | 3 | -53/+83 |
| | |||||
* | Removed an old and outdated comment. | STRWarrior | 2014-08-10 | 1 | -2/+0 |
| | |||||
* | CheckBasicStyle: multi-level indent change. | madmaxoft | 2014-08-04 | 2 | -5/+6 |
| | |||||
* | VillageGen: Fixed a typo in comment | STRWarrior | 2014-08-03 | 1 | -1/+1 |
| | |||||
* | Added proper trees and height for SwamplandM biome | STRWarrior | 2014-08-02 | 3 | -2/+4 |
| | |||||
* | Suggestions | STRWarrior | 2014-07-30 | 1 | -2/+2 |
| | |||||
* | Moved GetRoofedForestTreeImage content to GetDarkoakTreeImage | STRWarrior | 2014-07-30 | 2 | -66/+55 |
| | |||||
* | Fixed doxy comment | STRWarrior | 2014-07-30 | 1 | -1/+1 |
| | |||||
* | Fixed comment at the end of a for-loop | STRWarrior | 2014-07-30 | 1 | -1/+1 |
| | |||||
* | Fixed compiling using Clang | STRWarrior | 2014-07-30 | 1 | -4/+2 |
| | |||||
* | Added RoofedForest trees. | STRWarrior | 2014-07-30 | 2 | -2/+73 |
| | | | | Could still be improved allot. | ||||
* | PreSimulator: Added configurations. | STRWarrior | 2014-07-30 | 3 | -6/+30 |
| | | | | You can now choose if it should pregenerate something or not | ||||
* | Merge pull request #1262 from mc-server/CanBeTerraformed | Mattes D | 2014-07-30 | 2 | -44/+6 |
|\ | | | | | Added cBlockInfo::CanBeTerraformed and made finishers use it | ||||
| * | Added cBlockInfo::CanBeTerraformed and made finishers use it | STRWarrior | 2014-07-29 | 2 | -44/+6 |
| | | | | | | | | I might have forgotten some of them though | ||||
* | | Fixed FinishGen.h types. | madmaxoft | 2014-07-30 | 1 | -2/+2 |
| | | |||||
* | | Changed size_t to 'unsigned long' | Howaner | 2014-07-30 | 1 | -2/+2 |
| | | |||||
* | | Fixed compile error with clang. | Howaner | 2014-07-30 | 1 | -2/+2 |
| | | |||||
* | | Slight cleanup after portals | Tiger Wang | 2014-07-29 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #1061 from mc-server/portals | Mattes D | 2014-07-29 | 8 | -44/+14 |
|\ | | | | | Portals and others | ||||
| * | Merge branch 'master' into portals | Tiger Wang | 2014-07-29 | 6 | -97/+837 |
| |\ | | | | | | | | | | | | | Conflicts: src/World.h | ||||
| * \ | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-07-22 | 14 | -263/+444 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp | ||||
| * \ \ | Merge branch 'master' into portals | Tiger Wang | 2014-07-18 | 37 | -350/+361 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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' of https://github.com/mc-server/MCServer into portals | Tiger Wang | 2014-06-24 | 1 | -0/+11 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into portals | Tiger Wang | 2014-06-21 | 31 | -3075/+4662 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h | ||||
| * \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-06-14 | 1 | -4/+17 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/World.h | ||||
| * \ \ \ \ \ \ | Merge branch 'master' into portals | Tiger Wang | 2014-06-10 | 8 | -4/+1694 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/Player.cpp src/Entities/Player.h src/Protocol/Protocol125.cpp src/Protocol/Protocol17x.cpp | ||||
| * | | | | | | | | Suggestions | Tiger Wang | 2014-06-05 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Fixed a NetherFinisher bug | Tiger Wang | 2014-06-04 | 3 | -24/+9 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-06-04 | 28 | -22/+19604 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Implemented end and nether portals | Tiger Wang | 2014-05-31 | 4 | -19/+4 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #1254 from mc-server/SingleTopBlockFinisher | Mattes D | 2014-07-29 | 3 | -22/+92 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Renamed cFinishGenSingleBiomeSingleTopBlock to cFinishGenSingleTopBlock | ||||
| * | | | | | | | | | | Some finishing touches | STRWarrior | 2014-07-29 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed whitespace fixed dead bush comment | ||||
| * | | | | | | | | | | Fixed comment above cFinishGenSingleTopBlock | STRWarrior | 2014-07-29 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | SingleTopBlock: All blocktypes and biometypes get initialized properly | STRWarrior | 2014-07-29 | 1 | -2/+14 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Using suggestions | STRWarrior | 2014-07-28 | 1 | -25/+20 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Forgot Mesa Plateau biome. | STRWarrior | 2014-07-28 | 1 | -0/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Renamed cFinishGenSingleBiomeSingleTopBlock to cFinishGenSingleTopBlock | STRWarrior | 2014-07-28 | 3 | -20/+82 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now accepts a vector of biomes and a vector of allowed blocks. | ||||
* | | | | | | | | | | Merge pull request #1252 from mc-server/RoughRavinesGen | Mattes D | 2014-07-29 | 4 | -3/+439 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | Rough ravines gen | ||||
| * | | | | | | | | | RoughRavines: Made floor and ceiling settings-adjustable. | madmaxoft | 2014-07-27 | 3 | -20/+93 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The world.ini has settings for the minimum and maximum height for each at the ravines' center and edges. | ||||
| * | | | | | | | | | RoughRavines: Added per-height radius modifier. Ledges! | madmaxoft | 2014-07-27 | 1 | -32/+73 |
| | | | | | | | | | | |||||
| * | | | | | | | | | RoughRavines: More settings - size, width, roughness | madmaxoft | 2014-07-27 | 3 | -23/+84 |
| | | | | | | | | | | |||||
| * | | | | | | | | | RoughRavines: Initial generator implementation. | madmaxoft | 2014-07-27 | 4 | -3/+264 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This provides the basic shape of the ravines, with the basic settings based on GridStructGen, and good default values. | ||||
* | | | | | | | | | | DistortedHeightmap: Now generates gravel in deep ocean. | STRWarrior | 2014-07-28 | 1 | -1/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | NetherClumpGenerator: Fixed generating stuff on halfslabs and fences | STRWarrior | 2014-07-27 | 1 | -1/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Updated NetherForts' weights. | madmaxoft | 2014-07-27 | 1 | -2/+2 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Removed forgotten comment | STRWarrior | 2014-07-27 | 1 | -1/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Made nether ceiling smooth. | STRWarrior | 2014-07-27 | 1 | -1/+8 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Added a ceiling to disguise the bedrock above it. | STRWarrior | 2014-07-27 | 1 | -1/+9 |
| | | | | | | | | | | |||||
* | | | | | | | | | | NetherClumpFoliage: Fixed assert | STRWarrior | 2014-07-27 | 1 | -8/+39 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Updated NetherFort prefabs to latest Gallery content. | madmaxoft | 2014-07-27 | 1 | -37/+752 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Tweaks to NetherClumpFoliage | STRWarrior | 2014-07-25 | 1 | -34/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplefied the way NetherClupFoliage creates the X and Z coordinate. | ||||
* | | | | | | | | | Speed up the NetherClumpFoliage finisher. | STRWarrior | 2014-07-25 | 1 | -8/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using IntNoiseXX instead of CubicNoiseXX. | ||||
* | | | | | | | | | Removed redundant semicolons and re-added warning | archshift | 2014-07-24 | 1 | -1/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | TallGrass: Less grass on mountains. | STRWarrior | 2014-07-23 | 1 | -0/+11 |
| | | | | | | | | | |||||
* | | | | | | | | | Fixed possible crash in the NetherClumpFoliage finisher. | STRWarrior | 2014-07-23 | 1 | -0/+5 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #1234 from mc-server/GeneratorTweaks | archshift | 2014-07-22 | 1 | -13/+3 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | ExtremeHillsPlus and ExtremeHills spawn with grass only | ||||
| * | | | | | | | | Extreme Hills M variant only spawn with grass and stone | STRWarrior | 2014-07-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed gravel. | ||||
| * | | | | | | | | ExtremeHillsPlus and ExtremeHills spawn with grass only | STRWarrior | 2014-07-21 | 1 | -12/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turns out only the M variants have stone and gravel in them. | ||||
* | | | | | | | | | Updated prefabs to current Gallery content. | madmaxoft | 2014-07-22 | 3 | -226/+243 |
|/ / / / / / / / | |||||
* | | | | | | | | Merged branch 'origin/Foliage'. | madmaxoft | 2014-07-21 | 3 | -0/+100 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fixed a missing enter. | STRWarrior | 2014-07-21 | 1 | -0/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Removed y for-loop. | STRWarrior | 2014-07-21 | 1 | -27/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only the top block now gets long grass. | ||||
| * | | | | | | | | Fixed indentation | STRWarrior | 2014-07-21 | 1 | -12/+12 |
| | | | | | | | | | |||||
| * | | | | | | | | Changed CubicNoiseXX to IntNoiseXX | STRWarrior | 2014-07-20 | 2 | -40/+49 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added some comments | ||||
| * | | | | | | | | Renamed cFinishGenFoliage to cFinishGenTallGrass | STRWarrior | 2014-07-20 | 3 | -17/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better grass density Added double tall grass. | ||||
| * | | | | | | | | Fixed warnings | STRWarrior | 2014-07-20 | 2 | -5/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | First attempt for a new foliage finisher | STRWarrior | 2014-07-20 | 3 | -0/+74 |
| | | | | | | | | | |||||
* | | | | | | | | | Style: Normalized to no spaces before closing parenthesis. | madmaxoft | 2014-07-21 | 4 | -9/+9 |
| | | | | | | | | | |||||
* | | | | | | | | | Fixed style: spaces after commas. | madmaxoft | 2014-07-19 | 4 | -9/+9 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #1214 from mc-server/anti-glob | Mattes D | 2014-07-19 | 2 | -12/+82 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | CMake - Explicitly lists all source files | ||||
| * | | | | | | | | | Subdirs: Only add_library if not using MSVC | archshift | 2014-07-19 | 2 | -4/+8 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Generating/Prefabs/CMakeLists.txt: Replaced glob with list of files | archshift | 2014-07-19 | 1 | -5/+22 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Generating/CMakeLists.txt: Replaced glob with list of files | archshift | 2014-07-19 | 1 | -5/+54 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* / | | | | | | | | Trees.cpp: removed unused "debug" fields | archshift | 2014-07-19 | 1 | -7/+1 |
|/ / / / / / / / | |||||
* | | | | | | | | Fixed spaces before commas. | madmaxoft | 2014-07-18 | 2 | -4/+4 |
| | | | | | | | | |||||
* | | | | | | | | Generator: removed rnd definitions that are never read | archshift | 2014-07-18 | 2 | -2/+0 |
| | | | | | | | | |||||
* | | | | | | | | Fixed code style in Trees.cpp. | madmaxoft | 2014-07-17 | 1 | -24/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The src folder now has zero BasicStyle violations. | ||||
* | | | | | | | | Fixed tabs used for alignment. | madmaxoft | 2014-07-17 | 5 | -22/+22 |
| | | | | | | | | |||||
* | | | | | | | | Basic style fixes. | madmaxoft | 2014-07-17 | 11 | -25/+25 |
| | | | | | | | | |||||
* | | | | | | | | Normalized comments. | madmaxoft | 2014-07-17 | 31 | -258/+258 |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 missing member initialization to cGridStructGen. | madmaxoft | 2014-07-15 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 68228. | ||||
* | | | | | | | Merge pull request #1172 from mc-server/coverity_fixes | Mattes D | 2014-07-13 | 2 | -3/+13 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Coverity fixes | ||||
| * | | | | | | | CopyPaste Error | worktycho | 2014-07-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 70460. | ||||
| * | | | | | | | Another COpyPaste Error | worktycho | 2014-07-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 70461 | ||||
| * | | | | | | | Fix CopyPaste error that ment a_MaxRelX wasdn't checked | worktycho | 2014-07-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 70464 | ||||
| * | | | | | | | Check GridSize for 0 | worktycho | 2014-06-26 | 1 | -0/+10 |
| | |_|_|_|/ / | |/| | | | | | | | | | | | | Fixes CID 68226 and CID 66437 | ||||
* | | | | | | | Removed lilypad from plains village prefabs. | madmaxoft | 2014-07-10 | 1 | -7/+8 |
| | | | | | | | |||||
* | | | | | | | Updated generator prefabs to current Gallery contents. | madmaxoft | 2014-07-08 | 3 | -7/+8 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Prefabs don't draw into chunk if they don't intersect. | madmaxoft | 2014-06-23 | 1 | -0/+11 |
|/ / / / / | |||||
* | | | | | Added a TestRails generator. | madmaxoft | 2014-06-21 | 5 | -0/+667 |
| | | | | | | | | | | | | | | | | | | | | This is for debugging purposes only. | ||||
* | | | | | Fixed a caching bug in GridStructGen. | madmaxoft | 2014-06-21 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | The elements in cache were queried wrong, so sometimes they wouldn't be used even if they were the ones to use. | ||||
* | | | | | Updated prefabs to the latest Gallery content. | madmaxoft | 2014-06-21 | 4 | -2049/+2644 |
| | | | | | |||||
* | | | | | Updated all prefabs to current Gallery content. | madmaxoft | 2014-06-20 | 2 | -650/+824 |
| | | | | | |||||
* | | | | | Optimized Voronoi calculation. | madmaxoft | 2014-06-20 | 2 | -9/+19 |
| | | | | | | | | | | | | | | | | | | | | Fixes #818. | ||||
* | | | | | Nullify deleted pointers. | archshift | 2014-06-19 | 3 | -0/+6 |
| | | | | | |||||
* | | | | | Merge branch 'master' of github.com:mc-server/MCServer | Tycho | 2014-06-16 | 18 | -373/+508 |
| |_|_|/ |/| | | | |||||
* | | | | Roads in villages are made out of wooden planks if they generate on water. | STRWarrior | 2014-06-11 | 1 | -4/+17 |
| | | | | |||||
* | | | | Revert "Initial Mesa Bryce implementation." | madmaxoft | 2014-06-11 | 4 | -116/+4 |
| | | | | | | | | | | | | | | | | This reverts commit 1ff1a93866ab81e3868588a256f446a902a1a8c4. | ||||
* | | | | Initial Mesa Bryce implementation. | madmaxoft | 2014-06-10 | 4 | -4/+116 |
| |_|/ |/| | | |||||
* | | | Added an experimental height generator, Mountains. | madmaxoft | 2014-06-09 | 2 | -0/+87 |
| | | | |||||
* | | | docs/Generator: Added the easy Finishers. | madmaxoft | 2014-06-07 | 1 | -1/+13 |
| | | | |||||
* | | | Added RainbowRoads finisher generator. | madmaxoft | 2014-06-07 | 5 | -3/+1594 |
| |/ |/| | |||||
* | | Merge pull request #1052 from mc-server/UnderwaterBaseGen | Mattes D | 2014-06-02 | 5 | -0/+2489 |
|\ \ | | | | | | | Underwater base gen | ||||
| * | | Update UnderwaterBase prefabs. | madmaxoft | 2014-06-01 | 1 | -12/+378 |
| | | | | | | | | | | | | Added the waterfall room and the decaying sphere room. Re-tweaked the pieces' weights. | ||||
| * | | Updated UnderwaterBase prefabs. | madmaxoft | 2014-06-01 | 1 | -103/+123 |
| | | | |||||
| * | | Added an initial version of the underwater base generator. | madmaxoft | 2014-05-31 | 5 | -0/+2103 |
| | | | |||||
* | | | Updated AlchemistVillage prefabs. | madmaxoft | 2014-06-01 | 1 | -103/+105 |
|/ / | |||||
* | | Updated PlainsVillage prefabs. | madmaxoft | 2014-05-31 | 1 | -73/+85 |
| | | |||||
* | | Fixed a memory leak in VillagGen. | madmaxoft | 2014-05-31 | 1 | -0/+5 |
| | | |||||
* | | Updated PlainsVillage and AlchemistVillage. | madmaxoft | 2014-05-30 | 2 | -239/+1270 |
| | | |||||
* | | Fixed a memory leak in cPOCPieceGenerator | madmaxoft | 2014-05-29 | 1 | -0/+5 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into VillageGen | madmaxoft | 2014-05-29 | 2 | -1/+34 |
|\| | |||||
| * | Fixed a memory leak in cPrefabPiecePool. | madmaxoft | 2014-05-28 | 2 | -1/+34 |
| | | | | | | | | The pool pieces weren't freed upon pool destruction. | ||||
* | | Merge branch 'master' into VillageGen | madmaxoft | 2014-05-27 | 2 | -1/+10 |
|\| | |||||
| * | Fixed Mineshaft system size. | Mattes D | 2014-05-23 | 1 | -1/+1 |
| | | |||||
| * | Auto-enlargement for cGridStructGen cache. | Mattes D | 2014-05-23 | 1 | -0/+9 |
| | | |||||
* | | Added AlchemistVillage prefabs (Thanks, KingsCraftAu). | madmaxoft | 2014-05-27 | 3 | -9/+3007 |
| | | |||||
* | | Fixed testing weights in PlainsVillages. | madmaxoft | 2014-05-27 | 1 | -3/+3 |
| | | |||||
* | | cPieceGenerator chooses starting pieces based on weights. | madmaxoft | 2014-05-27 | 4 | -1/+44 |
| | | | | | | | | Fixes #1033. | ||||
* | | Biome generators: biome lists can contain spaces. | madmaxoft | 2014-05-27 | 1 | -1/+1 |
| | | |||||
* | | Fixed prefab test initialization. | madmaxoft | 2014-05-26 | 1 | -0/+3 |
| | | |||||
* | | Added support for Miners' Village. | madmaxoft | 2014-05-25 | 10 | -2234/+4438 |
| | | | | | | | | | | The village contains both prefabs that snap to ground and prefabs that connect strictly via connectors. Fixes #1027. | ||||
* | | Added Japanese village prefabs. | madmaxoft | 2014-05-24 | 5 | -4/+2442 |
| | | |||||
* | | Updated plains village prefabs. | madmaxoft | 2014-05-22 | 1 | -186/+171 |
| | | | | | | | | Expanded the hitboxes so that houses don't touch each other. Fixed minor visual defects. | ||||
* | | Villages have min and max density setting. | madmaxoft | 2014-05-22 | 5 | -17/+110 |
| | | | | | | | | | | | | Also made roads use 3+9 scheme, instead of 3+5, for the house connectors. Fixes #1020. | ||||
* | | Updated plains village prefabs. | madmaxoft | 2014-05-22 | 1 | -44/+43 |
| | | | | | | | | The DoublePlantBed had sponges in wrong places, plus a few cosmetic fixes. | ||||
* | | Changed desert village roads to gravel. | madmaxoft | 2014-05-21 | 1 | -1/+1 |
| | | |||||
* | | Added second kind of desert village (FlatRoof). | madmaxoft | 2014-05-21 | 3 | -4/+1535 |
| | | |||||
* | | Merged branch 'master' into VillageGen. | madmaxoft | 2014-05-18 | 2 | -22/+40 |
|\| | |||||
| * | More switch warnings. | archshift | 2014-05-12 | 1 | -7/+27 |
| | | |||||
| * | Fixed a few more switch warnings. | archshift | 2014-05-12 | 1 | -15/+13 |
| | | |||||
* | | Updated SandVillage prefabs to latest Gallery content. | madmaxoft | 2014-05-18 | 1 | -12/+12 |
| | | | | | | | | This fixes sand village generation. | ||||
* | | Village roads are drawn properly. | madmaxoft | 2014-05-17 | 2 | -8/+35 |
| | | |||||
* | | Village houses are height-adjusted onto the terrain. | madmaxoft | 2014-05-17 | 5 | -7/+67 |
| | | |||||
* | | Updated PlainsVillage prefabs to the latest Gallery contents. | madmaxoft | 2014-05-17 | 1 | -2265/+2892 |
| | | |||||
* | | Fixed a NULL ptr failure in GridStructGen. | madmaxoft | 2014-05-15 | 2 | -9/+42 |
| | | | | | | | | When the descendant generator returned a NULL structure, the generator would crash. Now it uses a special cEmptyStructure class instead. | ||||
* | | Changed village generator defaults to more reasonable values. | madmaxoft | 2014-05-15 | 1 | -2/+2 |
| | | |||||
* | | Changed village road generation to use multiple prefabs. | madmaxoft | 2014-05-15 | 3 | -39/+38 |
| | | |||||
* | | VillageGen rewritten using BFSPieceGenerator. | madmaxoft | 2014-05-15 | 5 | -412/+406 |
| | | | | | | | | 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. | ||||
* | | cPrefab can be constructed in code. | madmaxoft | 2014-05-15 | 2 | -0/+51 |
| | | |||||
* | | VillageGen: Added well placement and the general algorithm description. | madmaxoft | 2014-05-12 | 3 | -6/+152 |
| | | |||||
* | | Initial VillageGen implementation. | madmaxoft | 2014-05-11 | 6 | -0/+5807 |
|/ | | | | | WIP, doesn't generate anything yet. Ref.: 740. | ||||
* | Removed unused constants from MineShafts and Ravines. | Mattes D | 2014-05-09 | 2 | -9/+0 |
| | |||||
* | Removed an unused NetherFortGen variable. | Mattes D | 2014-05-09 | 1 | -6/+0 |
| | |||||
* | Removed an unused macro. | Mattes D | 2014-05-09 | 1 | -7/+0 |
| | |||||
* | Ravines rewritten using cGridStructGen. | Mattes D | 2014-05-09 | 2 | -182/+40 |
| | | | | Ref.: #987. | ||||
* | cWormNestCaves rewritten using cGridStructGen. | Mattes D | 2014-05-09 | 2 | -223/+29 |
| | | | | Ref.: #987. | ||||
* | Mineshafts generator rewritten to use GridStructGen. | Mattes D | 2014-05-09 | 2 | -156/+33 |
| | |||||
* | Fixed cGridStructGen. | Mattes D | 2014-05-08 | 1 | -18/+6 |
| | | | | Now cNetherFortGen works with the new architecture. | ||||
* | Merge branch 'master' into GridStructGen | Mattes D | 2014-05-08 | 5 | -10/+22 |
|\ | |||||
| * | Fixed MSVC 64-bit build warnings. | Mattes D | 2014-05-08 | 5 | -10/+22 |
| | | |||||
* | | cNetherFortGen uses cGridStructGen. | madmaxoft | 2014-05-07 | 5 | -264/+42 |
| | | | | | | | | WIP, this doesn't work properly yet. | ||||
* | | Initial cPrefabPiecePool refactoring. | madmaxoft | 2014-05-07 | 2 | -0/+196 |
| | | | | | | | | Ref.: #986. | ||||
* | | Initial cGridStructGen refactoring. | madmaxoft | 2014-05-06 | 2 | -0/+262 |
|/ | | | | Ref.: #987. | ||||
* | Changed cPieceGenerator to support pairings. | madmaxoft | 2014-05-05 | 3 | -57/+104 |
| | | | | Fixes #982. | ||||
* | Prefabs can specify that they don't want flooring. | madmaxoft | 2014-05-05 | 1 | -30/+33 |
| | | | | Previously the flag was ignored. | ||||
* | Removed unneeded assert | Tycho | 2014-04-27 | 1 | -1/+1 |
| | | | | Fixed CID 43610 | ||||
* | Cmake generated projects for IDEs include headers in project files. | archshift | 2014-04-25 | 2 | -0/+2 |
| | |||||
* | Updated NetherFort prefabs to latest Gallery content. | madmaxoft | 2014-04-23 | 1 | -7/+29 |
| | |||||
* | Updated NetherFort prefabs from the Gallery server. | madmaxoft | 2014-04-22 | 1 | -274/+785 |
| | |||||
* | Merge pull request #909 from jfhumann/fixes | Mattes D | 2014-04-22 | 2 | -23/+28 |
|\ | | | | | | | | | Bug fixes and optimizations. We need to visit the API functions and check that they return only those values expected. `cWorld::CreateProjectile()` seems affected, too, by the same issue of ToLua returning extra values. In the cleanest form, these functions will need moving to ManualBindings.cpp | ||||
| * | Small style changes | jfhumann | 2014-04-18 | 1 | -1/+1 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' into fixes | jfhumann | 2014-04-18 | 7 | -63/+891 |
| |\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Authenticator.cpp src/ClientHandle.cpp src/Entities/Minecart.cpp src/Protocol/Protocol17x.cpp | ||||
| * | | Did some static analysis, fixed some bugs and optimized a lot of code | jfhumann | 2014-04-18 | 3 | -24/+29 |
| | | | |||||
* | | | Added prefab hitboxes. | madmaxoft | 2014-04-21 | 3 | -11/+138 |
| |/ |/| | | | | | The nether forts should quite limit their bridge-to-floor overlaps. Cannot eliminate, but at least severely diminish. | ||||
* | | Added performance test of the nether fort generator. | madmaxoft | 2014-04-18 | 2 | -0/+35 |
| | | |||||
* | | Added area flooring. | madmaxoft | 2014-04-17 | 1 | -1/+42 |
| | | | | | | | | Fixes #743. | ||||
* | | Added Prefab initializers to SELFTEST code. | madmaxoft | 2014-04-17 | 1 | -1/+13 |
| | | |||||
* | | Prefabs can have per-piece per-placement weights. | madmaxoft | 2014-04-17 | 5 | -32/+752 |
| | | | | | | | | | | Fixes #753. Also upgraded NetherFortPrefabs to lates Gallery contents. | ||||
* | | Added support for per-piece per-placement weights in cPieceGenerator. | madmaxoft | 2014-04-15 | 2 | -28/+48 |
| | | | | | | | | Ref.: #753. | ||||
* | | NetherFortPrefabs: Fixed a connector in MidStaircase. | madmaxoft | 2014-04-15 | 1 | -1/+1 |
|/ | |||||
* | Updated the NetherFort prefabs to current Gallery contents. | madmaxoft | 2014-04-12 | 3 | -1958/+3329 |
| | | | | Code exported from the Gallery server by the GalExport plugin. | ||||
* | Added all current NetherFort prefabs. | madmaxoft | 2014-03-30 | 1 | -3/+1547 |
| | |||||
* | Added asserts for critical data in cPrefab. | madmaxoft | 2014-03-30 | 1 | -0/+4 |
| | |||||
* | Re-fixed nether fort piece count check. | madmaxoft | 2014-03-30 | 1 | -2/+2 |
| | |||||
* | NetherForts have a minimum number of pieces. | madmaxoft | 2014-03-30 | 1 | -2/+5 |
| | | | | The fort will generate a different image if it has less than the minimum; the max depth affects the minimum number of pieces. | ||||
* | Merge branch 'master' into NetherFortGen | madmaxoft | 2014-03-29 | 2 | -10/+102 |
|\ | |||||
| * | cPrefab now uses a struct for block type definition in CharMap. | madmaxoft | 2014-03-29 | 2 | -10/+102 |
| | | | | | | | | | | As suggested by worktycho in 7b585290fccd3dc074b1f9feef0af754ab3dd632, instead of packing the two values into a single int, they're packed into a struct. Also added a test code for the prefab parsing in SELF_TEST. | ||||
* | | NetherFortGen: Added several more prefabs. | madmaxoft | 2014-03-28 | 2 | -2/+783 |
| | | | | | | | | Also extended the defauls MaxDepth value to 12. | ||||
* | | Implemented the msSpongePrint merge strategy. | madmaxoft | 2014-03-28 | 1 | -3/+3 |
| | | | | | | | | Similar to msImprint, but allows prefabs to carve out air pockets, too. The sponge block is used as the NOP block. | ||||
* | | NetherFort: Added BalconyTee2 prefab. | madmaxoft | 2014-03-28 | 1 | -29/+158 |
| | | |||||
* | | Fixed a memory leak in NetherFortGen. | madmaxoft | 2014-03-28 | 1 | -0/+7 |
| | | |||||
* | | Sponged the netherfort balcony prefab. | madmaxoft | 2014-03-28 | 1 | -30/+31 |
| | | | | | | | | This is a preparation for the msSpongePrint merge strategy, used for imprinting most prefabs. It will carve out even air, but will ignore sponge blocks. | ||||
* | | Initial NetherFortGen import. | madmaxoft | 2014-03-28 | 7 | -2/+699 |
|/ | | | | Simple fortresses of 2 different rooms will generate. | ||||
* | Merge branch 'howaner/GlobalFixes'. | madmaxoft | 2014-03-28 | 1 | -1/+0 |
|\ | |||||
| * | Add missing ChunkDesc import. | Howaner | 2014-03-28 | 1 | -1/+1 |
| | | |||||
* | | Fixed Prefab's rotations. | madmaxoft | 2014-03-28 | 2 | -7/+39 |
|/ | |||||
* | cPrefab can draw itself into a cChunkDesc. | madmaxoft | 2014-03-27 | 2 | -6/+9 |
| | |||||
* | Prefabs support connectors, rotations and merge strategy. | madmaxoft | 2014-03-26 | 2 | -3/+72 |
| | |||||
* | Added a basic cPrefab class. | madmaxoft | 2014-03-25 | 2 | -0/+222 |
| | | | | Can be defined in the source by GalExport's cpp output. | ||||
* | BlockArea: Switched internal coords to Vector3i. | madmaxoft | 2014-03-25 | 1 | -3/+3 |
| | |||||
* | Implemented faster upscaling using templates. | madmaxoft | 2014-03-21 | 5 | -14/+14 |
| | | | | Fixes #819. | ||||
* | Fixed xofts issues | Tycho | 2014-03-14 | 1 | -2/+2 |
| | |||||
* | Added additional macros to support the MSVC size_t format and changed all formats to use the macros | Tycho | 2014-03-12 | 1 | -1/+1 |
| | |||||
* | Merge branch 'Werror' into warnings | Tycho | 2014-03-12 | 1 | -7/+6 |
|\ | | | | | | | | | Conflicts: src/Globals.h | ||||
| * | Fixed printf format compatabilty | Tycho | 2014-03-12 | 1 | -5/+4 |
| | | |||||
| * | Merge branch 'master' into Werror | Tycho | 2014-03-12 | 1 | -2/+2 |
| |\ | | | | | | | | | | | | | Conflicts: src/Generating/PieceGenerator.cpp | ||||
| | * | Fixed missing comment terminator. | madmaxoft | 2014-03-12 | 1 | -1/+1 |
| | | | |||||
* | | | Fixed a load of format string errors | Tycho | 2014-03-11 | 1 | -2/+2 |
|/ / | |||||
* / | Fixed Warnings in PieceGenerator | Tycho | 2014-03-11 | 2 | -9/+9 |
|/ | |||||
* | Removed debugging output. | madmaxoft | 2014-03-10 | 1 | -1/+3 |
| | | | | Kept it commented-out for later revisions, if needed. | ||||
* | POCPieces: Added height. | madmaxoft | 2014-03-10 | 1 | -17/+20 |
| | | | | Now the pieces connect in different heights, too, creating a true 3D maze. | ||||
* | A working POCPiece generator. | madmaxoft | 2014-03-09 | 5 | -6/+359 |
| | |||||
* | cPieceGenerator: New connectors are added to the free pool. | madmaxoft | 2014-03-09 | 2 | -9/+30 |
| | |||||
* | PieceGenerator can connect two connectors of the same type. | madmaxoft | 2014-03-09 | 2 | -60/+338 |
| | | | | Also added extensive debugging output and a test. | ||||
* | Added the first skeleton code for PieceGenerator. | madmaxoft | 2014-03-09 | 2 | -0/+545 |
| | | | | This is a WIP and won't work / isn't used at all. | ||||
* | Warnings | Tycho | 2014-03-07 | 2 | -1/+3 |
| | |||||
* | Merge pull request #738 from xdot/master | Mattes D | 2014-03-02 | 1 | -3/+3 |
|\ | | | | | Refactored global block property arrays | ||||
| * | g_BlockXXX => cBlockInfo::XXX | andrew | 2014-03-01 | 1 | -3/+3 |
| | | |||||
* | | ChunkDesc warns about StructureGen's deprecation. | madmaxoft | 2014-03-01 | 1 | -0/+2 |
| | | |||||
* | | Unified StructureGens and FinisherGens. | madmaxoft | 2014-03-01 | 10 | -163/+128 |
|/ | | | | Now they are all Finishers. Fixes #398. | ||||
* | Merge pull request #669 from xdot/master | Tiger Wang | 2014-02-24 | 1 | -9/+0 |
|\ | | | | | Implementation of in-game maps :D | ||||
| * | Thread safe cMap manager | andrew | 2014-02-20 | 1 | -9/+0 |
| | | |||||
* | | Add BlockNewLeaves.h and rename Darkoac to Darkoak | Howaner | 2014-02-19 | 2 | -3/+3 |
| | | |||||
* | | Add new Trees (without Generator) | Howaner | 2014-02-19 | 2 | -0/+24 |
|/ | |||||
* | Fixed compile and some warnings in MSVS | Tiger Wang | 2014-02-09 | 1 | -9/+0 |
| | |||||
* | Fogot to save Biogen | Tycho | 2014-02-03 | 1 | -4/+4 |
| | |||||
* | Fixed Compile errors | Tycho | 2014-02-03 | 1 | -1/+1 |
| | | | | c++11 introduces scoped enums, so the code didn't fail in clang | ||||
* | Increased Type safety of Biomes | Tycho | 2014-02-03 | 3 | -8/+8 |
| | | | | | Changed a number of funcictions from using integers to store biomes to using EMCSBiome Note that switching from an int to an Enum is a non-breaking chang to the lua bindings | ||||
* | Merge branch 'master' into GeneratingBenchmark2 | Tycho | 2014-02-01 | 2 | -17/+48 |
|\ | | | | | | | | | Conflicts: src/World.h | ||||
| * | Added cChunkDest::UpdateHeightmap() | madmaxoft | 2014-01-31 | 2 | -17/+48 |
| | | | | | | | | This function is necessary for plugins manipulating the generated chunks, they need to update the heightmap before it is passed back to the generator. | ||||
* | | Merge branch 'master' into GeneratingBenchmark2 | Tycho | 2014-01-26 | 1 | -1/+8 |
|\| | | | | | | | | | | | Conflicts: src/Blocks/BlockRail.h src/World.h | ||||
| * | Merge pull request #575 from worktycho/GeneratingBenchmark | Mattes D | 2014-01-25 | 1 | -0/+2 |
| |\ | | | | | | | More Interfaces to decouple Generator from the rest of the code | ||||
| * | | Mob bugfixes | Tiger Wang | 2014-01-25 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Mobs no longer require constant line-of-sight to a player to remain aggravated * Fixed an ASSERT * Fixed mobs jumping * Fixed Idle state not properly using AI + Added FILE_IO_PREFIX to favicon loading + Implemented #563 | ||||
| * | | Fixed a generator bug | Tiger Wang | 2014-01-25 | 1 | -1/+6 |
| | | | |||||
* | | | dded dependecy on Blocks to Generator | Tycho | 2014-01-25 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge branch 'master' into GeneratingBenchmark | Tycho | 2014-01-20 | 3 | -3/+150 |
|\| | | | | | | | this merge is necessary, | ||||
| * | Alpha-sorted the finishers. | madmaxoft | 2014-01-18 | 1 | -4/+4 |
| | | |||||
| * | Merged branch 'NetherFinish'. | madmaxoft | 2014-01-18 | 3 | -3/+150 |
| |\ | |||||
| | * | Fixed errors. | STRWarrior | 2014-01-18 | 2 | -2/+2 |
| | | | |||||
| | * | Renamed cFinishGenNetherSprinkleFoliage to cFinishGenNetherClumpFoliage. Fixed typo's | STRWarrior | 2014-01-18 | 3 | -10/+10 |
| | | | |||||
| | * | Some tweaks. | STRWarrior | 2014-01-18 | 1 | -5/+18 |
| | | | | | | | | | | | | | | | Everything generates more often. Fire can only spawn on ForeverBurning blocks. | ||||
| | * | Fixed bug where only brown mushrooms would spawn. | STRWarrior | 2014-01-18 | 1 | -3/+3 |
| | | | |||||
| | * | It now actualy works. | STRWarrior | 2014-01-18 | 1 | -20/+42 |
| | | | |||||
| | * | First attempt at creating a clumb version NetherFinisher. | STRWarrior | 2014-01-17 | 2 | -22/+63 |
| | | | |||||
| | * | Added cFinishGenNetherSprinkleFoliage. | STRWarrior | 2014-01-10 | 3 | -2/+73 |
| | | | |||||
* | | | Added Inifile and OSSupport Linking | Tycho | 2014-01-19 | 1 | -0/+2 |
|/ / | |||||
* | | Decoupled cChunkGenerator from cWorld and cRoot. | madmaxoft | 2014-01-10 | 8 | -49/+87 |
| | | | | | | | | 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 | 2 | -1/+3 |
| | | |||||
* | | Merge pull request #520 from mc-server/SoulSand | Mattes D | 2014-01-10 | 2 | -1/+17 |
|\| | | | | | NetherGen: Now generates SoulSand. | ||||
| * | Fixed recurring pattern. | STRWarrior | 2014-01-10 | 1 | -1/+1 |
| | | |||||
| * | Fixed chunk borders. | STRWarrior | 2014-01-09 | 1 | -3/+3 |
| | | |||||
| * | Speed-up. I got about 40 extra ch/s | STRWarrior | 2014-01-08 | 1 | -9/+14 |
| | | |||||
| * | WormNestCaves now remove soul sand. | STRWarrior | 2014-01-08 | 1 | -0/+1 |
| | | |||||
| * | NetherGen: Now generates SoulSand. | STRWarrior | 2014-01-08 | 1 | -1/+11 |
| | | |||||
* | | Composition generator creating moved to a separate function. | madmaxoft | 2014-01-09 | 2 | -61/+83 |
| | | | | | | | | Also it forces the defaults into the INI file. | ||||
* | | Height generator creating moved info HeiGen.cpp. | madmaxoft | 2014-01-09 | 3 | -54/+82 |
|/ | | | | The generator also explicitly sets the default back into the INI file. | ||||
* | More MSVC warning fixes. | madmaxoft | 2014-01-07 | 1 | -1/+1 |
| | |||||
* | Fixed a few MSVC warnings. | madmaxoft | 2014-01-07 | 3 | -6/+7 |
| | |||||
* | Added function to create Tall Birch tree in BirchTreeForest biomes | Mike Hunsinger | 2013-12-29 | 2 | -3/+49 |
| | |||||
* | Simplefied Extreme Hills M pattern select. | STRWarrior | 2013-12-26 | 1 | -11/+3 |
| | |||||
* | Extreme Hills M biomes now generate gravel, stone and grass patterns. | STRWarrior | 2013-12-25 | 1 | -2/+10 |
| | |||||
* | Changed tbGravel. Vanilla has 3 layers of gravel and then stone. | STRWarrior | 2013-12-25 | 1 | -3/+3 |
| | |||||
* | Normal extreme hills (plus) now generate a stone/grass pattern. | STRWarrior | 2013-12-25 | 1 | -2/+20 |
| | |||||
* | Re-added empty line. | STRWarrior | 2013-12-25 | 1 | -0/+1 |
| | |||||
* | This generates gravel in Extreme Hills M biomes. | STRWarrior | 2013-12-25 | 2 | -3/+20 |
| | |||||
* | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-20 | 9 | -19/+23 |
|\ | |||||
| * | Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT). | madmaxoft | 2013-12-20 | 9 | -19/+23 |
| | | |||||
* | | moved generating to globs | Tycho Bickerstaff | 2013-12-11 | 1 | -1/+5 |
| | | |||||
* | | more cmake | Tycho Bickerstaff | 2013-12-10 | 1 | -0/+7 |
|/ | |||||
* | moved deafult action into deafult clause at src/Generating/DistortedHeightmap.cpp line 741 | Tycho Bickerstaff | 2013-12-08 | 1 | -2/+4 |
| | |||||
* | reordered initalisation order at src/Generating/Cave.h line 73 | Tycho Bickerstaff | 2013-12-08 | 1 | -2/+2 |
| | |||||
* | fixed warnings in src/Generating/BioGen.cpp | Tycho Bickerstaff | 2013-12-08 | 1 | -1/+1 |
| | | | | | | removed unused variable at src/Generating/BioGen.cpp line 379 and added default fallthrough clause to switch at src/Generating/BioGen.cpp line 725 | ||||
* | Moved bindings-related to a Bindings subfolder. | madmaxoft | 2013-12-08 | 1 | -1/+1 |
| | | | | Ref.: #407 | ||||
* | Added floor pattern for MegaTaiga biomes. | madmaxoft | 2013-11-30 | 1 | -1/+10 |
| | |||||
* | Implemented mesa biomes in DistortedHeightmap CompoGen. | madmaxoft | 2013-11-29 | 3 | -21/+106 |
| | |||||
* | Fixed CheckerboardBiomeGen in negative coords. | madmaxoft | 2013-11-29 | 1 | -2/+3 |
| | |||||
* | DistortedHeightmap: Improved speed, prepared for mesa biomes. | madmaxoft | 2013-11-29 | 2 | -157/+424 |
| | | | | This generates the rainbow-mesa as seen on the first mesa screenshot in the forum. | ||||
* | Trees will generate in the new biomes. | madmaxoft | 2013-11-28 | 2 | -14/+101 |
| | | | | Only the generic trees, the special variants haven't yet been implemented. | ||||
* | Added new biomes to old composition generator. | madmaxoft | 2013-11-28 | 3 | -0/+141 |
| | | | | Mostly placeholders only, true per-biome characteristics still need to be implemented. This is only to test the new biome generators. | ||||
* | Added new biomes to old height generators. | madmaxoft | 2013-11-28 | 4 | -39/+179 |
| | | | | Now Biomal and DistortedHeight generators will work with new biomes. | ||||
* | Moved BiomeGen creation from INI file data to BioGen.cpp. | madmaxoft | 2013-11-28 | 3 | -48/+74 |
| | | | | This way it can be shared between MCServer and BiomeVisualiser. | ||||
* | BiomeVisualiser: Added the TwoLevel biome generator. | madmaxoft | 2013-11-28 | 2 | -0/+229 |
| | |||||
* | Voronoi-related biomegens use the new cVoronoiMap class. | madmaxoft | 2013-11-27 | 2 | -53/+28 |
| | |||||
* | Fixed the remaining derps | Alexander Harkness | 2013-11-27 | 8 | -8/+8 |
| | |||||
* | Hopefully fixed last of the Linux compile errors | Tiger Wang | 2013-11-26 | 2 | -2/+2 |
| | |||||
* | Further attempts to fix compile | Tiger Wang | 2013-11-25 | 8 | -8/+8 |
| | |||||
* | Attempt to fix compilation | Tiger Wang | 2013-11-24 | 8 | -8/+8 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-24 | 7 | -196/+190 |
| | | | | | Conflicts: GNUmakefile | ||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 30 | -0/+11358 |