Tiger Wang
|
719551c31f
|
Fix failed merge and other issues
|
2014-07-18 20:12:27 +01:00 |
|
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 |
|
Tiger Wang
|
b9d4431f6f
|
Fixed respawning
* Fixes #1103
|
2014-06-29 22:44:16 +01:00 |
|
Tiger Wang
|
29567c5610
|
Portals animate and delay correctly
|
2014-06-12 15:21:07 +01:00 |
|
Mattes D
|
af4a21ea06
|
Fixed deadlock when moving players to other worlds.
Fixes #1039, fixes #851
|
2014-06-08 21:58:30 +02:00 |
|
Tiger Wang
|
8bff3e5af2
|
Implemented end and nether portals
|
2014-05-31 22:28:51 +01:00 |
|
Mattes D
|
9f58046b5b
|
Allow 1.6.4 Forge clients to log in.
Fixes #913.
|
2014-04-21 08:22:25 +02:00 |
|
madmaxoft
|
95fb90eaa6
|
Fixed 1.6.4 client crash on composite chat messages.
|
2014-04-06 22:28:41 +02:00 |
|
Alexander Harkness
|
675b4aa878
|
Moved source to src
|
2013-11-24 14:19:41 +00:00 |
|