1
0
Fork 0
cuberite-2a/src/Entities
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
..
ArrowEntity.cpp Basic style fixes. 2014-07-17 22:50:58 +02:00
ArrowEntity.h Normalized comments. 2014-07-17 22:15:34 +02:00
Boat.cpp Basic style fixes. 2014-07-17 22:50:58 +02:00
Boat.h Add entity invulnerable 2014-04-26 00:32:30 +02:00
CMakeLists.txt Fixed compilation 2014-05-11 21:41:25 +03:00
EnderCrystal.cpp Tailored death messages 2014-07-04 10:55:09 +01:00
EnderCrystal.h Tailored death messages 2014-07-04 10:55:09 +01:00
Entity.cpp Merge branch 'master' into portals 2014-07-18 20:10:51 +01:00
Entity.h Merge branch 'master' into portals 2014-07-18 20:10:51 +01:00
EntityEffect.cpp Normalized comments. 2014-07-17 22:15:34 +02:00
EntityEffect.h Restructured cSplashPotionEntity code. 2014-07-15 22:41:42 +02:00
ExpBottleEntity.cpp Fixed projectile source filenames, indentations 2014-04-27 17:05:18 -07:00
ExpBottleEntity.h Normalized comments. 2014-07-17 22:15:34 +02:00
ExpOrb.cpp Fixed tabs used for alignment. 2014-07-17 23:16:55 +02:00
ExpOrb.h Implemented trapped chests & others 2014-07-06 23:50:22 +01:00
FallingBlock.cpp Merge branch 'master' into chunksparsing/structs 2014-05-10 05:05:44 -07:00
FallingBlock.h Moved source to src 2013-11-24 14:19:41 +00:00
FireChargeEntity.cpp Fixed projectile source filenames, indentations 2014-04-27 17:05:18 -07:00
FireChargeEntity.h Normalized comments. 2014-07-17 22:15:34 +02:00
FireworkEntity.cpp Fixed projectile source filenames, indentations 2014-04-27 17:05:18 -07:00
FireworkEntity.h Normalized comments. 2014-07-17 22:15:34 +02:00
Floater.cpp Normalized comments. 2014-07-17 22:15:34 +02:00
Floater.h Normalized comments. 2014-07-17 22:15:34 +02:00
GhastFireballEntity.cpp Fixed projectile source filenames, indentations 2014-04-27 17:05:18 -07:00
GhastFireballEntity.h Normalized comments. 2014-07-17 22:15:34 +02:00
HangingEntity.cpp Fixed tabs used for alignment. 2014-07-17 23:16:55 +02:00
HangingEntity.h Add item frame saving. 2014-03-15 02:45:25 +01:00
ItemFrame.cpp Fixed tabs used for alignment. 2014-07-17 23:16:55 +02:00
ItemFrame.h Tailored death messages 2014-07-04 10:55:09 +01:00
Minecart.cpp More trailing whitespace fixes. 2014-07-17 23:16:54 +02:00
Minecart.h Basic style fixes. 2014-07-17 22:50:58 +02:00
Painting.cpp Fixed multiple gcc warnings about unused params. 2014-02-28 16:26:23 +01:00
Painting.h Normalized comments. 2014-07-17 22:15:34 +02:00
Pawn.cpp Updated cPawn::KilledBy signature for custom death messages. 2014-07-17 11:07:10 +02:00
Pawn.h Updated cPawn::KilledBy signature for custom death messages. 2014-07-17 11:07:10 +02:00
Pickup.cpp Fixed tabs used for alignment. 2014-07-17 23:16:55 +02:00
Pickup.h Fixed tabs used for alignment. 2014-07-17 23:16:55 +02:00
Player.cpp Merge branch 'master' into portals 2014-07-18 20:10:51 +01:00
Player.h Merge branch 'master' into portals 2014-07-18 20:10:51 +01:00
ProjectileEntity.cpp Normalized comments. 2014-07-17 22:15:34 +02:00
ProjectileEntity.h Basic style fixes. 2014-07-17 22:50:58 +02:00
SplashPotionEntity.cpp Normalized comments. 2014-07-17 22:15:34 +02:00
SplashPotionEntity.h Normalized comments. 2014-07-17 22:15:34 +02:00
TNTEntity.cpp Some change to Entity.cpp 2014-04-23 21:06:46 +01:00
TNTEntity.h Normalized comments. 2014-07-17 22:15:34 +02:00
ThrownEggEntity.cpp Suggestions 2014-07-04 17:42:40 +01:00
ThrownEggEntity.h Normalized comments. 2014-07-17 22:15:34 +02:00
ThrownEnderPearlEntity.cpp Changed everything to callbacks 2014-07-05 22:59:22 +01:00
ThrownEnderPearlEntity.h Normalized comments. 2014-07-17 22:15:34 +02:00
ThrownSnowballEntity.cpp Suggestions 2014-07-04 17:42:40 +01:00
ThrownSnowballEntity.h Normalized comments. 2014-07-17 22:15:34 +02:00
WitherSkullEntity.cpp Fixed formatting for cWitherSkullEntity 2014-07-17 10:24:29 +02:00
WitherSkullEntity.h Normalized comments. 2014-07-17 22:15:34 +02:00