summaryrefslogtreecommitdiffstats
path: root/src/Generating (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merged IniFile into main MCS sources.Mattes D2014-10-239-9/+9
|
* En masse NULL -> nullptr replaceTiger Wang2014-10-2314-44/+44
|
* ComposableGenerator: Removed nullptr initializers.Mattes D2014-10-221-3/+3
|
* Fixed #1550Julian Laubstein2014-10-201-6/+6
|
* TwoLevel BioGen: fixed swapped inside and outside biomes.Mattes D2014-10-191-1/+1
|
* Mountain height gen: Added ditches.Mattes D2014-10-192-8/+16
|
* Generator: Rewritten to use SharedPtrs.Mattes D2014-10-1918-181/+145
|
* Merge branch 'master' into DungeonLootSTRWarrior2014-10-161-2/+2
|\ | | | | | | | | Conflicts: src/ItemGrid.cpp
| * BioGen: Fixed a compiler warning.Mattes D2014-10-161-2/+2
| |
* | Reversed wrong fix for #1517.STRWarrior2014-10-161-8/+2
| |
* | Reversed the order of the lootSTRWarrior2014-10-151-7/+15
| | | | | | | | | | For some reason the rare items weren't generating at all. Added forgotten Golden Apple
* | Added loot to dungeons.STRWarrior2014-10-151-1/+27
|/
* DistortedHeightmap: Fixed crash on number rounding.Mattes D2014-10-091-4/+5
| | | | Fixes #1521.
* Added comments to the GetAcaciaTreeImage functionSTRWarrior2014-10-081-0/+18
|
* Using array with possible directions.STRWarrior2014-10-081-8/+9
|
* Added AcaciaTrees for the savanna biomesSTRWarrior2014-10-081-5/+56
|
* Fixes #1503 - No gravel is being generatedwin32re2014-10-041-1/+1
|
* Fixed compilationSTRWarrior2014-09-281-1/+10
|
* Added Granite, Diorite and Andesite to the NaturalPatches generator.STRWarrior2014-09-283-7/+37
|
* BioGen: TwoLevel is now fully settable in INI.madmaxoft2014-09-272-44/+31
|
* Merge pull request #1419 from mc-server/redstoneTestsworktycho2014-09-261-0/+1
|\ | | | | Added test mocking to IncrementalRedstoneSimulator
| * Merge branch 'master' into redstoneTestsTycho2014-09-253-74/+80
| |\ | | | | | | | | | | | | Conflicts: src/Mobs/Monster.h
| * | Added first test to show the object can be createdTycho2014-09-171-0/+1
| | |
* | | TwoLevel BioGen: reads params from INI file.madmaxoft2014-09-251-9/+26
| |/ |/|
* | Made it compile with clangChris Darnell2014-09-222-3/+3
| |
* | Voronoi biomegen: Added JitterSize and OddRowOffset.madmaxoft2014-09-171-71/+77
|/
* WorldStorage no longer queues chunks into generator.Mattes D2014-09-051-0/+2
|
* Rewritten chunk status to specify whether the chunk is in queue.Mattes D2014-09-052-1/+6
| | | | This fixes #1370.
* BiomeMultiCache is not used for simple generators.Mattes D2014-09-051-21/+22
|
* Fixed style.Mattes D2014-09-053-9/+13
|
* Merge pull request #1371 from DayBr3ak/masterMattes D2014-09-043-2/+92
|\ | | | | issue381, multicache for cBioGen
| * change to linear calculationDayBr3ak2014-09-032-9/+7
| |
| * adapting formatDayBr3ak2014-09-033-7/+14
| |
| * forgot this oneDayBr3ak2014-09-022-2/+2
| |
| * opting for size_tDayBr3ak2014-09-022-5/+5
| |
| * fixing memory leakDayBr3ak2014-09-021-4/+5
| |
| * changing implem, using vectorsDayBr3ak2014-09-022-98/+23
| |
| * adding config file entry #381DayBr3ak2014-09-021-1/+10
| |
| * adding the multicache behaviorDayBr3ak2014-09-023-4/+119
| |
| * added multicache class definitionDayBr3ak2014-09-011-0/+35
| |
* | ChunkGenerator: Log world seed when creating a new one.madmaxoft2014-09-031-3/+14
| |
* | re-add the missing "s" too cChunkCoordsWithBoolListLO1ZB2014-09-032-5/+5
| |
* | hopefully the last commit for removing y-coord from chunks. :)LO1ZB2014-09-032-11/+17
| |
* | fix possibility of a twice generated chunkLO1ZB2014-09-011-1/+2
| |
* | fix chunk regeneratingLO1ZB2014-08-291-8/+0
| |
* | remove y-coord from chunksLO1ZB2014-08-282-9/+9
|/
* DungeonRooms: Fixed an off-by-one error.Mattes D2014-08-271-2/+2
|
* More basic style fixes.Mattes D2014-08-271-2/+2
|
* DungeonRooms: Added a height probability distribution function.Mattes D2014-08-273-9/+19
|
* DungeonRooms: Added the spawner in the center of the room.Mattes D2014-08-271-0/+15
|
* DungeonRooms: Chests are never placed next to each other.Mattes D2014-08-261-22/+27
|
* DungeonRooms: Random pattern for floors.Mattes D2014-08-261-1/+32
|
* DungeonRooms: Replaced explicit switch with CanBeTerraformed().Mattes D2014-08-261-11/+3
|
* Added initial dungeon rooms finisher.Mattes D2014-08-264-0/+289
|
* Added initializers for class members.Mattes D2014-08-213-1/+11
| | | | As reported by Coverity, these weren't initialized.
* SwamplandM: Fixed sometimes having no mountains.STRWarrior2014-08-181-1/+1
|
* Bunch of tweaks:STRWarrior2014-08-103-15/+15
| | | | | | Renamed Quarts to Quartz Using const_iterator instead of iterator Used CheckBasicStyle script to find style errors
* Added NaturalPatches generatorSTRWarrior2014-08-101-0/+22
| | | | It generates gravel and dirt.
* Added NetherOreNests.STRWarrior2014-08-101-0/+15
| | | | It generates Nether Quarts.
* Changed cStructGenOreNests to take a list of ores + the block to replace.STRWarrior2014-08-103-53/+83
|
* Removed an old and outdated comment.STRWarrior2014-08-101-2/+0
|
* CheckBasicStyle: multi-level indent change.madmaxoft2014-08-042-5/+6
|
* VillageGen: Fixed a typo in commentSTRWarrior2014-08-031-1/+1
|
* Added proper trees and height for SwamplandM biomeSTRWarrior2014-08-023-2/+4
|
* SuggestionsSTRWarrior2014-07-301-2/+2
|
* Moved GetRoofedForestTreeImage content to GetDarkoakTreeImageSTRWarrior2014-07-302-66/+55
|
* Fixed doxy commentSTRWarrior2014-07-301-1/+1
|
* Fixed comment at the end of a for-loopSTRWarrior2014-07-301-1/+1
|
* Fixed compiling using ClangSTRWarrior2014-07-301-4/+2
|
* Added RoofedForest trees.STRWarrior2014-07-302-2/+73
| | | | Could still be improved allot.
* PreSimulator: Added configurations.STRWarrior2014-07-303-6/+30
| | | | You can now choose if it should pregenerate something or not
* Merge pull request #1262 from mc-server/CanBeTerraformedMattes D2014-07-302-44/+6
|\ | | | | Added cBlockInfo::CanBeTerraformed and made finishers use it
| * Added cBlockInfo::CanBeTerraformed and made finishers use itSTRWarrior2014-07-292-44/+6
| | | | | | | | I might have forgotten some of them though
* | Fixed FinishGen.h types.madmaxoft2014-07-301-2/+2
| |
* | Changed size_t to 'unsigned long'Howaner2014-07-301-2/+2
| |
* | Fixed compile error with clang.Howaner2014-07-301-2/+2
| |
* | Slight cleanup after portalsTiger Wang2014-07-291-1/+1
|/
* Merge pull request #1061 from mc-server/portalsMattes D2014-07-298-44/+14
|\ | | | | Portals and others
| * Merge branch 'master' into portalsTiger Wang2014-07-296-97/+837
| |\ | | | | | | | | | | | | Conflicts: src/World.h
| * \ Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-07-2214-263/+444
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp
| * \ \ Merge branch 'master' into portalsTiger Wang2014-07-1837-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 portalsTiger Wang2014-06-241-0/+11
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into portalsTiger Wang2014-06-2131-3075/+4662
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h
| * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-06-141-4/+17
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/World.h
| * \ \ \ \ \ \ Merge branch 'master' into portalsTiger Wang2014-06-108-4/+1694
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/Player.cpp src/Entities/Player.h src/Protocol/Protocol125.cpp src/Protocol/Protocol17x.cpp
| * | | | | | | | SuggestionsTiger Wang2014-06-051-1/+1
| | | | | | | | |
| * | | | | | | | Fixed a NetherFinisher bugTiger Wang2014-06-043-24/+9
| | | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-06-0428-22/+19604
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Implemented end and nether portalsTiger Wang2014-05-314-19/+4
| | | | | | | | | |
* | | | | | | | | | Merge pull request #1254 from mc-server/SingleTopBlockFinisherMattes D2014-07-293-22/+92
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Renamed cFinishGenSingleBiomeSingleTopBlock to cFinishGenSingleTopBlock
| * | | | | | | | | | Some finishing touchesSTRWarrior2014-07-292-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed whitespace fixed dead bush comment
| * | | | | | | | | | Fixed comment above cFinishGenSingleTopBlockSTRWarrior2014-07-291-1/+1
| | | | | | | | | | |
| * | | | | | | | | | SingleTopBlock: All blocktypes and biometypes get initialized properlySTRWarrior2014-07-291-2/+14
| | | | | | | | | | |
| * | | | | | | | | | Using suggestionsSTRWarrior2014-07-281-25/+20
| | | | | | | | | | |
| * | | | | | | | | | Forgot Mesa Plateau biome.STRWarrior2014-07-281-0/+1
| | | | | | | | | | |
| * | | | | | | | | | Renamed cFinishGenSingleBiomeSingleTopBlock to cFinishGenSingleTopBlockSTRWarrior2014-07-283-20/+82
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Now accepts a vector of biomes and a vector of allowed blocks.
* | | | | | | | | | Merge pull request #1252 from mc-server/RoughRavinesGenMattes D2014-07-294-3/+439
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | Rough ravines gen
| * | | | | | | | | RoughRavines: Made floor and ceiling settings-adjustable.madmaxoft2014-07-273-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!madmaxoft2014-07-271-32/+73
| | | | | | | | | |
| * | | | | | | | | RoughRavines: More settings - size, width, roughnessmadmaxoft2014-07-273-23/+84
| | | | | | | | | |
| * | | | | | | | | RoughRavines: Initial generator implementation.madmaxoft2014-07-274-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.STRWarrior2014-07-281-1/+1
| | | | | | | | | |
* | | | | | | | | | NetherClumpGenerator: Fixed generating stuff on halfslabs and fencesSTRWarrior2014-07-271-1/+1
| | | | | | | | | |
* | | | | | | | | | Updated NetherForts' weights.madmaxoft2014-07-271-2/+2
| | | | | | | | | |
* | | | | | | | | | Removed forgotten commentSTRWarrior2014-07-271-1/+1
| | | | | | | | | |
* | | | | | | | | | Made nether ceiling smooth.STRWarrior2014-07-271-1/+8
| | | | | | | | | |
* | | | | | | | | | Added a ceiling to disguise the bedrock above it.STRWarrior2014-07-271-1/+9
| | | | | | | | | |
* | | | | | | | | | NetherClumpFoliage: Fixed assertSTRWarrior2014-07-271-8/+39
| | | | | | | | | |
* | | | | | | | | | Updated NetherFort prefabs to latest Gallery content.madmaxoft2014-07-271-37/+752
|/ / / / / / / / /
* | | | | | | | | Tweaks to NetherClumpFoliageSTRWarrior2014-07-251-34/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplefied the way NetherClupFoliage creates the X and Z coordinate.
* | | | | | | | | Speed up the NetherClumpFoliage finisher.STRWarrior2014-07-251-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using IntNoiseXX instead of CubicNoiseXX.
* | | | | | | | | Removed redundant semicolons and re-added warningarchshift2014-07-241-1/+1
| | | | | | | | |
* | | | | | | | | TallGrass: Less grass on mountains.STRWarrior2014-07-231-0/+11
| | | | | | | | |
* | | | | | | | | Fixed possible crash in the NetherClumpFoliage finisher.STRWarrior2014-07-231-0/+5
| | | | | | | | |
* | | | | | | | | Merge pull request #1234 from mc-server/GeneratorTweaksarchshift2014-07-221-13/+3
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | ExtremeHillsPlus and ExtremeHills spawn with grass only
| * | | | | | | | Extreme Hills M variant only spawn with grass and stoneSTRWarrior2014-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed gravel.
| * | | | | | | | ExtremeHillsPlus and ExtremeHills spawn with grass onlySTRWarrior2014-07-211-12/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turns out only the M variants have stone and gravel in them.
* | | | | | | | | Updated prefabs to current Gallery content.madmaxoft2014-07-223-226/+243
|/ / / / / / / /
* | | | | | | | Merged branch 'origin/Foliage'.madmaxoft2014-07-213-0/+100
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed a missing enter.STRWarrior2014-07-211-0/+1
| | | | | | | | |
| * | | | | | | | Removed y for-loop.STRWarrior2014-07-211-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only the top block now gets long grass.
| * | | | | | | | Fixed indentationSTRWarrior2014-07-211-12/+12
| | | | | | | | |
| * | | | | | | | Changed CubicNoiseXX to IntNoiseXXSTRWarrior2014-07-202-40/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added some comments
| * | | | | | | | Renamed cFinishGenFoliage to cFinishGenTallGrassSTRWarrior2014-07-203-17/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better grass density Added double tall grass.
| * | | | | | | | Fixed warningsSTRWarrior2014-07-202-5/+4
| | | | | | | | |
| * | | | | | | | First attempt for a new foliage finisherSTRWarrior2014-07-203-0/+74
| | | | | | | | |
* | | | | | | | | Style: Normalized to no spaces before closing parenthesis.madmaxoft2014-07-214-9/+9
| | | | | | | | |
* | | | | | | | | Fixed style: spaces after commas.madmaxoft2014-07-194-9/+9
| | | | | | | | |
* | | | | | | | | Merge pull request #1214 from mc-server/anti-globMattes D2014-07-192-12/+82
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | CMake - Explicitly lists all source files
| * | | | | | | | | Subdirs: Only add_library if not using MSVCarchshift2014-07-192-4/+8
| | | | | | | | | |
| * | | | | | | | | Generating/Prefabs/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-191-5/+22
| | | | | | | | | |
| * | | | | | | | | Generating/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-191-5/+54
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* / | | | | | | | Trees.cpp: removed unused "debug" fieldsarchshift2014-07-191-7/+1
|/ / / / / / / /
* | | | | | | | Fixed spaces before commas.madmaxoft2014-07-182-4/+4
| | | | | | | |
* | | | | | | | Generator: removed rnd definitions that are never readarchshift2014-07-182-2/+0
| | | | | | | |
* | | | | | | | Fixed code style in Trees.cpp.madmaxoft2014-07-171-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The src folder now has zero BasicStyle violations.
* | | | | | | | Fixed tabs used for alignment.madmaxoft2014-07-175-22/+22
| | | | | | | |
* | | | | | | | Basic style fixes.madmaxoft2014-07-1711-25/+25
| | | | | | | |
* | | | | | | | Normalized comments.madmaxoft2014-07-1731-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.madmaxoft2014-07-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 68228.
* | | | | | | Merge pull request #1172 from mc-server/coverity_fixesMattes D2014-07-132-3/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Coverity fixes
| * | | | | | | CopyPaste Errorworktycho2014-07-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 70460.
| * | | | | | | Another COpyPaste Errorworktycho2014-07-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 70461
| * | | | | | | Fix CopyPaste error that ment a_MaxRelX wasdn't checkedworktycho2014-07-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 70464
| * | | | | | | Check GridSize for 0worktycho2014-06-261-0/+10
| | |_|_|_|/ / | |/| | | | | | | | | | | | Fixes CID 68226 and CID 66437
* | | | | | | Removed lilypad from plains village prefabs.madmaxoft2014-07-101-7/+8
| | | | | | |
* | | | | | | Updated generator prefabs to current Gallery contents.madmaxoft2014-07-083-7/+8
| |_|_|_|_|/ |/| | | | |
* | | | | | Prefabs don't draw into chunk if they don't intersect.madmaxoft2014-06-231-0/+11
|/ / / / /
* | | | | Added a TestRails generator.madmaxoft2014-06-215-0/+667
| | | | | | | | | | | | | | | | | | | | This is for debugging purposes only.
* | | | | Fixed a caching bug in GridStructGen.madmaxoft2014-06-211-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.madmaxoft2014-06-214-2049/+2644
| | | | |
* | | | | Updated all prefabs to current Gallery content.madmaxoft2014-06-202-650/+824
| | | | |
* | | | | Optimized Voronoi calculation.madmaxoft2014-06-202-9/+19
| | | | | | | | | | | | | | | | | | | | Fixes #818.
* | | | | Nullify deleted pointers.archshift2014-06-193-0/+6
| | | | |
* | | | | Merge branch 'master' of github.com:mc-server/MCServerTycho2014-06-1618-373/+508
| |_|_|/ |/| | |
* | | | Roads in villages are made out of wooden planks if they generate on water.STRWarrior2014-06-111-4/+17
| | | |
* | | | Revert "Initial Mesa Bryce implementation."madmaxoft2014-06-114-116/+4
| | | | | | | | | | | | | | | | This reverts commit 1ff1a93866ab81e3868588a256f446a902a1a8c4.
* | | | Initial Mesa Bryce implementation.madmaxoft2014-06-104-4/+116
| |_|/ |/| |
* | | Added an experimental height generator, Mountains.madmaxoft2014-06-092-0/+87
| | |
* | | docs/Generator: Added the easy Finishers.madmaxoft2014-06-071-1/+13
| | |
* | | Added RainbowRoads finisher generator.madmaxoft2014-06-075-3/+1594
| |/ |/|
* | Merge pull request #1052 from mc-server/UnderwaterBaseGenMattes D2014-06-025-0/+2489
|\ \ | | | | | | Underwater base gen
| * | Update UnderwaterBase prefabs.madmaxoft2014-06-011-12/+378
| | | | | | | | | | | | Added the waterfall room and the decaying sphere room. Re-tweaked the pieces' weights.
| * | Updated UnderwaterBase prefabs.madmaxoft2014-06-011-103/+123
| | |
| * | Added an initial version of the underwater base generator.madmaxoft2014-05-315-0/+2103
| | |
* | | Updated AlchemistVillage prefabs.madmaxoft2014-06-011-103/+105
|/ /
* | Updated PlainsVillage prefabs.madmaxoft2014-05-311-73/+85
| |
* | Fixed a memory leak in VillagGen.madmaxoft2014-05-311-0/+5
| |
* | Updated PlainsVillage and AlchemistVillage.madmaxoft2014-05-302-239/+1270
| |
* | Fixed a memory leak in cPOCPieceGeneratormadmaxoft2014-05-291-0/+5
| |
* | Merge remote-tracking branch 'origin/master' into VillageGenmadmaxoft2014-05-292-1/+34
|\|
| * Fixed a memory leak in cPrefabPiecePool.madmaxoft2014-05-282-1/+34
| | | | | | | | The pool pieces weren't freed upon pool destruction.
* | Merge branch 'master' into VillageGenmadmaxoft2014-05-272-1/+10
|\|
| * Fixed Mineshaft system size.Mattes D2014-05-231-1/+1
| |
| * Auto-enlargement for cGridStructGen cache.Mattes D2014-05-231-0/+9
| |
* | Added AlchemistVillage prefabs (Thanks, KingsCraftAu).madmaxoft2014-05-273-9/+3007
| |
* | Fixed testing weights in PlainsVillages.madmaxoft2014-05-271-3/+3
| |
* | cPieceGenerator chooses starting pieces based on weights.madmaxoft2014-05-274-1/+44
| | | | | | | | Fixes #1033.
* | Biome generators: biome lists can contain spaces.madmaxoft2014-05-271-1/+1
| |
* | Fixed prefab test initialization.madmaxoft2014-05-261-0/+3
| |
* | Added support for Miners' Village.madmaxoft2014-05-2510-2234/+4438
| | | | | | | | | | The village contains both prefabs that snap to ground and prefabs that connect strictly via connectors. Fixes #1027.
* | Added Japanese village prefabs.madmaxoft2014-05-245-4/+2442
| |
* | Updated plains village prefabs.madmaxoft2014-05-221-186/+171
| | | | | | | | Expanded the hitboxes so that houses don't touch each other. Fixed minor visual defects.
* | Villages have min and max density setting.madmaxoft2014-05-225-17/+110
| | | | | | | | | | | | Also made roads use 3+9 scheme, instead of 3+5, for the house connectors. Fixes #1020.
* | Updated plains village prefabs.madmaxoft2014-05-221-44/+43
| | | | | | | | The DoublePlantBed had sponges in wrong places, plus a few cosmetic fixes.
* | Changed desert village roads to gravel.madmaxoft2014-05-211-1/+1
| |
* | Added second kind of desert village (FlatRoof).madmaxoft2014-05-213-4/+1535
| |
* | Merged branch 'master' into VillageGen.madmaxoft2014-05-182-22/+40
|\|
| * More switch warnings.archshift2014-05-121-7/+27
| |
| * Fixed a few more switch warnings.archshift2014-05-121-15/+13
| |
* | Updated SandVillage prefabs to latest Gallery content.madmaxoft2014-05-181-12/+12
| | | | | | | | This fixes sand village generation.
* | Village roads are drawn properly.madmaxoft2014-05-172-8/+35
| |
* | Village houses are height-adjusted onto the terrain.madmaxoft2014-05-175-7/+67
| |
* | Updated PlainsVillage prefabs to the latest Gallery contents.madmaxoft2014-05-171-2265/+2892
| |
* | Fixed a NULL ptr failure in GridStructGen.madmaxoft2014-05-152-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.madmaxoft2014-05-151-2/+2
| |
* | Changed village road generation to use multiple prefabs.madmaxoft2014-05-153-39/+38
| |
* | VillageGen rewritten using BFSPieceGenerator.madmaxoft2014-05-155-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.madmaxoft2014-05-152-0/+51
| |
* | VillageGen: Added well placement and the general algorithm description.madmaxoft2014-05-123-6/+152
| |
* | Initial VillageGen implementation.madmaxoft2014-05-116-0/+5807
|/ | | | | WIP, doesn't generate anything yet. Ref.: 740.
* Removed unused constants from MineShafts and Ravines.Mattes D2014-05-092-9/+0
|
* Removed an unused NetherFortGen variable.Mattes D2014-05-091-6/+0
|
* Removed an unused macro.Mattes D2014-05-091-7/+0
|
* Ravines rewritten using cGridStructGen.Mattes D2014-05-092-182/+40
| | | | Ref.: #987.
* cWormNestCaves rewritten using cGridStructGen.Mattes D2014-05-092-223/+29
| | | | Ref.: #987.
* Mineshafts generator rewritten to use GridStructGen.Mattes D2014-05-092-156/+33
|
* Fixed cGridStructGen.Mattes D2014-05-081-18/+6
| | | | Now cNetherFortGen works with the new architecture.
* Merge branch 'master' into GridStructGenMattes D2014-05-085-10/+22
|\
| * Fixed MSVC 64-bit build warnings.Mattes D2014-05-085-10/+22
| |
* | cNetherFortGen uses cGridStructGen.madmaxoft2014-05-075-264/+42
| | | | | | | | WIP, this doesn't work properly yet.
* | Initial cPrefabPiecePool refactoring.madmaxoft2014-05-072-0/+196
| | | | | | | | Ref.: #986.
* | Initial cGridStructGen refactoring.madmaxoft2014-05-062-0/+262
|/ | | | Ref.: #987.
* Changed cPieceGenerator to support pairings.madmaxoft2014-05-053-57/+104
| | | | Fixes #982.
* Prefabs can specify that they don't want flooring.madmaxoft2014-05-051-30/+33
| | | | Previously the flag was ignored.
* Removed unneeded assertTycho2014-04-271-1/+1
| | | | Fixed CID 43610
* Cmake generated projects for IDEs include headers in project files.archshift2014-04-252-0/+2
|
* Updated NetherFort prefabs to latest Gallery content.madmaxoft2014-04-231-7/+29
|
* Updated NetherFort prefabs from the Gallery server.madmaxoft2014-04-221-274/+785
|
* Merge pull request #909 from jfhumann/fixesMattes D2014-04-222-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 changesjfhumann2014-04-181-1/+1
| |
| * Merge remote-tracking branch 'origin/master' into fixesjfhumann2014-04-187-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 codejfhumann2014-04-183-24/+29
| | |
* | | Added prefab hitboxes.madmaxoft2014-04-213-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.madmaxoft2014-04-182-0/+35
| |
* | Added area flooring.madmaxoft2014-04-171-1/+42
| | | | | | | | Fixes #743.
* | Added Prefab initializers to SELFTEST code.madmaxoft2014-04-171-1/+13
| |
* | Prefabs can have per-piece per-placement weights.madmaxoft2014-04-175-32/+752
| | | | | | | | | | Fixes #753. Also upgraded NetherFortPrefabs to lates Gallery contents.
* | Added support for per-piece per-placement weights in cPieceGenerator.madmaxoft2014-04-152-28/+48
| | | | | | | | Ref.: #753.
* | NetherFortPrefabs: Fixed a connector in MidStaircase.madmaxoft2014-04-151-1/+1
|/
* Updated the NetherFort prefabs to current Gallery contents.madmaxoft2014-04-123-1958/+3329
| | | | Code exported from the Gallery server by the GalExport plugin.
* Added all current NetherFort prefabs.madmaxoft2014-03-301-3/+1547
|
* Added asserts for critical data in cPrefab.madmaxoft2014-03-301-0/+4
|
* Re-fixed nether fort piece count check.madmaxoft2014-03-301-2/+2
|
* NetherForts have a minimum number of pieces.madmaxoft2014-03-301-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 NetherFortGenmadmaxoft2014-03-292-10/+102
|\
| * cPrefab now uses a struct for block type definition in CharMap.madmaxoft2014-03-292-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.madmaxoft2014-03-282-2/+783
| | | | | | | | Also extended the defauls MaxDepth value to 12.
* | Implemented the msSpongePrint merge strategy.madmaxoft2014-03-281-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.madmaxoft2014-03-281-29/+158
| |
* | Fixed a memory leak in NetherFortGen.madmaxoft2014-03-281-0/+7
| |
* | Sponged the netherfort balcony prefab.madmaxoft2014-03-281-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.madmaxoft2014-03-287-2/+699
|/ | | | Simple fortresses of 2 different rooms will generate.
* Merge branch 'howaner/GlobalFixes'.madmaxoft2014-03-281-1/+0
|\
| * Add missing ChunkDesc import.Howaner2014-03-281-1/+1
| |
* | Fixed Prefab's rotations.madmaxoft2014-03-282-7/+39
|/
* cPrefab can draw itself into a cChunkDesc.madmaxoft2014-03-272-6/+9
|
* Prefabs support connectors, rotations and merge strategy.madmaxoft2014-03-262-3/+72
|
* Added a basic cPrefab class.madmaxoft2014-03-252-0/+222
| | | | Can be defined in the source by GalExport's cpp output.
* BlockArea: Switched internal coords to Vector3i.madmaxoft2014-03-251-3/+3
|
* Implemented faster upscaling using templates.madmaxoft2014-03-215-14/+14
| | | | Fixes #819.
* Fixed xofts issuesTycho2014-03-141-2/+2
|
* Added additional macros to support the MSVC size_t format and changed all formats to use the macrosTycho2014-03-121-1/+1
|
* Merge branch 'Werror' into warningsTycho2014-03-121-7/+6
|\ | | | | | | | | Conflicts: src/Globals.h
| * Fixed printf format compatabiltyTycho2014-03-121-5/+4
| |
| * Merge branch 'master' into WerrorTycho2014-03-121-2/+2
| |\ | | | | | | | | | | | | Conflicts: src/Generating/PieceGenerator.cpp
| | * Fixed missing comment terminator.madmaxoft2014-03-121-1/+1
| | |
* | | Fixed a load of format string errorsTycho2014-03-111-2/+2
|/ /
* / Fixed Warnings in PieceGeneratorTycho2014-03-112-9/+9
|/
* Removed debugging output.madmaxoft2014-03-101-1/+3
| | | | Kept it commented-out for later revisions, if needed.
* POCPieces: Added height.madmaxoft2014-03-101-17/+20
| | | | Now the pieces connect in different heights, too, creating a true 3D maze.
* A working POCPiece generator.madmaxoft2014-03-095-6/+359
|
* cPieceGenerator: New connectors are added to the free pool.madmaxoft2014-03-092-9/+30
|
* PieceGenerator can connect two connectors of the same type.madmaxoft2014-03-092-60/+338
| | | | Also added extensive debugging output and a test.
* Added the first skeleton code for PieceGenerator.madmaxoft2014-03-092-0/+545
| | | | This is a WIP and won't work / isn't used at all.
* WarningsTycho2014-03-072-1/+3
|
* Merge pull request #738 from xdot/masterMattes D2014-03-021-3/+3
|\ | | | | Refactored global block property arrays
| * g_BlockXXX => cBlockInfo::XXXandrew2014-03-011-3/+3
| |
* | ChunkDesc warns about StructureGen's deprecation.madmaxoft2014-03-011-0/+2
| |
* | Unified StructureGens and FinisherGens.madmaxoft2014-03-0110-163/+128
|/ | | | Now they are all Finishers. Fixes #398.
* Merge pull request #669 from xdot/masterTiger Wang2014-02-241-9/+0
|\ | | | | Implementation of in-game maps :D
| * Thread safe cMap managerandrew2014-02-201-9/+0
| |
* | Add BlockNewLeaves.h and rename Darkoac to DarkoakHowaner2014-02-192-3/+3
| |
* | Add new Trees (without Generator)Howaner2014-02-192-0/+24
|/
* Fixed compile and some warnings in MSVSTiger Wang2014-02-091-9/+0
|
* Fogot to save BiogenTycho2014-02-031-4/+4
|
* Fixed Compile errorsTycho2014-02-031-1/+1
| | | | c++11 introduces scoped enums, so the code didn't fail in clang
* Increased Type safety of BiomesTycho2014-02-033-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 GeneratingBenchmark2Tycho2014-02-012-17/+48
|\ | | | | | | | | Conflicts: src/World.h
| * Added cChunkDest::UpdateHeightmap()madmaxoft2014-01-312-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 GeneratingBenchmark2Tycho2014-01-261-1/+8
|\| | | | | | | | | | | Conflicts: src/Blocks/BlockRail.h src/World.h
| * Merge pull request #575 from worktycho/GeneratingBenchmarkMattes D2014-01-251-0/+2
| |\ | | | | | | More Interfaces to decouple Generator from the rest of the code
| * | Mob bugfixesTiger Wang2014-01-251-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 bugTiger Wang2014-01-251-1/+6
| | |
* | | dded dependecy on Blocks to GeneratorTycho2014-01-251-1/+1
| |/ |/|
* | Merge branch 'master' into GeneratingBenchmarkTycho2014-01-203-3/+150
|\| | | | | | | this merge is necessary,
| * Alpha-sorted the finishers.madmaxoft2014-01-181-4/+4
| |
| * Merged branch 'NetherFinish'.madmaxoft2014-01-183-3/+150
| |\
| | * Fixed errors.STRWarrior2014-01-182-2/+2
| | |
| | * Renamed cFinishGenNetherSprinkleFoliage to cFinishGenNetherClumpFoliage. Fixed typo'sSTRWarrior2014-01-183-10/+10
| | |
| | * Some tweaks.STRWarrior2014-01-181-5/+18
| | | | | | | | | | | | | | | Everything generates more often. Fire can only spawn on ForeverBurning blocks.
| | * Fixed bug where only brown mushrooms would spawn.STRWarrior2014-01-181-3/+3
| | |
| | * It now actualy works.STRWarrior2014-01-181-20/+42
| | |
| | * First attempt at creating a clumb version NetherFinisher.STRWarrior2014-01-172-22/+63
| | |
| | * Added cFinishGenNetherSprinkleFoliage.STRWarrior2014-01-103-2/+73
| | |
* | | Added Inifile and OSSupport LinkingTycho2014-01-191-0/+2
|/ /
* | Decoupled cChunkGenerator from cWorld and cRoot.madmaxoft2014-01-108-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.madmaxoft2014-01-102-1/+3
| |
* | Merge pull request #520 from mc-server/SoulSandMattes D2014-01-102-1/+17
|\| | | | | NetherGen: Now generates SoulSand.
| * Fixed recurring pattern.STRWarrior2014-01-101-1/+1
| |
| * Fixed chunk borders.STRWarrior2014-01-091-3/+3
| |
| * Speed-up. I got about 40 extra ch/sSTRWarrior2014-01-081-9/+14
| |
| * WormNestCaves now remove soul sand.STRWarrior2014-01-081-0/+1
| |
| * NetherGen: Now generates SoulSand.STRWarrior2014-01-081-1/+11
| |
* | Composition generator creating moved to a separate function.madmaxoft2014-01-092-61/+83
| | | | | | | | Also it forces the defaults into the INI file.
* | Height generator creating moved info HeiGen.cpp.madmaxoft2014-01-093-54/+82
|/ | | | The generator also explicitly sets the default back into the INI file.
* More MSVC warning fixes.madmaxoft2014-01-071-1/+1
|
* Fixed a few MSVC warnings.madmaxoft2014-01-073-6/+7
|
* Added function to create Tall Birch tree in BirchTreeForest biomesMike Hunsinger2013-12-292-3/+49
|
* Simplefied Extreme Hills M pattern select.STRWarrior2013-12-261-11/+3
|
* Extreme Hills M biomes now generate gravel, stone and grass patterns.STRWarrior2013-12-251-2/+10
|
* Changed tbGravel. Vanilla has 3 layers of gravel and then stone.STRWarrior2013-12-251-3/+3
|
* Normal extreme hills (plus) now generate a stone/grass pattern.STRWarrior2013-12-251-2/+20
|
* Re-added empty line.STRWarrior2013-12-251-0/+1
|
* This generates gravel in Extreme Hills M biomes.STRWarrior2013-12-252-3/+20
|
* Merge branch 'master' into cmakeTycho Bickerstaff2013-12-209-19/+23
|\
| * Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT).madmaxoft2013-12-209-19/+23
| |
* | moved generating to globsTycho Bickerstaff2013-12-111-1/+5
| |
* | more cmakeTycho Bickerstaff2013-12-101-0/+7
|/
* moved deafult action into deafult clause at src/Generating/DistortedHeightmap.cpp line 741Tycho Bickerstaff2013-12-081-2/+4
|
* reordered initalisation order at src/Generating/Cave.h line 73Tycho Bickerstaff2013-12-081-2/+2
|
* fixed warnings in src/Generating/BioGen.cppTycho Bickerstaff2013-12-081-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.madmaxoft2013-12-081-1/+1
| | | | Ref.: #407
* Added floor pattern for MegaTaiga biomes.madmaxoft2013-11-301-1/+10
|
* Implemented mesa biomes in DistortedHeightmap CompoGen.madmaxoft2013-11-293-21/+106
|
* Fixed CheckerboardBiomeGen in negative coords.madmaxoft2013-11-291-2/+3
|
* DistortedHeightmap: Improved speed, prepared for mesa biomes.madmaxoft2013-11-292-157/+424
| | | | This generates the rainbow-mesa as seen on the first mesa screenshot in the forum.
* Trees will generate in the new biomes.madmaxoft2013-11-282-14/+101
| | | | Only the generic trees, the special variants haven't yet been implemented.
* Added new biomes to old composition generator.madmaxoft2013-11-283-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.madmaxoft2013-11-284-39/+179
| | | | Now Biomal and DistortedHeight generators will work with new biomes.
* Moved BiomeGen creation from INI file data to BioGen.cpp.madmaxoft2013-11-283-48/+74
| | | | This way it can be shared between MCServer and BiomeVisualiser.
* BiomeVisualiser: Added the TwoLevel biome generator.madmaxoft2013-11-282-0/+229
|
* Voronoi-related biomegens use the new cVoronoiMap class.madmaxoft2013-11-272-53/+28
|
* Fixed the remaining derpsAlexander Harkness2013-11-278-8/+8
|
* Hopefully fixed last of the Linux compile errorsTiger Wang2013-11-262-2/+2
|
* Further attempts to fix compileTiger Wang2013-11-258-8/+8
|
* Attempt to fix compilationTiger Wang2013-11-248-8/+8
|
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-247-196/+190
| | | | | Conflicts: GNUmakefile
* Moved source to srcAlexander Harkness2013-11-2430-0/+11358
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 13:20:17 +0100