Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into ComponentRewrite | Tycho | 2014-09-09 | 1 | -0/+4 |
|\ | |||||
| * | Rewritten chunk status to specify whether the chunk is in queue. | Mattes D | 2014-09-05 | 1 | -0/+4 |
| | | | | | | | | This fixes #1370. | ||||
* | | Revert "Temporarily commented out override directives." | Tycho | 2014-09-05 | 1 | -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 ComponentRewrite | Tycho | 2014-09-05 | 1 | -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 cChunkCoordsWithBoolList | LO1ZB | 2014-09-03 | 1 | -4/+4 |
| | | |||||
| * | hopefully the last commit for removing y-coord from chunks. :) | LO1ZB | 2014-09-03 | 1 | -5/+5 |
| | | |||||
| * | remove y-coord from chunks | LO1ZB | 2014-08-28 | 1 | -2/+2 |
| | | |||||
* | | Fixed some things from the mass replace. | Samuel Barney | 2014-08-21 | 1 | -1/+1 |
| | | |||||
* | | Temporarily commented out override directives. | Samuel Barney | 2014-08-21 | 1 | -3/+3 |
|/ | |||||
* | Removed redundant semicolons and re-added warning | archshift | 2014-07-24 | 1 | -1/+1 |
| | |||||
* | Decoupled cChunkGenerator from cWorld and cRoot. | madmaxoft | 2014-01-10 | 1 | -7/+56 |
| | | | | Now the chunk generator can be used by other projects without depending on the two hugest structures in MCS. | ||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 1 | -0/+113 |