summaryrefslogtreecommitdiffstats
path: root/src/Generating/ChunkGenerator.h (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into ComponentRewriteTycho2014-09-091-0/+4
|\
| * Rewritten chunk status to specify whether the chunk is in queue.Mattes D2014-09-051-0/+4
| | | | | | | | This fixes #1370.
* | Revert "Temporarily commented out override directives."Tycho2014-09-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6db727c60c01264dc9a9c209c5b335da8f53cd64. Conflicts: src/Bindings/PluginLua.h src/Blocks/BlockFire.h src/Generating/ChunkGenerator.h src/LoggerListeners.cpp src/Mobs/Components/AIAggressiveComponent.h src/Mobs/Monster.h src/OSSupport/IsThread.h src/Protocol/Authenticator.h src/UI/SlotArea.h
* | Merge branch 'master' into ComponentRewriteTycho2014-09-051-6/+6
|\| | | | | | | | | | | | | | | | | | | Conflicts: MCServer/Plugins/Core src/Bindings/PluginLua.h src/Blocks/BlockFire.h src/LoggerListeners.cpp src/Mobs/Monster.cpp src/UI/SlotArea.h
| * re-add the missing "s" too cChunkCoordsWithBoolListLO1ZB2014-09-031-4/+4
| |
| * hopefully the last commit for removing y-coord from chunks. :)LO1ZB2014-09-031-5/+5
| |
| * remove y-coord from chunksLO1ZB2014-08-281-2/+2
| |
* | Fixed some things from the mass replace.Samuel Barney2014-08-211-1/+1
| |
* | Temporarily commented out override directives.Samuel Barney2014-08-211-3/+3
|/
* Removed redundant semicolons and re-added warningarchshift2014-07-241-1/+1
|
* Decoupled cChunkGenerator from cWorld and cRoot.madmaxoft2014-01-101-7/+56
| | | | Now the chunk generator can be used by other projects without depending on the two hugest structures in MCS.
* Moved source to srcAlexander Harkness2013-11-241-0/+113