summaryrefslogtreecommitdiffstats
path: root/src/BlockArea.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Fixed minor style issuesTycho2014-05-211-1/+1
|
* Merge branch 'master' into chunksparsing/structsTycho2014-05-101-7/+7
|\ | | | | | | | | Conflicts: src/Chunk.h
| * Fixed MSVC 64-bit build warnings.Mattes D2014-05-091-5/+5
| |
| * Fixed a flipped condition in cBlockArea::Merge().madmaxoft2014-05-051-2/+2
| |
* | Merge branch 'master' into chunksparsing/structsTycho2014-05-031-2/+2
|\| | | | | | | | | Conflicts: src/Chunk.cpp
| * Fixed warnings in cBlockArea.madmaxoft2014-05-011-2/+2
| |
* | Merge branch 'master' into chunksparsing/structsTycho2014-05-011-167/+226
|\|
| * Disabled MSVC warnings about constant bool expressions.madmaxoft2014-04-281-2/+19
| |
| * Removed static from combinators.Tycho2014-04-281-7/+7
| | | | | | | | THis allows us to use the functions in template params at the cost of polluting the global namespace.
| * Fixed unbraced ifsTycho2014-04-281-10/+40
| |
| * Removed inlines from combinatorsTycho2014-04-281-7/+7
| | | | | | | | gcc requires external linkage for functions provided to template parameters
| * Template MagicTycho2014-04-281-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 pointerTycho2014-04-271-2/+3
| |
| * Initialised MetaArrays in BlockAreaTycho2014-04-271-2/+6
| | | | | | | | Fixes CID 43621
* | Fixed bad commentTycho2014-04-271-1/+1
| |
* | Implemented Chunk Sparsing with segmentsTycho2014-04-261-97/+69
|/
* Fixed a few MSVC type warnings.Mattes D2014-04-031-1/+1
|
* Merged branch 'msDifference'.madmaxoft2014-04-011-0/+34
|\
| * Added new merge strategy "msDifference"STRWarrior2014-03-311-0/+34
| |
* | cBlockArea: Added the msMask merge strategy.madmaxoft2014-04-011-0/+30
|/
* Implemented the msSpongePrint merge strategy.madmaxoft2014-03-281-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.madmaxoft2014-03-251-0/+9
|
* BlockArea: Switched internal coords to Vector3i.madmaxoft2014-03-251-175/+149
|
* Renamed cBlockArea Offset to WEOffset.madmaxoft2014-03-121-2/+2
| | | | Even in getters / setters.
* Renamed m_Offset to m_WEOffsetSTRWarrior2014-03-111-3/+3
|
* Using ```const Vector3i &```STRWarrior2014-03-111-1/+1
|
* This allows a blockarea to have an Offset.STRWarrior2014-03-101-0/+19
|
* Added useful parameter overloads to cBlockArea Lua API.madmaxoft2014-02-241-0/+95
|
* Fixed crash in cBlockArea rotation.madmaxoft2014-02-241-6/+6
| | | | Fixes #720.
* Moved Schematic file methods to seperate classTycho2014-01-201-158/+1
|
* Seperated BlockArea From WorldTycho2014-01-201-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.madmaxoft2014-01-071-3/+3
|
* fixed warnings in BlockArea.cppTycho Bickerstaff2013-12-311-0/+2
|
* cBlockArea: Fixed writing full-height areas.madmaxoft2013-12-261-2/+2
|
* Fixed block area height check.madmaxoft2013-12-251-2/+2
| | | | The block area couldn't be read up to chunk height.
* Fixed a typo in cBlockArea merging code.madmaxoft2013-12-201-2/+1
|
* cBlockArea: origin is initialized in the constructor and the loader.madmaxoft2013-12-171-0/+6
|
* Moved source to srcAlexander Harkness2013-11-241-0/+2124