summaryrefslogtreecommitdiffstats
path: root/src/Generating/FinishGen.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Bulk clearing of whitespaceLogicParrot2016-02-051-4/+4
|
* Fixed opposite condition in OreNests finisher.Mattes D2015-12-091-2/+2
|
* Normalized OrePockets generator config names.Mattes D2015-11-271-2/+2
| | | | All INI values use AllInitialCapsStyle, no underscores.
* OrePockets finisher is now configurable.Mattes D2015-11-251-19/+105
|
* Added OrePockets and DirtPockets finish gens.Mattes D2015-11-251-0/+367
|
* Fixed tall grass trying to be placed in cold biomes.Samuel Barney2015-07-151-1/+7
|
* Fixed minor cast warningtycho2015-05-301-1/+1
|
* Fix FreeBSD/clang errors caused by -Werrorlinnemannr2015-05-301-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With FreeBSD/clang, -Werror combined with the configured warning flags yields some fatal errors, specifically related to signed conversion, 64 to 32 bit conversion, and tautological compares. CONTRIBUTORS Add myself to the contributor list src/Generating/FinishGen.cpp In cFinishGenPassiveMobs::GetRandomMob(), change the type of RandMob from size_t to the difference_type of the ListOfSpawnables iterator MobIter. Using size_t triggers a 64 bit to 32 bit conversion if the difference_type of the iterator class is 64 bit Also explicitly cast the noise expression to unsigned long so we don't get a signed conversion warning from the modulo against ListOfSpawnables.size() src/OSSupport/StackTrace.cpp FreeBSD 10 and above includes a non glibc implementation of benchmark() for which size_t, not int, is the return type. To account for this and prevent a signed conversion warning, abstract the type for numItems with a macro btsize src/StringUtils.h In StringToInteger(), correct a tautological compare warning for unsigned types with the template. If T is unsigned, comparing std::numeric_limits<T>::min() to the unsigned result is always false. That control can enter this branch in an evaluated template with an unsigned type T may also permit a signed number to be parsed and erroneously stripped of its signedness at runtime. To guard against this and avoid the warning in the case that the number parsed from the string is non-positive, return false and don't try to parse if T is unsigned and control enters the non-positive branch
* Merge branch 'master' into PreventNewWarningstycho2015-05-241-1/+1
|\
| * Wolves don't spawn in rivers.Alexander Harkness2015-05-241-1/+1
| |
| * Cows and rabbits no longer spawn over water.Alexander Harkness2015-05-231-1/+1
| | | | | | | | Fixes #2080
* | Made -Weverything an error.tycho2015-05-241-7/+7
| |
* | Merge branch 'master' into PreventNewWarningstycho2015-05-191-0/+1
|\|
| * Fix the health of animalsLukas Pioch2015-05-181-0/+1
| |
* | Fixed a lot of warningstycho2015-05-191-8/+8
|/
* More style checking.Mattes D2015-05-091-1/+1
| | | | Spaces around some operators are checked.
* Fixed styleSTRWarrior2015-04-191-2/+2
|
* Added GlowStone finisherSTRWarrior2015-04-191-1/+113
|
* Correct world height validations.Tommy Santerre2015-03-201-1/+1
| | | | | Unify the way we test block above the current one (Height - 1 instead of a_RelY + 1). Allow generation of world of flat height = 255
* Replaced IntNoiseXX with IntNoiseXXIntSTRWarrior2015-03-011-2/+2
|
* Made the minimum vine level configurableSTRWarrior2015-02-281-1/+1
|
* Implemented a vines finisher that creates vines in jungle biomesSTRWarrior2015-02-281-0/+94
|
* Ice finisher uses GetSnowStartHeight instead of specific biomesSTRWarrior2015-02-251-26/+19
|
* Snow finisher uses GetSnowStartHeight instead of specific biomesSTRWarrior2015-02-251-22/+14
|
* Fixed error message in cFinishGenPassiveMobsSTRWarrior2014-12-071-1/+1
| | | | It would send an error message when trying to spawn mobs in a desert
* FinishGenPassiveMobs: Cosmetic changes.Mattes D2014-12-051-23/+22
|
* formatting and default spawn percentagep-mcgowan2014-12-051-1/+2
|
* Merge branch 'master' of github.com:p-mcgowan/MCServer into animalTerrainFinisherp-mcgowan2014-12-051-13/+28
|\ | | | | | | update
| * conflict resolutionp-mcgowan2014-12-041-12/+12
| |\
| | * clearing CheckBasicStyle.lua messagesp-mcgowan2014-12-031-13/+13
| | |
| * | reformat for lua and CIp-mcgowan2014-12-021-5/+8
| | |
| * | formatting and commenting fixesp-mcgowan2014-12-021-4/+4
| | |
| * | cacti no longer spawn outside of desert variantsp-mcgowan2014-12-011-1/+13
| |/
* | reformatp-mcgowan2014-12-051-9/+5
| |
* | restructure, with logic this timep-mcgowan2014-12-051-5/+13
| |
* | restructured random animals, added check for desert (update as per wiki)p-mcgowan2014-12-051-19/+17
| |
* | handle non-vanilla dimensionsp-mcgowan2014-12-051-2/+2
| |
* | handle non-vanilla dimensionsp-mcgowan2014-12-051-2/+3
| |
* | formatting fixesp-mcgowan2014-12-051-4/+11
| |
* | format blocks and randomizingp-mcgowan2014-12-041-8/+9
| |
* | awful comment fixing, randomizer fixp-mcgowan2014-12-041-11/+24
| |
* | class description and doxy-commentingp-mcgowan2014-12-031-3/+3
| |
* | typos and oversights for lua and CIp-mcgowan2014-12-021-1/+5
| |
* | indentation, repeatable random, small correctionsp-mcgowan2014-12-021-98/+93
| |
* | fix comments after replacing spaces with tabsp-mcgowan2014-12-021-4/+4
| |
* | animal terrain finisherp-mcgowan2014-12-021-175/+175
| |
* | animal terrain finisherp-mcgowan2014-12-021-0/+212
|/
* Simplefied SoulsandRimsSTRWarrior2014-12-011-36/+6
| | | | Replaced two for loops with a single if
* Added better soulsand rimsSTRWarrior2014-12-011-0/+82
| | | | As a finisher called SoulsandRims
* Hopefully fixed random build failsSTRWarrior2014-11-301-1/+1
|
* Merge remote-tracking branch 'origin/master' into GeneratorShapeRefactorMattes D2014-11-201-1/+0
|\
| * Moved all Noise-related files into a separate folder.Mattes D2014-11-181-1/+0
| |
* | Snow generator: Fixed failure at top of the world.Mattes D2014-11-151-1/+1
|/
* TallGrassGenerator: Fixed crash when too highSTRWarrior2014-11-101-0/+5
|
* Another switch.Alexander Harkness2014-10-271-0/+5
|
* Fix missing biomes in enum.Alexander Harkness2014-10-271-0/+5
|
* Merged IniFile into main MCS sources.Mattes D2014-10-231-1/+1
|
* Added first test to show the object can be createdTycho2014-09-171-0/+1
|
* Removed an old and outdated comment.STRWarrior2014-08-101-2/+0
|
* PreSimulator: Added configurations.STRWarrior2014-07-301-4/+18
| | | | You can now choose if it should pregenerate something or not
* Merge pull request #1061 from mc-server/portalsMattes D2014-07-291-0/+9
|\ | | | | Portals and others
| * Merge branch 'master' into portalsTiger Wang2014-07-291-44/+53
| |\ | | | | | | | | | | | | Conflicts: src/World.h
| * \ Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-07-221-4/+63
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp
| * \ \ Merge branch 'master' into portalsTiger Wang2014-07-181-15/+15
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Fixed a NetherFinisher bugTiger Wang2014-06-041-0/+9
| | | | |
* | | | | Fixed comment above cFinishGenSingleTopBlockSTRWarrior2014-07-291-1/+1
| | | | |
* | | | | Renamed cFinishGenSingleBiomeSingleTopBlock to cFinishGenSingleTopBlockSTRWarrior2014-07-281-8/+13
| |_|_|/ |/| | | | | | | | | | | Now accepts a vector of biomes and a vector of allowed blocks.
* | | | NetherClumpGenerator: Fixed generating stuff on halfslabs and fencesSTRWarrior2014-07-271-1/+1
| | | |
* | | | NetherClumpFoliage: Fixed assertSTRWarrior2014-07-271-8/+39
| | | |
* | | | 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.
* | | | Fixed possible crash in the NetherClumpFoliage finisher.STRWarrior2014-07-231-0/+5
| |_|/ |/| |
* | | Merged branch 'origin/Foliage'.madmaxoft2014-07-211-0/+59
|\ \ \
| * | | 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.
| * | | Changed CubicNoiseXX to IntNoiseXXSTRWarrior2014-07-201-27/+36
| | | | | | | | | | | | | | | | Added some comments
| * | | Renamed cFinishGenFoliage to cFinishGenTallGrassSTRWarrior2014-07-201-8/+26
| | | | | | | | | | | | | | | | | | | | Better grass density Added double tall grass.
| * | | Fixed warningsSTRWarrior2014-07-201-2/+1
| | | |
| * | | First attempt for a new foliage finisherSTRWarrior2014-07-201-0/+32
| |/ /
* | / Style: Normalized to no spaces before closing parenthesis.madmaxoft2014-07-211-4/+4
| |/ |/|
* | Fixed spaces before commas.madmaxoft2014-07-181-2/+2
| |
* | Basic style fixes.madmaxoft2014-07-171-2/+2
| |
* | Normalized comments.madmaxoft2014-07-171-11/+11
|/ | | | | 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.
* g_BlockXXX => cBlockInfo::XXXandrew2014-03-011-3/+3
|
* Merged branch 'NetherFinish'.madmaxoft2014-01-181-0/+120
|\
| * Fixed errors.STRWarrior2014-01-181-1/+1
| |
| * Renamed cFinishGenNetherSprinkleFoliage to cFinishGenNetherClumpFoliage. Fixed typo'sSTRWarrior2014-01-181-6/+6
| |
| * 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-171-22/+62
| |
| * Added cFinishGenNetherSprinkleFoliage.STRWarrior2014-01-101-0/+45
| |
* | Decoupled cChunkGenerator from cWorld and cRoot.madmaxoft2014-01-101-2/+2
|/ | | | Now the chunk generator can be used by other projects without depending on the two hugest structures in MCS.
* Fixed a few MSVC warnings.madmaxoft2014-01-071-1/+1
|
* Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT).madmaxoft2013-12-201-3/+3
|
* Moved source to srcAlexander Harkness2013-11-241-0/+664