Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into portals | Tiger Wang | 2014-07-18 | 1 | -9/+9 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/WorldInterface.h src/ClientHandle.cpp src/ClientHandle.h src/Entities/Player.cpp src/Entities/Player.h src/Generating/FinishGen.cpp src/Protocol/Protocol.h src/Protocol/Protocol125.cpp src/Protocol/Protocol125.h src/Protocol/Protocol16x.cpp src/Protocol/Protocol16x.h src/Protocol/Protocol17x.cpp src/Protocol/Protocol17x.h src/Protocol/ProtocolRecognizer.cpp src/Protocol/ProtocolRecognizer.h src/Root.h src/World.cpp | ||||
| * | Normalized comments. | madmaxoft | 2014-07-17 | 1 | -9/+9 |
| | | | | | | | | | | This was mostly done automatically and then visually inspected for obvious errors. All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign. | ||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-06-21 | 1 | -8/+15 |
|\| | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h | ||||
| * | Optimized Voronoi calculation. | madmaxoft | 2014-06-20 | 1 | -8/+13 |
| | | | | | | | | Fixes #818. | ||||
| * | Nullify deleted pointers. | archshift | 2014-06-19 | 1 | -0/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-06-04 | 1 | -1/+1 |
|\| | |||||
| * | Biome generators: biome lists can contain spaces. | madmaxoft | 2014-05-27 | 1 | -1/+1 |
| | | |||||
* | | Implemented end and nether portals | Tiger Wang | 2014-05-31 | 1 | -1/+1 |
|/ | |||||
* | Implemented faster upscaling using templates. | madmaxoft | 2014-03-21 | 1 | -8/+8 |
| | | | | Fixes #819. | ||||
* | 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 | 1 | -5/+5 |
| | | | | | 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 | ||||
* | Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT). | madmaxoft | 2013-12-20 | 1 | -3/+3 |
| | |||||
* | 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 | ||||
* | Fixed CheckerboardBiomeGen in negative coords. | madmaxoft | 2013-11-29 | 1 | -2/+3 |
| | |||||
* | Moved BiomeGen creation from INI file data to BioGen.cpp. | madmaxoft | 2013-11-28 | 1 | -0/+66 |
| | | | | This way it can be shared between MCServer and BiomeVisualiser. | ||||
* | BiomeVisualiser: Added the TwoLevel biome generator. | madmaxoft | 2013-11-28 | 1 | -0/+191 |
| | |||||
* | Voronoi-related biomegens use the new cVoronoiMap class. | madmaxoft | 2013-11-27 | 1 | -46/+10 |
| | |||||
* | Fixed the remaining derps | Alexander Harkness | 2013-11-27 | 1 | -1/+1 |
| | |||||
* | Further attempts to fix compile | Tiger Wang | 2013-11-25 | 1 | -1/+1 |
| | |||||
* | Attempt to fix compilation | Tiger Wang | 2013-11-24 | 1 | -1/+1 |
| | |||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 1 | -0/+707 |