Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed minor cast warning | tycho | 2015-05-30 | 1 | -1/+1 |
| | |||||
* | Fix FreeBSD/clang errors caused by -Werror | linnemannr | 2015-05-30 | 1 | -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 PreventNewWarnings | tycho | 2015-05-24 | 1 | -1/+1 |
|\ | |||||
| * | Wolves don't spawn in rivers. | Alexander Harkness | 2015-05-24 | 1 | -1/+1 |
| | | |||||
| * | Cows and rabbits no longer spawn over water. | Alexander Harkness | 2015-05-23 | 1 | -1/+1 |
| | | | | | | | | Fixes #2080 | ||||
* | | Made -Weverything an error. | tycho | 2015-05-24 | 1 | -7/+7 |
| | | |||||
* | | Merge branch 'master' into PreventNewWarnings | tycho | 2015-05-19 | 1 | -0/+1 |
|\| | |||||
| * | Fix the health of animals | Lukas Pioch | 2015-05-18 | 1 | -0/+1 |
| | | |||||
* | | Fixed a lot of warnings | tycho | 2015-05-19 | 1 | -8/+8 |
|/ | |||||
* | More style checking. | Mattes D | 2015-05-09 | 1 | -1/+1 |
| | | | | Spaces around some operators are checked. | ||||
* | Fixed style | STRWarrior | 2015-04-19 | 1 | -2/+2 |
| | |||||
* | Added GlowStone finisher | STRWarrior | 2015-04-19 | 1 | -1/+113 |
| | |||||
* | Correct world height validations. | Tommy Santerre | 2015-03-20 | 1 | -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 IntNoiseXXInt | STRWarrior | 2015-03-01 | 1 | -2/+2 |
| | |||||
* | Made the minimum vine level configurable | STRWarrior | 2015-02-28 | 1 | -1/+1 |
| | |||||
* | Implemented a vines finisher that creates vines in jungle biomes | STRWarrior | 2015-02-28 | 1 | -0/+94 |
| | |||||
* | Ice finisher uses GetSnowStartHeight instead of specific biomes | STRWarrior | 2015-02-25 | 1 | -26/+19 |
| | |||||
* | Snow finisher uses GetSnowStartHeight instead of specific biomes | STRWarrior | 2015-02-25 | 1 | -22/+14 |
| | |||||
* | Fixed error message in cFinishGenPassiveMobs | STRWarrior | 2014-12-07 | 1 | -1/+1 |
| | | | | It would send an error message when trying to spawn mobs in a desert | ||||
* | FinishGenPassiveMobs: Cosmetic changes. | Mattes D | 2014-12-05 | 1 | -23/+22 |
| | |||||
* | formatting and default spawn percentage | p-mcgowan | 2014-12-05 | 1 | -1/+2 |
| | |||||
* | Merge branch 'master' of github.com:p-mcgowan/MCServer into animalTerrainFinisher | p-mcgowan | 2014-12-05 | 1 | -13/+28 |
|\ | | | | | | | update | ||||
| * | conflict resolution | p-mcgowan | 2014-12-04 | 1 | -12/+12 |
| |\ | |||||
| | * | clearing CheckBasicStyle.lua messages | p-mcgowan | 2014-12-03 | 1 | -13/+13 |
| | | | |||||
| * | | reformat for lua and CI | p-mcgowan | 2014-12-02 | 1 | -5/+8 |
| | | | |||||
| * | | formatting and commenting fixes | p-mcgowan | 2014-12-02 | 1 | -4/+4 |
| | | | |||||
| * | | cacti no longer spawn outside of desert variants | p-mcgowan | 2014-12-01 | 1 | -1/+13 |
| |/ | |||||
* | | reformat | p-mcgowan | 2014-12-05 | 1 | -9/+5 |
| | | |||||
* | | restructure, with logic this time | p-mcgowan | 2014-12-05 | 1 | -5/+13 |
| | | |||||
* | | restructured random animals, added check for desert (update as per wiki) | p-mcgowan | 2014-12-05 | 1 | -19/+17 |
| | | |||||
* | | handle non-vanilla dimensions | p-mcgowan | 2014-12-05 | 1 | -2/+2 |
| | | |||||
* | | handle non-vanilla dimensions | p-mcgowan | 2014-12-05 | 1 | -2/+3 |
| | | |||||
* | | formatting fixes | p-mcgowan | 2014-12-05 | 1 | -4/+11 |
| | | |||||
* | | format blocks and randomizing | p-mcgowan | 2014-12-04 | 1 | -8/+9 |
| | | |||||
* | | awful comment fixing, randomizer fix | p-mcgowan | 2014-12-04 | 1 | -11/+24 |
| | | |||||
* | | class description and doxy-commenting | p-mcgowan | 2014-12-03 | 1 | -3/+3 |
| | | |||||
* | | typos and oversights for lua and CI | p-mcgowan | 2014-12-02 | 1 | -1/+5 |
| | | |||||
* | | indentation, repeatable random, small corrections | p-mcgowan | 2014-12-02 | 1 | -98/+93 |
| | | |||||
* | | fix comments after replacing spaces with tabs | p-mcgowan | 2014-12-02 | 1 | -4/+4 |
| | | |||||
* | | animal terrain finisher | p-mcgowan | 2014-12-02 | 1 | -175/+175 |
| | | |||||
* | | animal terrain finisher | p-mcgowan | 2014-12-02 | 1 | -0/+212 |
|/ | |||||
* | Simplefied SoulsandRims | STRWarrior | 2014-12-01 | 1 | -36/+6 |
| | | | | Replaced two for loops with a single if | ||||
* | Added better soulsand rims | STRWarrior | 2014-12-01 | 1 | -0/+82 |
| | | | | As a finisher called SoulsandRims | ||||
* | Hopefully fixed random build fails | STRWarrior | 2014-11-30 | 1 | -1/+1 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into GeneratorShapeRefactor | Mattes D | 2014-11-20 | 1 | -1/+0 |
|\ | |||||
| * | Moved all Noise-related files into a separate folder. | Mattes D | 2014-11-18 | 1 | -1/+0 |
| | | |||||
* | | Snow generator: Fixed failure at top of the world. | Mattes D | 2014-11-15 | 1 | -1/+1 |
|/ | |||||
* | TallGrassGenerator: Fixed crash when too high | STRWarrior | 2014-11-10 | 1 | -0/+5 |
| | |||||
* | Another switch. | Alexander Harkness | 2014-10-27 | 1 | -0/+5 |
| | |||||
* | Fix missing biomes in enum. | Alexander Harkness | 2014-10-27 | 1 | -0/+5 |
| | |||||
* | Merged IniFile into main MCS sources. | Mattes D | 2014-10-23 | 1 | -1/+1 |
| | |||||
* | Added first test to show the object can be created | Tycho | 2014-09-17 | 1 | -0/+1 |
| | |||||
* | Removed an old and outdated comment. | STRWarrior | 2014-08-10 | 1 | -2/+0 |
| | |||||
* | PreSimulator: Added configurations. | STRWarrior | 2014-07-30 | 1 | -4/+18 |
| | | | | You can now choose if it should pregenerate something or not | ||||
* | Merge pull request #1061 from mc-server/portals | Mattes D | 2014-07-29 | 1 | -0/+9 |
|\ | | | | | Portals and others | ||||
| * | Merge branch 'master' into portals | Tiger Wang | 2014-07-29 | 1 | -44/+53 |
| |\ | | | | | | | | | | | | | Conflicts: src/World.h | ||||
| * \ | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-07-22 | 1 | -4/+63 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp | ||||
| * \ \ | Merge branch 'master' into portals | Tiger Wang | 2014-07-18 | 1 | -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 bug | Tiger Wang | 2014-06-04 | 1 | -0/+9 |
| | | | | | |||||
* | | | | | Fixed comment above cFinishGenSingleTopBlock | STRWarrior | 2014-07-29 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Renamed cFinishGenSingleBiomeSingleTopBlock to cFinishGenSingleTopBlock | STRWarrior | 2014-07-28 | 1 | -8/+13 |
| |_|_|/ |/| | | | | | | | | | | | Now accepts a vector of biomes and a vector of allowed blocks. | ||||
* | | | | NetherClumpGenerator: Fixed generating stuff on halfslabs and fences | STRWarrior | 2014-07-27 | 1 | -1/+1 |
| | | | | |||||
* | | | | NetherClumpFoliage: Fixed assert | STRWarrior | 2014-07-27 | 1 | -8/+39 |
| | | | | |||||
* | | | | 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. | ||||
* | | | | Fixed possible crash in the NetherClumpFoliage finisher. | STRWarrior | 2014-07-23 | 1 | -0/+5 |
| |_|/ |/| | | |||||
* | | | Merged branch 'origin/Foliage'. | madmaxoft | 2014-07-21 | 1 | -0/+59 |
|\ \ \ | |||||
| * | | | 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. | ||||
| * | | | Changed CubicNoiseXX to IntNoiseXX | STRWarrior | 2014-07-20 | 1 | -27/+36 |
| | | | | | | | | | | | | | | | | Added some comments | ||||
| * | | | Renamed cFinishGenFoliage to cFinishGenTallGrass | STRWarrior | 2014-07-20 | 1 | -8/+26 |
| | | | | | | | | | | | | | | | | | | | | Better grass density Added double tall grass. | ||||
| * | | | Fixed warnings | STRWarrior | 2014-07-20 | 1 | -2/+1 |
| | | | | |||||
| * | | | First attempt for a new foliage finisher | STRWarrior | 2014-07-20 | 1 | -0/+32 |
| |/ / | |||||
* | / | Style: Normalized to no spaces before closing parenthesis. | madmaxoft | 2014-07-21 | 1 | -4/+4 |
| |/ |/| | |||||
* | | Fixed spaces before commas. | madmaxoft | 2014-07-18 | 1 | -2/+2 |
| | | |||||
* | | Basic style fixes. | madmaxoft | 2014-07-17 | 1 | -2/+2 |
| | | |||||
* | | Normalized comments. | madmaxoft | 2014-07-17 | 1 | -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::XXX | andrew | 2014-03-01 | 1 | -3/+3 |
| | |||||
* | Merged branch 'NetherFinish'. | madmaxoft | 2014-01-18 | 1 | -0/+120 |
|\ | |||||
| * | Fixed errors. | STRWarrior | 2014-01-18 | 1 | -1/+1 |
| | | |||||
| * | Renamed cFinishGenNetherSprinkleFoliage to cFinishGenNetherClumpFoliage. Fixed typo's | STRWarrior | 2014-01-18 | 1 | -6/+6 |
| | | |||||
| * | 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 | 1 | -22/+62 |
| | | |||||
| * | Added cFinishGenNetherSprinkleFoliage. | STRWarrior | 2014-01-10 | 1 | -0/+45 |
| | | |||||
* | | Decoupled cChunkGenerator from cWorld and cRoot. | madmaxoft | 2014-01-10 | 1 | -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. | madmaxoft | 2014-01-07 | 1 | -1/+1 |
| | |||||
* | Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT). | madmaxoft | 2013-12-20 | 1 | -3/+3 |
| | |||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 1 | -0/+664 |