Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Added all current NetherFort prefabs. | madmaxoft | 2014-03-30 | 1 | -3/+1547 |
| | |||||
* | Added asserts for critical data in cPrefab. | madmaxoft | 2014-03-30 | 1 | -0/+4 |
| | |||||
* | Re-fixed nether fort piece count check. | madmaxoft | 2014-03-30 | 1 | -2/+2 |
| | |||||
* | NetherForts have a minimum number of pieces. | madmaxoft | 2014-03-30 | 1 | -2/+5 |
| | | | | The fort will generate a different image if it has less than the minimum; the max depth affects the minimum number of pieces. | ||||
* | Merge branch 'master' into NetherFortGen | madmaxoft | 2014-03-29 | 2 | -10/+102 |
|\ | |||||
| * | cPrefab now uses a struct for block type definition in CharMap. | madmaxoft | 2014-03-29 | 2 | -10/+102 |
| | | | | | | | | | | As suggested by worktycho in 7b585290fccd3dc074b1f9feef0af754ab3dd632, instead of packing the two values into a single int, they're packed into a struct. Also added a test code for the prefab parsing in SELF_TEST. | ||||
* | | NetherFortGen: Added several more prefabs. | madmaxoft | 2014-03-28 | 2 | -2/+783 |
| | | | | | | | | Also extended the defauls MaxDepth value to 12. | ||||
* | | Implemented the msSpongePrint merge strategy. | madmaxoft | 2014-03-28 | 1 | -3/+3 |
| | | | | | | | | Similar to msImprint, but allows prefabs to carve out air pockets, too. The sponge block is used as the NOP block. | ||||
* | | NetherFort: Added BalconyTee2 prefab. | madmaxoft | 2014-03-28 | 1 | -29/+158 |
| | | |||||
* | | Fixed a memory leak in NetherFortGen. | madmaxoft | 2014-03-28 | 1 | -0/+7 |
| | | |||||
* | | Sponged the netherfort balcony prefab. | madmaxoft | 2014-03-28 | 1 | -30/+31 |
| | | | | | | | | This is a preparation for the msSpongePrint merge strategy, used for imprinting most prefabs. It will carve out even air, but will ignore sponge blocks. | ||||
* | | Initial NetherFortGen import. | madmaxoft | 2014-03-28 | 7 | -2/+699 |
|/ | | | | Simple fortresses of 2 different rooms will generate. | ||||
* | Merge branch 'howaner/GlobalFixes'. | madmaxoft | 2014-03-28 | 1 | -1/+0 |
|\ | |||||
| * | Add missing ChunkDesc import. | Howaner | 2014-03-28 | 1 | -1/+1 |
| | | |||||
* | | Fixed Prefab's rotations. | madmaxoft | 2014-03-28 | 2 | -7/+39 |
|/ | |||||
* | cPrefab can draw itself into a cChunkDesc. | madmaxoft | 2014-03-27 | 2 | -6/+9 |
| | |||||
* | Prefabs support connectors, rotations and merge strategy. | madmaxoft | 2014-03-26 | 2 | -3/+72 |
| | |||||
* | Added a basic cPrefab class. | madmaxoft | 2014-03-25 | 2 | -0/+222 |
| | | | | Can be defined in the source by GalExport's cpp output. | ||||
* | BlockArea: Switched internal coords to Vector3i. | madmaxoft | 2014-03-25 | 1 | -3/+3 |
| | |||||
* | Implemented faster upscaling using templates. | madmaxoft | 2014-03-21 | 5 | -14/+14 |
| | | | | Fixes #819. | ||||
* | Fixed xofts issues | Tycho | 2014-03-14 | 1 | -2/+2 |
| | |||||
* | Added additional macros to support the MSVC size_t format and changed all formats to use the macros | Tycho | 2014-03-12 | 1 | -1/+1 |
| | |||||
* | Merge branch 'Werror' into warnings | Tycho | 2014-03-12 | 1 | -7/+6 |
|\ | | | | | | | | | Conflicts: src/Globals.h | ||||
| * | Fixed printf format compatabilty | Tycho | 2014-03-12 | 1 | -5/+4 |
| | | |||||
| * | Merge branch 'master' into Werror | Tycho | 2014-03-12 | 1 | -2/+2 |
| |\ | | | | | | | | | | | | | Conflicts: src/Generating/PieceGenerator.cpp | ||||
| | * | Fixed missing comment terminator. | madmaxoft | 2014-03-12 | 1 | -1/+1 |
| | | | |||||
* | | | Fixed a load of format string errors | Tycho | 2014-03-11 | 1 | -2/+2 |
|/ / | |||||
* / | Fixed Warnings in PieceGenerator | Tycho | 2014-03-11 | 2 | -9/+9 |
|/ | |||||
* | Removed debugging output. | madmaxoft | 2014-03-10 | 1 | -1/+3 |
| | | | | Kept it commented-out for later revisions, if needed. | ||||
* | POCPieces: Added height. | madmaxoft | 2014-03-10 | 1 | -17/+20 |
| | | | | Now the pieces connect in different heights, too, creating a true 3D maze. | ||||
* | A working POCPiece generator. | madmaxoft | 2014-03-09 | 5 | -6/+359 |
| | |||||
* | cPieceGenerator: New connectors are added to the free pool. | madmaxoft | 2014-03-09 | 2 | -9/+30 |
| | |||||
* | PieceGenerator can connect two connectors of the same type. | madmaxoft | 2014-03-09 | 2 | -60/+338 |
| | | | | Also added extensive debugging output and a test. | ||||
* | Added the first skeleton code for PieceGenerator. | madmaxoft | 2014-03-09 | 2 | -0/+545 |
| | | | | This is a WIP and won't work / isn't used at all. | ||||
* | Warnings | Tycho | 2014-03-07 | 2 | -1/+3 |
| | |||||
* | Merge pull request #738 from xdot/master | Mattes D | 2014-03-02 | 1 | -3/+3 |
|\ | | | | | Refactored global block property arrays | ||||
| * | g_BlockXXX => cBlockInfo::XXX | andrew | 2014-03-01 | 1 | -3/+3 |
| | | |||||
* | | ChunkDesc warns about StructureGen's deprecation. | madmaxoft | 2014-03-01 | 1 | -0/+2 |
| | | |||||
* | | Unified StructureGens and FinisherGens. | madmaxoft | 2014-03-01 | 10 | -163/+128 |
|/ | | | | Now they are all Finishers. Fixes #398. | ||||
* | Merge pull request #669 from xdot/master | Tiger Wang | 2014-02-24 | 1 | -9/+0 |
|\ | | | | | Implementation of in-game maps :D | ||||
| * | Thread safe cMap manager | andrew | 2014-02-20 | 1 | -9/+0 |
| | | |||||
* | | Add BlockNewLeaves.h and rename Darkoac to Darkoak | Howaner | 2014-02-19 | 2 | -3/+3 |
| | | |||||
* | | Add new Trees (without Generator) | Howaner | 2014-02-19 | 2 | -0/+24 |
|/ | |||||
* | Fixed compile and some warnings in MSVS | Tiger Wang | 2014-02-09 | 1 | -9/+0 |
| | |||||
* | Fogot to save Biogen | Tycho | 2014-02-03 | 1 | -4/+4 |
| | |||||
* | Fixed Compile errors | Tycho | 2014-02-03 | 1 | -1/+1 |
| | | | | c++11 introduces scoped enums, so the code didn't fail in clang | ||||
* | Increased Type safety of Biomes | Tycho | 2014-02-03 | 3 | -8/+8 |
| | | | | | Changed a number of funcictions from using integers to store biomes to using EMCSBiome Note that switching from an int to an Enum is a non-breaking chang to the lua bindings | ||||
* | Merge branch 'master' into GeneratingBenchmark2 | Tycho | 2014-02-01 | 2 | -17/+48 |
|\ | | | | | | | | | Conflicts: src/World.h | ||||
| * | Added cChunkDest::UpdateHeightmap() | madmaxoft | 2014-01-31 | 2 | -17/+48 |
| | | | | | | | | This function is necessary for plugins manipulating the generated chunks, they need to update the heightmap before it is passed back to the generator. | ||||
* | | Merge branch 'master' into GeneratingBenchmark2 | Tycho | 2014-01-26 | 1 | -1/+8 |
|\| | | | | | | | | | | | Conflicts: src/Blocks/BlockRail.h src/World.h | ||||
| * | Merge pull request #575 from worktycho/GeneratingBenchmark | Mattes D | 2014-01-25 | 1 | -0/+2 |
| |\ | | | | | | | More Interfaces to decouple Generator from the rest of the code | ||||
| * | | Mob bugfixes | Tiger Wang | 2014-01-25 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Mobs no longer require constant line-of-sight to a player to remain aggravated * Fixed an ASSERT * Fixed mobs jumping * Fixed Idle state not properly using AI + Added FILE_IO_PREFIX to favicon loading + Implemented #563 | ||||
| * | | Fixed a generator bug | Tiger Wang | 2014-01-25 | 1 | -1/+6 |
| | | | |||||
* | | | dded dependecy on Blocks to Generator | Tycho | 2014-01-25 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge branch 'master' into GeneratingBenchmark | Tycho | 2014-01-20 | 3 | -3/+150 |
|\| | | | | | | | this merge is necessary, | ||||
| * | Alpha-sorted the finishers. | madmaxoft | 2014-01-18 | 1 | -4/+4 |
| | | |||||
| * | Merged branch 'NetherFinish'. | madmaxoft | 2014-01-18 | 3 | -3/+150 |
| |\ | |||||
| | * | Fixed errors. | STRWarrior | 2014-01-18 | 2 | -2/+2 |
| | | | |||||
| | * | Renamed cFinishGenNetherSprinkleFoliage to cFinishGenNetherClumpFoliage. Fixed typo's | STRWarrior | 2014-01-18 | 3 | -10/+10 |
| | | | |||||
| | * | Some tweaks. | STRWarrior | 2014-01-18 | 1 | -5/+18 |
| | | | | | | | | | | | | | | | Everything generates more often. Fire can only spawn on ForeverBurning blocks. | ||||
| | * | Fixed bug where only brown mushrooms would spawn. | STRWarrior | 2014-01-18 | 1 | -3/+3 |
| | | | |||||
| | * | It now actualy works. | STRWarrior | 2014-01-18 | 1 | -20/+42 |
| | | | |||||
| | * | First attempt at creating a clumb version NetherFinisher. | STRWarrior | 2014-01-17 | 2 | -22/+63 |
| | | | |||||
| | * | Added cFinishGenNetherSprinkleFoliage. | STRWarrior | 2014-01-10 | 3 | -2/+73 |
| | | | |||||
* | | | Added Inifile and OSSupport Linking | Tycho | 2014-01-19 | 1 | -0/+2 |
|/ / | |||||
* | | Decoupled cChunkGenerator from cWorld and cRoot. | madmaxoft | 2014-01-10 | 8 | -49/+87 |
| | | | | | | | | Now the chunk generator can be used by other projects without depending on the two hugest structures in MCS. | ||||
* | | Fixed generator adding values to ini file. | madmaxoft | 2014-01-10 | 2 | -1/+3 |
| | | |||||
* | | Merge pull request #520 from mc-server/SoulSand | Mattes D | 2014-01-10 | 2 | -1/+17 |
|\| | | | | | NetherGen: Now generates SoulSand. | ||||
| * | Fixed recurring pattern. | STRWarrior | 2014-01-10 | 1 | -1/+1 |
| | | |||||
| * | Fixed chunk borders. | STRWarrior | 2014-01-09 | 1 | -3/+3 |
| | | |||||
| * | Speed-up. I got about 40 extra ch/s | STRWarrior | 2014-01-08 | 1 | -9/+14 |
| | | |||||
| * | WormNestCaves now remove soul sand. | STRWarrior | 2014-01-08 | 1 | -0/+1 |
| | | |||||
| * | NetherGen: Now generates SoulSand. | STRWarrior | 2014-01-08 | 1 | -1/+11 |
| | | |||||
* | | Composition generator creating moved to a separate function. | madmaxoft | 2014-01-09 | 2 | -61/+83 |
| | | | | | | | | Also it forces the defaults into the INI file. | ||||
* | | Height generator creating moved info HeiGen.cpp. | madmaxoft | 2014-01-09 | 3 | -54/+82 |
|/ | | | | The generator also explicitly sets the default back into the INI file. | ||||
* | More MSVC warning fixes. | madmaxoft | 2014-01-07 | 1 | -1/+1 |
| | |||||
* | Fixed a few MSVC warnings. | madmaxoft | 2014-01-07 | 3 | -6/+7 |
| | |||||
* | Added function to create Tall Birch tree in BirchTreeForest biomes | Mike Hunsinger | 2013-12-29 | 2 | -3/+49 |
| | |||||
* | Simplefied Extreme Hills M pattern select. | STRWarrior | 2013-12-26 | 1 | -11/+3 |
| | |||||
* | Extreme Hills M biomes now generate gravel, stone and grass patterns. | STRWarrior | 2013-12-25 | 1 | -2/+10 |
| | |||||
* | Changed tbGravel. Vanilla has 3 layers of gravel and then stone. | STRWarrior | 2013-12-25 | 1 | -3/+3 |
| | |||||
* | Normal extreme hills (plus) now generate a stone/grass pattern. | STRWarrior | 2013-12-25 | 1 | -2/+20 |
| | |||||
* | Re-added empty line. | STRWarrior | 2013-12-25 | 1 | -0/+1 |
| | |||||
* | This generates gravel in Extreme Hills M biomes. | STRWarrior | 2013-12-25 | 2 | -3/+20 |
| | |||||
* | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-20 | 9 | -19/+23 |
|\ | |||||
| * | Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT). | madmaxoft | 2013-12-20 | 9 | -19/+23 |
| | | |||||
* | | moved generating to globs | Tycho Bickerstaff | 2013-12-11 | 1 | -1/+5 |
| | | |||||
* | | more cmake | Tycho Bickerstaff | 2013-12-10 | 1 | -0/+7 |
|/ | |||||
* | moved deafult action into deafult clause at src/Generating/DistortedHeightmap.cpp line 741 | Tycho Bickerstaff | 2013-12-08 | 1 | -2/+4 |
| | |||||
* | reordered initalisation order at src/Generating/Cave.h line 73 | Tycho Bickerstaff | 2013-12-08 | 1 | -2/+2 |
| | |||||
* | fixed warnings in src/Generating/BioGen.cpp | Tycho Bickerstaff | 2013-12-08 | 1 | -1/+1 |
| | | | | | | removed unused variable at src/Generating/BioGen.cpp line 379 and added default fallthrough clause to switch at src/Generating/BioGen.cpp line 725 | ||||
* | Moved bindings-related to a Bindings subfolder. | madmaxoft | 2013-12-08 | 1 | -1/+1 |
| | | | | Ref.: #407 | ||||
* | Added floor pattern for MegaTaiga biomes. | madmaxoft | 2013-11-30 | 1 | -1/+10 |
| | |||||
* | Implemented mesa biomes in DistortedHeightmap CompoGen. | madmaxoft | 2013-11-29 | 3 | -21/+106 |
| | |||||
* | Fixed CheckerboardBiomeGen in negative coords. | madmaxoft | 2013-11-29 | 1 | -2/+3 |
| | |||||
* | DistortedHeightmap: Improved speed, prepared for mesa biomes. | madmaxoft | 2013-11-29 | 2 | -157/+424 |
| | | | | This generates the rainbow-mesa as seen on the first mesa screenshot in the forum. | ||||
* | Trees will generate in the new biomes. | madmaxoft | 2013-11-28 | 2 | -14/+101 |
| | | | | Only the generic trees, the special variants haven't yet been implemented. | ||||
* | Added new biomes to old composition generator. | madmaxoft | 2013-11-28 | 3 | -0/+141 |
| | | | | Mostly placeholders only, true per-biome characteristics still need to be implemented. This is only to test the new biome generators. | ||||
* | Added new biomes to old height generators. | madmaxoft | 2013-11-28 | 4 | -39/+179 |
| | | | | Now Biomal and DistortedHeight generators will work with new biomes. | ||||
* | Moved BiomeGen creation from INI file data to BioGen.cpp. | madmaxoft | 2013-11-28 | 3 | -48/+74 |
| | | | | This way it can be shared between MCServer and BiomeVisualiser. | ||||
* | BiomeVisualiser: Added the TwoLevel biome generator. | madmaxoft | 2013-11-28 | 2 | -0/+229 |
| | |||||
* | Voronoi-related biomegens use the new cVoronoiMap class. | madmaxoft | 2013-11-27 | 2 | -53/+28 |
| | |||||
* | Fixed the remaining derps | Alexander Harkness | 2013-11-27 | 8 | -8/+8 |
| | |||||
* | Hopefully fixed last of the Linux compile errors | Tiger Wang | 2013-11-26 | 2 | -2/+2 |
| | |||||
* | Further attempts to fix compile | Tiger Wang | 2013-11-25 | 8 | -8/+8 |
| | |||||
* | Attempt to fix compilation | Tiger Wang | 2013-11-24 | 8 | -8/+8 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-24 | 7 | -196/+190 |
| | | | | | Conflicts: GNUmakefile | ||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 30 | -0/+11358 |