summaryrefslogtreecommitdiffstats
path: root/src/Generating (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Mark UNREACHABLE with intrinsicsTiger Wang2021-02-201-2/+1
|
* Fix debug macro situation (#5114)Tiger Wang2021-01-266-20/+20
| | | Use the standard NDEBUG.
* zlib -> libdeflate (#5085)Tiger Wang2021-01-115-64/+28
| | | | | | + Use libdeflate + Use std::byte * Fix passing temporary to string_view + Emulate make_unique_for_overwrite
* Comment and code style fixTiger Wang2020-12-211-1/+1
| | | | | + Add static keyword - Don't capture everything in lambda
* Fix flower and foliage generation (#4723)mBornand2020-11-143-100/+162
| | | | | | | | | | | | | | | | | | | * fix flower generation - remove wrong mushroom and flower generation + add "tiny" mushrooms in Mushrooms biomes + add "tiny" mushrooms in Mega Taiga and variants + add tulip generation for plains biomes * Turn numbers into constants - Remove duplication of grass generation - Remove fern in inappropriate biomes * added roofed forest flowers to ini file * fixed crash with biMesaPlateuM + Use empty() + Emplace directly + Avoid a string copy in BiomeName + Alias BiomeIndex to avoid multiple casts Co-authored-by: 12xx12 <12xx12100@gmail.com> Co-authored-by: Tiger Wang <ziwei.tiger@outlook.com>
* Remove debug output on PieceStructuresGen.cpp (#4984)12xx122020-10-121-21/+19
| | | | | | - Remove debug output on PieceStructuresGen.cpp - Removed Stopwatch import Co-authored-by: 12xx12 <12xx12100@gmail.com>
* Simple end gen (#4973)NiLSPACE2020-10-112-86/+89
| | | | | | | | | * Fixed current end generator * Implemented new simplified end generation which includes a void between the main island and other islands * Fixed basic style * Hopefully fixed clang errors.
* Adding Silverfish Spawning Blocks (#4946)12xx122020-10-111-8/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * added breaking, spawning, animation * checkstyle * added undocumented API symbols * added changes suggested by @peterbell10 * added natural ore like generation * fixed spawning two silverfishes * fixed clang * fixed clang try 2 * updated comment unified offset * final clang fix * added spawning for more silverfishes if one was damaged * fixed spawning on one hit kill * fixed spawning on one hit kill fixed spawning by potion damage * fixed clang * fixed broken build * fixed broken build * I should read the error message properly fixed build now? * added small changes suggested by @peterbell10 Co-authored-by: 12xx12 <12xx12100@gmail.com>
* Fixed current end generator (#4968)NiLSPACE2020-10-042-44/+2
|
* Deleted BiomeDef.h and ChunkDef.h from Globals.h (#4885)KingCol132020-09-253-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Removed BiomeDef.h * Removed ChunkDef.h from Globals.h * Added to CONTRIBUTORS. * Re-added empty last line to Globals.h * Included stddef and StringUtils in BiomeDef.h * Fixed build tools compiling. It compiles, but at what cost? * Added include to src/Generating/Trees.h * Include added in ChunkGeneratorThread.h * Moved rearranged includes in LineBlockTracer.cpp * Re-arrange headers in ChunkInterface.cpp * Included ChunkDef.h in Path.h * Included ChunkDef.h in NBTChunkSerializer.h * Rearranged included and added required includes to headers. * Removed unnecessary included in StringUtils.h.
* Changing jungle trees a bit (#4823)12xx122020-09-191-12/+28
| | | | | | | | | | | | | | | | | | | | | | * switch range on jungle tree generation and renamed a confusing variable * changed two numbers to match vanilla behaviour * made jungle trees closer to vanilla behaviour - matched variable names to new checkstyle - made branch generation independent from noise at block position * replaced random provider with Noise * implemented changes suggested by peterbell10 * changed the way to determine the size of the leaves on branches Co-authored-by: peterbell10 <peterbell10@live.co.uk> Co-authored-by: 12xx12 <12xx12100@gmail.com> Co-authored-by: peterbell10 <peterbell10@live.co.uk> Co-authored-by: Alexander Harkness <me@bearbin.net>
* Adding Generator For Single Piece Structures (#4830)12xx122020-09-184-0/+275
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * the beginning of a magnificent work - added basic files and classes without functionality * fixed checkstyle * added imports * moved imports * - Adding SinglePieceStructureGen - Adding a cPrefabChestStructure to generate Chests with contents - Added the options and calls to the ComposableGenerator * moved Globals to .h file * removed the chest thingy from the code (for now) * Update SinglePieceStructureGen.cpp * readded whitespace * renamed to SinglePieceStructuresGen for consistency added new classes to test * fixed small things (mostly style and cleanup) removed loottables * added small changes suggested by madmaxoft * small change to documentation * added check for allowed biomes * check only the biome of the origin position * fixed error on IsBiomeAllowed * added new cubesets * updated structures for with sponging * updated biome names * updated metadata to prevent crashing removed debug output * updated structures with sponging * added sponging to deserterWell to make it disappear in sand * small change in meta * rename DesertTemple -> DesertPyramid * minor style changes Co-authored-by: 12xx12 <12xx12100@gmail.com> Co-authored-by: Alexander Harkness <me@bearbin.net>
* Minor typo fixesTiger Wang2020-08-211-16/+18
| | | | * Also DeMorgan'd Emerald ore condition
* Add enhanced Gold generation in Mesa-Type Biomes (#4821)12xx122020-08-121-0/+21
| | | | | | | | | * added enhanced gold generation in mesa-type-biomes * fixed typo in comment * added enhanced gold generation in mesa biomes - fixed small checkstyle errors Co-authored-by: 12xx12 <12xx12100@gmail.com>
* Update FinishGen.cpp12xx122020-08-101-1/+0
|
* small issues addressed in #4817 fixed because was merged to fast12xx122020-08-101-9/+1
|
* Adding Emeralds to generation (#4817)12xx122020-08-091-1/+29
| | | | | | | | | | | | | * Adding Emeralds to generation * fixed crash * fixed documentation and changed function name to match others * forgot to change the name in the doc * removed debug output - sorry build servers Co-authored-by: 12xx12 <12xx12100@gmail.com>
* Fix big tree ring radius calculations. Ring radius now stays within range.Alexander Harkness2020-08-051-2/+2
|
* edit commentmBornand2020-08-051-1/+1
|
* update commentmBornand2020-08-051-1/+1
|
* correct errormBornand2020-08-051-3/+1
|
* correct errormBornand2020-08-051-1/+3
|
* error in comment endmBornand2020-08-051-1/+1
|
* add Large conifersmBornand2020-08-053-18/+288
|
* Replaced cpp14::make_unique<> with std::make_unique<>.Mattes D2020-08-012-3/+3
|
* Precompile unordered_map/setTiger Wang2020-07-191-1/+0
| | | | | | + Add inclusions to Globals.h * Sort Globals.h - Remove sys/stat.h from Globals.h
* Upgrade to C++17 [CMake] (#4717)Tiger Wang2020-05-162-8/+4
| | | * Make our CMake slightly less insane
* Enable some more clang-tidy linter checks (#4738)peterbell102020-05-1525-71/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Avoid inefficient AString -> c_str() -> AString round trip * Avoid redundant string init expressions * Avoid unnecessary return, continue, etc. * Add .clang-format to help with clang-tidy fix-its * Avoid unnecessary passing by value * Avoid unnecessary local copying * Avoid copying in range-for loops * Avoid over-complicated boolean expressions * Some violations missed by my local clang-tidy * Allow unnecessary continue statements * Add brackets * Another expression missed locally * Move BindingsProcessor call into clang-tidy.sh and add space * Fix pushd not found error * Different grouping of CheckBlockInteractionRate
* Cleanup some workarounds and warnings (#4735)peterbell102020-05-102-49/+23
| | | | | | | | | * Cleanup thread_local usage in FastRandom * Use constexpr to avoid clang warning * Fix more Wglobal-constructor warnings * Make MSVC happy?
* Enable C++17 in buildPeter Bell2020-05-091-2/+2
|
* Add tree generation for ExtemeHills and other biomes (#4713)mBornand2020-05-063-97/+131
|
* Fix one definition rule violationsTiger Wang2020-05-042-59/+65
|
* Using Super.Mattes D2020-04-1626-309/+394
|
* Manage block entity lifetime with unique_ptr (#4080)peterbell102020-04-031-4/+4
|
* Pulled the BlockID and BlockInfo headers from Globals.h. (#4591)Mattes D2020-04-039-0/+9
| | | | | | | | | The BlockID.h file was removed from Globals.h and renamed to BlockType.h (main change) The BlockInfo.h file was removed from Globals.h (main change) The ENUM_BLOCK_ID and ENUM_ITEM_ID enum names were replaced with ENUM_BLOCK_TYPE and ENUM_ITEM_TYPE (cosmetics) The various enums, such as eDimension, eDamageType and eExplosionSource were moved from BlockType.h to Defines.h, together with the helper functions for converting between them and strings (StringToDimension et al.) (minor) Many inline functions were moved from headers to their respective cpp files, so that BlockType.h could be included only into the cpp file, rather than the header. That broke our tests a bit, since they pick bits and pieces out of the main code and provide stubs for the rest; they had to be re-stubbed and re-verified. eMonsterType values are no longer tied to E_ITEM_SPAWN_EGG_META_* values
* Improved large jungle and acacia tree generation (#4413)NiLSPACE2019-12-223-288/+340
|
* Refactored more of Entities and BlockEntities to use Vector3. (#4403)Mattes D2019-09-291-1/+1
|
* Fixed MSVC warnings (#4400)Mattes D2019-09-271-1/+1
|
* ChunkGenerator: Changed to use cChunkCoords.Mattes D2019-09-086-26/+21
|
* ShapeGen, HeiGen: Changed to use cChunkCoords.Mattes D2019-09-0818-188/+146
|
* BiomeGen: Changed to use cChunkCoords params.Mattes D2019-09-0810-87/+77
|
* Generator: Added repeatability test.Mattes D2019-09-071-0/+4
|
* CompoGenNether: Fixed different data produced in Linux Release builds.Mattes D2019-09-071-20/+12
|
* Added a BasicGeneratorTest.Mattes D2019-09-062-8/+8
|
* Moved the generator defaults to ComposableGenerator.Mattes D2019-09-067-44/+171
|
* Separated chunk generator from world / plugin interfaces.Mattes D2019-09-0613-607/+113
| | | | The generator now only takes care of servicing synchronous "GetChunk(X, Y)" and "GetBiomes(X, Y)" requests.
* Fix building with clang 8.0 (#4346)Bond-0092019-08-113-12/+18
|
* Removed coord-based API from cCuboid. (#4362)Mattes D2019-08-091-19/+19
|
* Add a formatting function for Vector3 (#4282)peterbell102018-09-243-13/+14
| | | | | | | | | | * Vector3: Add custom fmt compatible formatter. * cLuaState: Add fmt version of ApiParamError * Use vector formatting in manual bindings * Always log vectors with FLOG
* Force all headers other than "Globals.h" to be included with relative paths (#4269)peterbell102018-08-294-8/+5
| | | | | | | Closes #4236 CMake now creates a header file in the build directory under the path "include/Globals.h" which just includes "src/Globals.h" with an absolute path. Then instead of adding "src/" to the include directories, it adds "include/". #include "Globals.h" still works by including the build generated file and any other src-relative path will not work.
* CheckBasicStyle: Check number of empty lines between functions (#4267)peterbell102018-07-2615-17/+6
| | | | Add check for number of empty lines between functions and fix the corresponding failures
* cIsThread: Reset m_ShouldTerminate after the thread has stopped (#4258)peterbell102018-07-221-1/+1
| | | | | This allows threads to be restarted after stopping. Fixes #4257
* Generate cacti and sugarcane with different heights (#4137)Cocosushi62018-05-033-30/+97
| | | | | When generating foliage, create cacti with height in the interval [1; MaxCactusHeight] and sugarcane with height in [1; MaxSugarcaneHeight] (with MaxCactusHeight and MaxSugarcaneHeight declared in world.ini) Fixes #4135
* Prefer static_cast to reinterpret_cast (#4223)peterbell102018-05-021-2/+2
| | | | | | | * Change reinterpret_cast -> static_cast wherever possible * Remove more unnecessary `const_cast`s. reinterpret_casts should be avoided for the same reason as c-style casts - they don't do any type-checking. reinterpret_cast was mainly being used for down-casting in inheritance hierarchies but static_cast works just as well while also making sure that there is actually an inheritance relationship there.
* Removed duplicate code (#4198)Bond-0092018-04-111-80/+7
| | | Should also fix dogs not despawning
* Wolves only spawn in taiga biomes (#4197)Bond-0092018-03-201-2/+1
| | | Ref: https://minecraft.gamepedia.com/Wolf#Spawning
* Deal with covered switches consistently (#4161)peterbell102018-02-053-44/+27
| | | | | | | * Fixes a number of "<function>: not all control paths return a value" warnings on MSVC. * Introduces the UNREACHABLE global macro and uses it instead of conditionally compiled switch defaults. * Move cNBTParseErrorCategory from FastNBT.h into FastNBT.cpp to prevent bad calls to message()
* Add the fmt library (#4065)peterbell102018-01-034-5/+5
| | | | | | | * Replaces AppendVPrintf with fmt::sprintf * fmt::ArgList now used as a type safe alternative to varargs. * Removed SIZE_T_FMT compatibility macros. fmt::sprintf is fully portable and supports %zu. * Adds FLOG functions to log with fmt's native formatting style.
* cWorld: Move Initialization from Start to the constructor.peterbell102017-10-212-5/+6
| | | | Start now does nothing more than launch the world's threads.
* cFinishGenPreSimulator: Preserve sand meta (#4025)peterbell102017-09-182-13/+8
| | | Fixes #1516.
* Fix switch warnings (#4013)peterbell102017-09-143-66/+84
| | | | | | | | | | | | | | | * Fix switch warnings * Fix a variety of -Wswitch and -Wswitch-enum warnings * Remove unneeded -Wno-error flags * Reorganise some eMonsterType switches * Alpha sort eMonsterType cases in WriteMobMetadata and in cNBTChunkSerializer::AddMonsterEntity * List all mob types in protocol 1.12 and NBTChunkSerializer * cStructGenTrees::GetNumTrees: remove switch default * cWSSAnvil::LoadOldMinecartFromNBT: Log unhandled minecart type
* Merge pull request #3489 from cuberite/EntityOwnershipTiger Wang2017-08-183-3/+4
|\ | | | | * Changed entity ownership model to use smart pointers
| * Changed entity ownership model to use smart pointersTiger Wang2017-08-073-3/+4
| |
* | Changed int parameters to vector parameters in cCuboid and simulators (#3874)Lane Kolbly2017-08-172-3/+6
|/
* Removed unneeded includes (#3902)Lukas Pioch2017-08-062-2/+0
|
* Remove double includes part 2 (#3890)peterbell102017-08-0311-11/+0
|
* Removed double includes (#3885)Lukas Pioch2017-08-022-3/+0
|
* Remove smart pointer macrospeterbell102017-07-2111-16/+16
|
* BigFlower fixes (#3826)peterbell102017-07-071-2/+2
| | | | | | | * BigFlowers fixes * Correct upper part meta * Documented parameters to DoesIgnoreBuildCollision
* Generated tall flowers have flower type meta in both blockspeterbell102017-06-191-2/+2
|
* Remove redundant heighmap codepeterbell102017-06-143-41/+2
|
* FastRandom rewrite (#3754)peterbell102017-06-132-4/+3
|
* Store cChunk::m_BlockEntities in a map (#3717)peterbell102017-05-222-16/+20
| | | | | | * Store block entities in a map from block index * Cleanup ForEachBlockEntity * Cleanup DoWithBlockEntityAt
* Clang 5.0 fixesLukas Pioch2017-05-2116-19/+10
| | | | | - Added override keyword - Removed inherited member variables
* Gen: Moved PiecePool into a separate file.Mattes D2017-05-0415-628/+627
| | | | Also rewritten the PieceGenerator to use std::unique_ptr.
* Finishers now update the heightmap for tall flowers. (#3545)Jacob2017-02-241-0/+7
|
* Dead bushes will generate in mega mega taigas (#3571)Bond-0092017-02-151-0/+1
|
* Added some blocks and items (#3503)mathiascode2017-02-141-0/+7
|
* PieceGenerator: Added rotation-aware vertical connectors.Mattes D2017-02-137-44/+348
|
* Removed asserts about chunk queued.Mattes D2017-01-191-1/+0
| | | | The assumption is not needed and was invalid under a stress-test.
* Moved cPrefab parser self-check to the LoadablePieces test. (#3536)Mattes D2017-01-151-105/+0
|
* Fixed race conditions and forgotten clear in Lua ref tracking. (#3530)Mattes D2017-01-131-0/+1
| | | This fixes occasional crashes on plugin reload.
* Fix floating large trees (#3460)James Balajan2016-12-021-0/+18
|
* Fixed villages generating under-water.Mattes D2016-12-012-4/+10
| | | | The CompoGenBiomal didn't update the heightmap properly.
* Prefabs: Implemented support for ExpandFloorStrategy.Mattes D2016-11-243-54/+142
|
* Use cChunkDef::Height for Y coord comparison where applicable.Moritz Borcherding2016-09-271-2/+2
|
* Fixed type-casting-related warnings.Mattes D2016-08-242-11/+5
|
* Implemented OverworldClumpFlowersNiLSPACE2016-08-143-0/+283
|
* CMake: Remove needless minimum version specifications.Mattes D2016-07-181-2/+0
|
* LuaAPI: Fixed bindings for cChunkDesc:GetBlockTypeMetaMattes D2016-07-182-2/+7
|
* SelfTests: Removed the unneeded cSelfTests class.Mattes D2016-06-182-2/+0
|
* Normalized Vector3 API to use the same capitalization as all else.Mattes D2016-06-101-2/+2
|
* Reduced unnecessary block updatesLogicParrot2016-04-225-23/+27
|
* Fixed misuse of comma.Lukas Pioch2016-03-182-5/+5
|
* Made ProtIntGen's max size compile-time-configurable.Mattes D2016-02-241-1/+13
|
* Fixed includes in IntGen.Mattes D2016-02-241-2/+2
|
* Bulk clearing of whitespaceLogicParrot2016-02-0540-606/+606
|
* Updated old forum linksMathias2016-01-311-1/+1
|
* Renamed leftover strings to Cuberite / Server, as needed.Mattes D2016-01-011-1/+1
| | | | Also upgraded the user setting file for MSVC to 2013.
* Added HTTPS links wherever they are supported.Alexander Harkness2015-12-191-10/+6
|
* PieceStructures generator: Fixed wrong merge conflict resolution.Mattes D2015-12-172-5/+5
| | | | | Also improved reporting messages. Ref.: http://forum.mc-server.org/showthread.php?tid=2256
* Moved variables into scope, removed unused variables and fixed variablesLukas Pioch2015-12-171-2/+2
|
* Fixed opposite condition in OreNests finisher.Mattes D2015-12-091-2/+2
|
* Added more details to the cubeset format documentation.Mattes D2015-12-011-2/+2
|
* Added PieceStructures generator.Mattes D2015-12-0140-11812/+1777
|
* 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-253-26/+126
|
* Added OrePockets and DirtPockets finish gens.Mattes D2015-11-255-267/+548
|
* Generator: Fixed missing hitbox assignment.Mattes D2015-10-052-0/+4
| | | | This had caused village houses to generate too close to each other.
* Fixed a race condition between chunk loader and generator.Mattes D2015-10-041-6/+6
| | | | | | When using ChunkWorx to generate multiple chunks, the server would sometimes fail an assert because it would generate a chunk even when it was successfully loaded. This was caused by chunks queued in cWorld's m_SetChunkDataQueue and thus being marked as "InQueue" although they were already loaded. Solved by adding a new parameter to chunk coord callbacks specifying whether the operation succeeded or failed, and using that instead of the chunk presence flag to decide whether to generate or not.
* Fix clang compile errorTheo Tosini2015-08-241-1/+1
| | | | Clang would previously fail on debug builds due to the use of an old-style cast.
* Fix old style casts and implicit conversionsMatti Hänninen2015-08-128-110/+116
|
* Unified the doxy-comment format.Mattes D2015-07-3117-106/+98
|
* Silenced and fixed many warning messages across multiple files.Samuel Barney2015-07-295-35/+29
|
* Added documentation for GetLargeTreeAdjustmentSamuel Barney2015-07-171-0/+1
|
* Merge pull request #2350 from SamJBarney/PeonySnowFixJulian Laubstein2015-07-151-1/+7
|\ | | | | Fixed Tall Grass placement
| * Fixed tall grass trying to be placed in cold biomes.Samuel Barney2015-07-151-1/+7
| |
* | Merge pull request #2346 from SamJBarney/TreeGrowthUpdateJulian Laubstein2015-07-142-5/+95
|\ \ | | | | | | Sapling Growth Update
| * | Sapling Growth UpdateSamuel Barney2015-07-132-5/+95
| |/ | | | | | | | | | | | | | | | | * Growth has been slowed down * Saplings do not grow if they do not have enough space to grow * Saplings do not grow unless the light level is 9 or above * Dark Oak doesn't grow unless it is in a 2x2 Jungle Trees now will grow into a large tree when 2x2 saplings are used.
* / Switched from using std::max(std::min()) to using ClampSamuel Barney2015-07-131-2/+2
|/
* Fixed misplaced parensSamuel Barney2015-07-091-2/+2
|
* Fixes compilation failures on MacOSX 10.10Samuel Barney2015-07-092-44/+44
| | | | | * Replace old c-style casts with c++ casts * Added `-Wno-error=old-style-cast` to Protocol18x.cpp
* Fixed warnings generated by 64-bit MSVC.Mattes D2015-07-075-22/+22
|
* Generate biomes when pregenerating heights through CompositedHeiGen.Mattes D2015-06-232-3/+6
| | | | Fixes #2283.
* Added basic support for loading village prefabs from files.Mattes D2015-06-2016-17243/+237
|
* Externalized cPrefabPiecePool self-test.Mattes D2015-06-192-28/+3
|
* PrefabPiecePool: Added loading from cubeset file.Mattes D2015-06-184-3/+589
|
* Updated prefabs from the Gallery server.Mattes D2015-06-136-488/+465
|
* SelfTests are registered and executed after logging framework init.Mattes D2015-06-111-3/+9
| | | | Fixes #2228.
* Fixed warnings in MSVC.Mattes D2015-06-021-0/+7
| | | | It complained about undefined return values or using uninitialized variables.
* 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
* Fix commentstycho2015-05-281-1/+1
|
* Merge branch 'master' into PreventNewWarningstycho2015-05-241-1/+1
|\
| * Wolves don't spawn in rivers.Alexander Harkness2015-05-241-1/+1
| |
| * Merge pull request #2107 from mc-server/cow-waterspawnSafwat Halaby2015-05-231-1/+1
| |\ | | | | | | Cows no longer spawn over water.
| | * Cows and rabbits no longer spawn over water.Alexander Harkness2015-05-231-1/+1
| | | | | | | | | | | | Fixes #2080
* | | Fix commentstycho2015-05-244-58/+58
| | |
* | | Made -Weverything an error.tycho2015-05-2416-45/+55
| | |
* | | Merge branch 'master' into PreventNewWarningstycho2015-05-232-3/+3
|\| |
| * | Fixed missing overrides and added a ignore flag for reserved macro for clang version 3.6 and higher.Lukas Pioch2015-05-232-3/+3
| |/
* | Fix teststycho2015-05-231-0/+2
| |
* | Merge branch 'master' into PreventNewWarningstycho2015-05-191-0/+1
|\|
| * Fix the health of animalsLukas Pioch2015-05-181-0/+1
| |
* | Make -Werror disabling file onlytycho2015-05-191-0/+14
| | | | | | | | Ad fix a load of warnings
* | Fixed some more warningstycho2015-05-193-36/+36
| |
* | More fixed warningstycho2015-05-196-28/+40
| |
* | Fixed compile and a few more warningstycho2015-05-191-1/+6
| |
* | Fixed a lot of warningstycho2015-05-1911-210/+196
|/
* CheckBasicStyle: checks spaces around * and &.Mattes D2015-05-091-1/+1
|
* More style checking.Mattes D2015-05-0918-24/+24
| | | | Spaces around some operators are checked.
* Merge pull request #1879 from mc-server/DynamicThresholdMattes D2015-04-212-7/+6
|\ | | | | Changed Nether composition to change the threshold from a cubic noise
| * Changed default MaxThreshold valueSTRWarrior2015-04-211-1/+1
| | | | | | | | There is now really a difference between open and dense parts
| * Calculate threshold for each column in a chunk instead for the whole chunkSTRWarrior2015-04-211-2/+1
| |
| * Changed Nether composition to change the threshold from a cubic noiseSTRWarrior2015-04-202-7/+7
| |
* | Fixed typo in NetherForts initializationSTRWarrior2015-04-191-1/+1
|/ | | | The S in NetherForts was missing
* GlowStone: Changed order of initialization of member variablesSTRWarrior2015-04-191-2/+2
|
* Fixed styleSTRWarrior2015-04-191-2/+2
|
* Added GlowStone finisherSTRWarrior2015-04-193-1/+139
|
* Merge pull request #1775 from tommysanterre/terrainheightfixMattes D2015-03-232-2/+2
|\ | | | | Correct all world height validations.
| * Correct world height validations.Tommy Santerre2015-03-202-2/+2
| | | | | | | | | | 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
* | Merge pull request #1786 from mc-server/pipelineSyntaxworktycho2015-03-212-19/+85
|\ \ | |/ |/| Added pipelining syntax for generators
| * Style fixesworktycho2015-03-211-15/+15
| |
| * Changed pipeline character from >> to |tycho2015-03-112-15/+15
| |
| * Fixed style and removed false positivestycho2015-03-111-4/+9
| | | | | | | | Relaxed the rules for < followed by an && and removed rule for < following an &&
| * Fixed Sequence Generator for IntGenTycho2015-03-102-12/+24
| |
| * Fixed StyleTycho2015-03-012-13/+15
| | | | | | | | Still fails CheckBasicStyle.lua dua to issue with rvalue references and templates
| * Added pipelining syntax for generatorsTycho2015-03-012-16/+63
| |
* | Added parenthesis around the comparisonsSTRWarrior2015-03-081-2/+2
| |
* | Added proper trees to Mesa biomesSTRWarrior2015-03-081-6/+10
| | | | | | | | Mesa only has small apple trees.
* | Added grass/course dirt layer on MesaPlateauF(M)STRWarrior2015-03-081-0/+14
| |
* | Merge pull request #1784 from mc-server/SteppyHeiGenTiger Wang2015-03-063-1/+409
|\ \ | | | | | | Added Steppy height generator.
| * | Steppy HeiGen: Fixed Linux compilation.Mattes D2015-03-011-1/+1
| | |
| * | Added Steppy height generator.Mattes D2015-03-013-1/+409
| |/
* | Removed trailing whitespaceSTRWarrior2015-03-011-1/+1
| |
* | Replaced IntNoiseXX with IntNoiseXXIntSTRWarrior2015-03-011-2/+2
| |
* | Replaced cFinishGenPtr with std::make_sharedSTRWarrior2015-03-011-1/+1
| |
* | Made the minimum vine level configurableSTRWarrior2015-02-283-4/+7
| |
* | Implemented a vines finisher that creates vines in jungle biomesSTRWarrior2015-02-283-0/+119
|/
* Ice finisher uses GetSnowStartHeight instead of specific biomesSTRWarrior2015-02-251-26/+19
|
* Snow finisher uses GetSnowStartHeight instead of specific biomesSTRWarrior2015-02-251-22/+14
|
* Replaced atoi() with StringToInteger().Mattes D2015-01-271-2/+1
|
* Fixed defect #43665 in Coverity list.Kirill Kirilenko2015-01-231-0/+11
|
* Fixed defect #73101 in Coverity list.Kirill Kirilenko2015-01-231-1/+13
|
* Fixed defect #43671 in Coverity list.Kirill Kirilenko2015-01-231-0/+4
|
* Refactored all player block placing to go through hooks.Mattes D2014-12-242-14/+14
| | | | Fixes #1618.
* cEndGen: Fixed unitialized member variables.Mattes D2014-12-211-1/+3
| | | | Fixes CID 43671.
* cNoise3DComposable: Fixed unitialized member variables.Mattes D2014-12-211-1/+3
| | | | Fixes CID 43665.
* WormNestCaves occasionally generates sandstone around the caveSTRWarrior2014-12-131-3/+22
| | | | Only when the block around the cave is sand.
* Merge pull request #1657 from mc-server/PrepareChunkMattes D2014-12-112-31/+63
|\ | | | | Prepare chunk
| * Added a cWorld:PrepareChunk function.Mattes D2014-12-102-31/+63
| | | | | | | | | | It prepares the chunk - loads or generates it and lights it. The spawn prepare process uses this function.
* | Fixed DungeonRooms edges not generating sometimes.Mattes D2014-12-111-2/+2
|/
* Merge pull request #1555 from mc-server/c++11Mattes D2014-12-072-2/+1
|\ | | | | C++11
| * Merge remote-tracking branch 'origin/master' into c++11Tiger Wang2014-12-064-5/+302
| |\ | | | | | | | | | | | | Conflicts: src/OSSupport/Thread.cpp
| * \ Merged branch 'origin/master' into c++11.Mattes D2014-12-0410-46/+139
| |\ \
| * | | Merge remote-tracking branch 'origin-master' into c++11Tiger Wang2014-11-2627-1514/+1554
| | | |
| * | | Removed unnecessary #includesTiger Wang2014-11-231-1/+0
| | | |
| * | | Merge remote-tracking branch 'origin/master' into c++11Tiger Wang2014-11-2325-237/+4125
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Noise/Noise.h src/World.h
| * \ \ \ Merged branch 'master' into c++11.Mattes D2014-10-2411-11/+11
| |\ \ \ \
| * \ \ \ \ Merged branch 'master' into c++11.Mattes D2014-10-231-3/+3
| |\ \ \ \ \
| * | | | | | En masse NULL -> nullptr replaceTiger Wang2014-10-2014-44/+44
| | | | | | |
| * | | | | | Merge branch 'master' of https://github.com/mc-server/MCServerTiger Wang2014-10-2019-196/+168
| |\ \ \ \ \ \
| * | | | | | | Migrated random generators to std::randomTiger Wang2014-10-191-1/+1
| | | | | | | |
* | | | | | | | Reduced river heightSTRWarrior2014-12-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rivers would exceed the water height quite often
* | | | | | | | 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-052-30/+33
| | | | | | |
* | | | | | | formatting and default spawn percentagep-mcgowan2014-12-051-1/+2
| | | | | | |
* | | | | | | Merge branch 'master' of github.com:p-mcgowan/MCServer into animalTerrainFinisherp-mcgowan2014-12-054-30/+75
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | update
| * | | | | | | BasicStyle: Added missing braces to control statements.Mattes D2014-12-051-2/+8
| | | | | | | |
| * | | | | | | conflict resolutionp-mcgowan2014-12-043-27/+48
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | clearing CheckBasicStyle.lua messagesp-mcgowan2014-12-032-28/+28
| | | | | | | |
| | * | | | | | Merge pull request #1634 from mc-server/DungeonSpawnersMattes D2014-12-021-1/+22
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Dungeons spawners now spawn mobs
| | | * | | | | | Fixed forgotten semicolonSTRWarrior2014-12-021-1/+1
| | | | | | | | |
| | | * | | | | | Using IntNoise3DInt instead of IntNoise3DSTRWarrior2014-12-021-1/+1
| | | | | | | | |
| | | * | | | | | Suggestions by xoftSTRWarrior2014-12-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using IntNoise3D to prevent needless floating point math
| | | * | | | | | Using static cast for Dungeon spawnersSTRWarrior2014-12-011-1/+1
| | | | | | | | |
| | | * | | | | | Dungeons spawners now spawn mobsSTRWarrior2014-12-011-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 25% for a spider, 25% for a skeleton and 50% for a zombie spawner.
| * | | | | | | | reformat for lua and CIp-mcgowan2014-12-022-6/+9
| | | | | | | | |
| * | | | | | | | formatting and commenting fixesp-mcgowan2014-12-022-6/+6
| | | | | | | | |
| * | | | | | | | cacti no longer spawn outside of desert variantsp-mcgowan2014-12-012-1/+16
| |/ / / / / / /
* | | | | | | | 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-042-9/+9
| | | | | | | |
* | | | | | | | last doxy fixp-mcgowan2014-12-041-3/+3
| | | | | | | |
* | | | | | | | awful comment fixing, randomizer fixp-mcgowan2014-12-042-19/+32
| | | | | | | |
* | | | | | | | class description and doxy-commentingp-mcgowan2014-12-032-5/+8
| | | | | | | |
* | | | | | | | doxy-commentingp-mcgowan2014-12-031-3/+3
| | | | | | | |
* | | | | | | | forgot initializerp-mcgowan2014-12-031-1/+5
| | | | | | | |
* | | | | | | | typos and oversights for lua and CIp-mcgowan2014-12-021-1/+5
| | | | | | | |
* | | | | | | | fastRandom unusedp-mcgowan2014-12-021-1/+0
| | | | | | | |
* | | | | | | | 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-022-187/+187
| | | | | | | |
* | | | | | | | animal terrain finisherp-mcgowan2014-12-022-0/+241
|/ / / / / / /
* | | | | | | Using static cast for MineShaft spawnersSTRWarrior2014-12-011-1/+1
| | | | | | |
* | | | | | | Mineshaft spawners now spawn cave spidersSTRWarrior2014-12-011-1/+4
|/ / / / / /
* | | | | | Simplefied SoulsandRimsSTRWarrior2014-12-011-36/+6
| | | | | | | | | | | | | | | | | | | | | | | | Replaced two for loops with a single if
* | | | | | Added better soulsand rimsSTRWarrior2014-12-014-11/+106
| | | | | | | | | | | | | | | | | | | | | | | | As a finisher called SoulsandRims
* | | | | | DistortedHeightmap: Added missing initialization.Mattes D2014-12-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was probably the original cause for the "empty chunks". Fixes #1433.
* | | | | | Noise3D: Fixed missing initialization.Mattes D2014-12-011-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should fix terrain being at Y=0 or Y=255 for the spawn chunk. Fixes #1433.
* | | | | | Hopefully fixed random build failsSTRWarrior2014-11-301-1/+1
| | | | | |
* | | | | | Fixed nether ceilingSTRWarrior2014-11-301-1/+1
| | | | | |
* | | | | | CompoGenBiomal: Fixed signed vs unsigned comparison.Mattes D2014-11-271-1/+1
| | | | | |
* | | | | | Fixed BlockStringToType return value.Mattes D2014-11-271-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | -1 was not a valid BLOCKTYPE and would not be recognized by the callers, ever.
* | | | | | Added TwoHeights shape generator.Mattes D2014-11-235-8/+162
| | | | | | | | | | | | | | | | | | | | | | | | This is a faster shape generator that can generate overhangs and has biome awareness.
* | | | | | Noise3D generator: Enlarged averaging to avoid steep beach slopes.Mattes D2014-11-232-4/+4
| | | | | |
* | | | | | Merge remote-tracking branch 'origin/master' into GeneratorShapeRefactorMattes D2014-11-232-2/+110
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge pull request #1594 from mc-server/LargeOakTreeMattes D2014-11-202-2/+110
| |\ \ \ \ \ | | | | | | | | | | | | | | Large Oak Tree
| | * | | | | Changed commentSTRWarrior2014-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Suggestion by xoft
| | * | | | | First implementation for the LargeOakTreeSTRWarrior2014-11-132-2/+110
| | | | | | |
* | | | | | | BiomalNoise3D generator: finished all biomes.Mattes D2014-11-201-66/+74
| | | | | | |
* | | | | | | CompoGenBiomal: Fixed sealevel offset.Mattes D2014-11-201-1/+1
| | | | | | |
* | | | | | | CompoGenBiomal: Fixed sealevel not generating properly.Mattes D2014-11-201-1/+2
| | | | | | |
* | | | | | | Generators: Unified SeaLevel into a single variable.Mattes D2014-11-203-70/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It is shared between shape generators and composition generators and there's no sense in having two different values for those.
* | | | | | | Noise3D generators: Changed noise generator to InterpolNoise.Mattes D2014-11-202-10/+10
| | | | | | |
* | | | | | | Merge remote-tracking branch 'origin/master' into GeneratorShapeRefactorMattes D2014-11-2017-59/+180
|\| | | | | |
| * | | | | | cInterpolNoise: Implemented optimized 2D generating.Mattes D2014-11-192-8/+56
| | | | | | |
| * | | | | | Added a cInterpolNoise template for faster noise generator.Mattes D2014-11-182-4/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Used an instance of it in the Noise3D generator.
| * | | | | | Moved all Noise-related files into a separate folder.Mattes D2014-11-1816-16/+11
| | | | | | |
| * | | | | | Added cImprovedNoise implementation.Mattes D2014-11-172-36/+7
| | | | | | |
| * | | | | | BiomalNoise3D: Added more biomes.Mattes D2014-11-161-13/+65
| | | | | | |
| * | | | | | Noise3D: Added jungles.Mattes D2014-11-141-0/+2
| | | | | | |
| * | | | | | Noise3D: Added oceans.Mattes D2014-11-131-0/+3
| |/ / / / /
* | | | | | Generator: Fixed crash with trees too high.Mattes D2014-11-151-2/+7
| | | | | |
* | | | | | Snow generator: Fixed failure at top of the world.Mattes D2014-11-151-1/+1
| | | | | |
* | | | | | ChunkDesc: Fixed comment about indexing.Mattes D2014-11-151-1/+1
| | | | | |
* | | | | | DungeonRooms: Changed to work with the new shape generators.Mattes D2014-11-151-10/+15
| | | | | |
* | | | | | Gen refactor: Implemented CompositedHeiGen.Mattes D2014-11-139-217/+141
| | | | | | | | | | | | | | | | | | | | | | | | This fixes crashes in the Village generator due to the missing generator.
* | | | | | Generator: Shape initial refactoring.Mattes D2014-11-1223-1346/+1356
|/ / / / / | | | | | | | | | | | | | | | The code compiles, but several structure generators are broken, crash on start.
* | | | | BiomalNoise3D: Added a few biomes.Mattes D2014-11-101-5/+8
| | | | |
* | | | | TallGrassGenerator: Fixed crash when too highSTRWarrior2014-11-101-0/+5
| | | | |
* | | | | Added BiomalNoise3D shape generator.Mattes D2014-11-104-29/+369
| | | | |
* | | | | Noise3d Generator: Fixed unused function error.Mattes D2014-11-091-1/+1
| | | | |
* | | | | Noise3D generator: rewritten from scratch.Mattes D2014-11-092-78/+145
| | | | | | | | | | | | | | | | | | | | Now it uses three 3D and one 2D perlin noises to generate the terrain, and is highly parametrizable.
* | | | | Noise3D CompoGen: Fixed missing initialization.Mattes D2014-11-061-0/+2
| | | | |
* | | | | MinMax heigen: Reduced the number of octaves.Mattes D2014-11-041-2/+0
| | | | | | | | | | | | | | | | | | | | They didn't affect the terrain that much anyway.
* | | | | Added MinMax height generator.Mattes D2014-11-041-0/+207
| | | | | | | | | | | | | | | | | | | | Fixes #1578.
* | | | | Fixed a missing endline.Mattes D2014-11-031-1/+5
| | | | |
* | | | | Added a (disabled) perf test for biome generators.Mattes D2014-11-031-0/+46
| | | | |
* | | | | HeiGen: Moved construction to the end of file.Mattes D2014-11-031-75/+75
| | | | | | | | | | | | | | | | | | | | This will allow us to define generators in the cpp file instead of needing them in the header, thus speeding up compilation on changes.
* | | | | Grown biomes: fixed Linux build.Mattes D2014-11-021-3/+3
| | | | |
* | | | | Grown biomes: Unified with GrownProt biomes.Mattes D2014-11-023-159/+595
| | | | | | | | | | | | | | | | | | | | Also fixed a Zoom filter randomness.
* | | | | GrownProt: Added the rest of rare and M biomes.Mattes D2014-11-012-14/+91
| | | | |
* | | | | GrownProt biome gen: Added biome edges.Mattes D2014-11-012-2/+162
| | | | |
* | | | | GrownProt biomes: added alterations.Mattes D2014-10-313-130/+192
| | | | |
* | | | | QtBiomeVisualiser: Added a prototyping int generator flavor.Mattes D2014-10-304-53/+1253
| | | | | | | | | | | | | | | | | | | | This generator is easier to manipulate, since it doesn't require rewriting the sizes in the template parameters. On the other hand, it doesn't optimize so well, so it's a bit slower.
* | | | | Grown biomes: made biomes smaller, made beaches smaller.Mattes D2014-10-291-11/+8
| | | | |
* | | | | Merged branch 'master' into GrownBiomes.Mattes D2014-10-283-28/+38
|\ \ \ \ \
| * | | | | Comment alignment.Alexander Harkness2014-10-272-8/+8
| | | | | |
| * | | | | CheckBasicStyle'dAlexander Harkness2014-10-272-28/+28
| | | | | |
| * | | | | Fixed more warnings.Alexander Harkness2014-10-271-14/+14
| | | | | | | | | | | | | | | | | | It's ugly though.
| * | | | | Another switch.Alexander Harkness2014-10-271-0/+5
| | | | | |
| * | | | | Fix missing biomes in enum.Alexander Harkness2014-10-271-0/+5
| | | | | |
| * | | | | Fixed remaining warnings.Alexander Harkness2014-10-271-5/+5
| | | | | |
| * | | | | Actually fixed the warning.Alexander Harkness2014-10-271-20/+9
| | | | | |
| * | | | | Test warning fix.Alexander Harkness2014-10-271-0/+11
| | |_|_|/ | |/| | |
* | | | | cIntGen: Added a virtual destructor.Mattes D2014-10-271-0/+4
| | | | |
* | | | | Removed too advanced C++11 features.Mattes D2014-10-272-32/+28
| | | | | | | | | | | | | | | | | | | | We need to keep gcc 4.6 compatibility; these features were not implemented in that version yet.
* | | | | IntGen: Attempt at fixing Linux compilation.Mattes D2014-10-261-13/+13
| | | | |
* | | | | BioGenGrown: Smaller biomes, add land to map center.Mattes D2014-10-262-16/+13
| | | | |
* | | | | Fixed a copypasta error in cIntGenAddToOcean.Mattes D2014-10-261-4/+4
| | | | |
* | | | | Added a missing header to CMakeLists.Mattes D2014-10-261-0/+1
| | | | |
* | | | | Added new biomegen: GrownMattes D2014-10-262-0/+1047
|/ / / /
* | | | Removed iniFile library from linux dependencies.Mattes D2014-10-232-2/+2
| | | |
* | | | 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