Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-05-10 | 1 | -7/+7 |
|\ | | | | | | | | | Conflicts: src/Chunk.h | ||||
| * | Fixed MSVC 64-bit build warnings. | Mattes D | 2014-05-09 | 1 | -5/+5 |
| | | |||||
| * | Fixed a flipped condition in cBlockArea::Merge(). | madmaxoft | 2014-05-05 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-05-03 | 1 | -2/+2 |
|\| | | | | | | | | | Conflicts: src/Chunk.cpp | ||||
| * | Fixed warnings in cBlockArea. | madmaxoft | 2014-05-01 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-05-01 | 1 | -167/+226 |
|\| | |||||
| * | Disabled MSVC warnings about constant bool expressions. | madmaxoft | 2014-04-28 | 1 | -2/+19 |
| | | |||||
| * | Removed static from combinators. | Tycho | 2014-04-28 | 1 | -7/+7 |
| | | | | | | | | THis allows us to use the functions in template params at the cost of polluting the global namespace. | ||||
| * | Fixed unbraced ifs | Tycho | 2014-04-28 | 1 | -10/+40 |
| | | |||||
| * | Removed inlines from combinators | Tycho | 2014-04-28 | 1 | -7/+7 |
| | | | | | | | | gcc requires external linkage for functions provided to template parameters | ||||
| * | Template Magic | Tycho | 2014-04-28 | 1 | -168/+175 |
| | | | | | | | | | | | | Removed need to allocate a fake meta block by using templates to provide a version of the code that does not use metas. Also changed the function to a template argument to make sure that the compilier is able to inline it. | ||||
| * | Worked around const pointer | Tycho | 2014-04-27 | 1 | -2/+3 |
| | | |||||
| * | Initialised MetaArrays in BlockArea | Tycho | 2014-04-27 | 1 | -2/+6 |
| | | | | | | | | Fixes CID 43621 | ||||
* | | Fixed bad comment | Tycho | 2014-04-27 | 1 | -1/+1 |
| | | |||||
* | | Implemented Chunk Sparsing with segments | Tycho | 2014-04-26 | 1 | -97/+69 |
|/ | |||||
* | Fixed a few MSVC type warnings. | Mattes D | 2014-04-03 | 1 | -1/+1 |
| | |||||
* | Merged branch 'msDifference'. | madmaxoft | 2014-04-01 | 1 | -0/+34 |
|\ | |||||
| * | Added new merge strategy "msDifference" | STRWarrior | 2014-03-31 | 1 | -0/+34 |
| | | |||||
* | | cBlockArea: Added the msMask merge strategy. | madmaxoft | 2014-04-01 | 1 | -0/+30 |
|/ | |||||
* | Implemented the msSpongePrint merge strategy. | madmaxoft | 2014-03-28 | 1 | -4/+34 |
| | | | | Similar to msImprint, but allows prefabs to carve out air pockets, too. The sponge block is used as the NOP block. | ||||
* | BlockArea: Create() can take the size as Vector3i, too. | madmaxoft | 2014-03-25 | 1 | -0/+9 |
| | |||||
* | BlockArea: Switched internal coords to Vector3i. | madmaxoft | 2014-03-25 | 1 | -175/+149 |
| | |||||
* | Renamed cBlockArea Offset to WEOffset. | madmaxoft | 2014-03-12 | 1 | -2/+2 |
| | | | | Even in getters / setters. | ||||
* | Renamed m_Offset to m_WEOffset | STRWarrior | 2014-03-11 | 1 | -3/+3 |
| | |||||
* | Using ```const Vector3i &``` | STRWarrior | 2014-03-11 | 1 | -1/+1 |
| | |||||
* | This allows a blockarea to have an Offset. | STRWarrior | 2014-03-10 | 1 | -0/+19 |
| | |||||
* | Added useful parameter overloads to cBlockArea Lua API. | madmaxoft | 2014-02-24 | 1 | -0/+95 |
| | |||||
* | Fixed crash in cBlockArea rotation. | madmaxoft | 2014-02-24 | 1 | -6/+6 |
| | | | | Fixes #720. | ||||
* | Moved Schematic file methods to seperate class | Tycho | 2014-01-20 | 1 | -158/+1 |
| | |||||
* | Seperated BlockArea From World | Tycho | 2014-01-20 | 1 | -5/+4 |
| | | | | If anyone can come up with a better name for the interface I'll change it, It contians to methods which do compleatly unrelated things | ||||
* | Fixed a few MSVC warnings. | madmaxoft | 2014-01-07 | 1 | -3/+3 |
| | |||||
* | fixed warnings in BlockArea.cpp | Tycho Bickerstaff | 2013-12-31 | 1 | -0/+2 |
| | |||||
* | cBlockArea: Fixed writing full-height areas. | madmaxoft | 2013-12-26 | 1 | -2/+2 |
| | |||||
* | Fixed block area height check. | madmaxoft | 2013-12-25 | 1 | -2/+2 |
| | | | | The block area couldn't be read up to chunk height. | ||||
* | Fixed a typo in cBlockArea merging code. | madmaxoft | 2013-12-20 | 1 | -2/+1 |
| | |||||
* | cBlockArea: origin is initialized in the constructor and the loader. | madmaxoft | 2013-12-17 | 1 | -0/+6 |
| | |||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 1 | -0/+2124 |