37140ae578
Merge branch 'master' into portals
...
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
2014-07-18 20:10:51 +01:00
2423fbf2ef
Normalized comments.
...
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.
2014-07-17 22:15:34 +02:00
7615ed90c0
Merge branch 'master' into portals
...
Conflicts:
src/Chunk.cpp
src/Entities/Entity.h
src/Entities/Player.h
2014-06-21 22:14:23 +01:00
9db9445e9f
Optimized Voronoi calculation.
...
Fixes #818 .
2014-06-20 17:10:18 +02:00
e8143de01b
Nullify deleted pointers.
2014-06-19 01:49:56 -07:00
86e5273cd1
Merge remote-tracking branch 'origin/master' into portals
2014-06-04 13:14:38 +01:00
8bff3e5af2
Implemented end and nether portals
2014-05-31 22:28:51 +01:00
6c25c356c7
Biome generators: biome lists can contain spaces.
2014-05-27 21:18:15 +02:00
c9163d39f7
Implemented faster upscaling using templates.
...
Fixes #819 .
2014-03-21 22:53:46 +01:00
4b19247305
Fogot to save Biogen
2014-02-03 13:07:38 -08:00
d9fb83300c
Fixed Compile errors
...
c++11 introduces scoped enums, so the code didn't fail in clang
2014-02-03 13:01:12 -08:00
80807eec2c
Increased Type safety of Biomes
...
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
2014-02-03 12:26:17 -08:00
8610d45ef1
Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT).
2013-12-20 16:01:34 +01:00
e32a224fe3
fixed warnings in src/Generating/BioGen.cpp
...
removed unused variable at src/Generating/BioGen.cpp line 379
and added default fallthrough clause to switch at
src/Generating/BioGen.cpp line 725
2013-12-07 23:56:26 +00:00
cbe8d1aa6d
Fixed CheckerboardBiomeGen in negative coords.
2013-11-29 21:45:20 +01:00
c0a6c2b533
Moved BiomeGen creation from INI file data to BioGen.cpp.
...
This way it can be shared between MCServer and BiomeVisualiser.
2013-11-28 20:15:52 +01:00
bdd86d7934
BiomeVisualiser: Added the TwoLevel biome generator.
2013-11-28 20:00:30 +01:00
bec27617a2
Voronoi-related biomegens use the new cVoronoiMap class.
2013-11-27 21:42:34 +01:00
d925cf4def
Fixed the remaining derps
2013-11-27 07:40:59 +00:00
32449f1fca
Further attempts to fix compile
2013-11-25 18:29:36 +00:00
e3db69c4ae
Attempt to fix compilation
2013-11-24 18:44:22 +00:00
675b4aa878
Moved source to src
2013-11-24 14:19:41 +00:00
Tiger Wang
madmaxoft
archshift
Tycho
Tycho Bickerstaff
Alexander Harkness