Tiger Wang
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
worktycho
132b367316
CopyPaste Error
...
Fixes CID 70460.
2014-07-13 15:32:44 +01:00
worktycho
64697f0cab
Another COpyPaste Error
...
Fixes CID 70461
2014-07-13 15:29:43 +01:00
worktycho
bfc485bfe2
Fix CopyPaste error that ment a_MaxRelX wasdn't checked
...
Fixes CID 70464
2014-07-13 15:05:54 +01:00
Tiger Wang
7d3d9e92e8
Fixed a NetherFinisher bug
2014-06-04 20:01:05 +01:00
madmaxoft
87e0bd54b4
BlockArea: Switched internal coords to Vector3i.
2014-03-25 21:59:41 +01:00
madmaxoft
2325a1a162
ChunkDesc warns about StructureGen's deprecation.
2014-03-01 20:59:41 +01:00
Tycho
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
madmaxoft
66427d754b
Added cChunkDest::UpdateHeightmap()
...
This function is necessary for plugins manipulating the generated chunks, they need to update the heightmap before it is passed back to the generator.
2014-01-31 16:01:15 +01:00
madmaxoft
8610d45ef1
Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT).
2013-12-20 16:01:34 +01:00
Alexander Harkness
c3cd436ec3
Merge remote-tracking branch 'origin/master' into foldermove2
...
Conflicts:
GNUmakefile
2013-11-24 14:37:03 +00:00
Alexander Harkness
675b4aa878
Moved source to src
2013-11-24 14:19:41 +00:00