1
0
Fork 0
cuberite-2a/src/Mobs
Tiger Wang 3acdf25b05 Merge remote-tracking branch 'origin/master' into c++11
Conflicts:
	src/OSSupport/Thread.cpp
2014-12-06 17:41:48 +00:00
..
AggressiveMonster.cpp BasicStyle: Added missing braces to control statements. 2014-12-05 16:59:11 +01:00
AggressiveMonster.h Added first test to show the object can be created 2014-09-17 18:40:10 +01:00
Bat.cpp Fixed mob hitbox sizes, removed TODOs 2014-06-07 00:40:01 -07:00
Bat.h Removed redundant semicolons and re-added warning 2014-07-24 11:21:37 -07:00
Blaze.cpp Fixed reported parentheses around comparisons. 2014-12-05 12:58:47 +01:00
Blaze.h En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
CMakeLists.txt Fixed eMonsterType Lua API mismatch. 2014-10-05 22:09:19 +02:00
CaveSpider.cpp En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
CaveSpider.h En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Chicken.cpp En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Chicken.h En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Cow.cpp En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Cow.h En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Creeper.cpp En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Creeper.h En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
EnderDragon.cpp Moved source to src 2013-11-24 14:19:41 +00:00
EnderDragon.h En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Enderman.cpp En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Enderman.h En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Ghast.cpp Fixed reported parentheses around comparisons. 2014-12-05 12:58:47 +01:00
Ghast.h En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Giant.cpp Merge remote-tracking branch 'origin/master' into foldermove2 2013-11-24 14:37:03 +00:00
Giant.h En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Horse.cpp En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Horse.h En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
IncludeAllMonsters.h Fixed references to renamed files. 2014-04-23 15:25:10 -07:00
IronGolem.cpp Fixed Formatting, added compiler warning suppressing methods, fixed comments 2014-02-24 15:38:38 +01:00
IronGolem.h En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
MagmaCube.cpp Fixed references to renamed files. 2014-04-23 15:25:10 -07:00
MagmaCube.h En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Monster.cpp Merge remote-tracking branch 'origin/master' into c++11 2014-12-06 17:41:48 +00:00
Monster.h MobSpawner fixes. 2014-12-01 14:58:13 +01:00
MonsterTypes.h Mark StringToMobType() as deprecated. Use cMonster:StringToMobType() instead 2014-11-29 15:40:38 +01:00
Mooshroom.cpp En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Mooshroom.h En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Ocelot.h Removed redundant semicolons and re-added warning 2014-07-24 11:21:37 -07:00
PassiveAggressiveMonster.cpp En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
PassiveAggressiveMonster.h Added first test to show the object can be created 2014-09-17 18:40:10 +01:00
PassiveMonster.cpp En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
PassiveMonster.h Added first test to show the object can be created 2014-09-17 18:40:10 +01:00
Pig.cpp clearing CheckBasicStyle.lua messages 2014-12-03 00:26:15 -08:00
Pig.h pigs turn into pigmen on lightning 2014-11-22 15:33:34 -08:00
Sheep.cpp En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Sheep.h En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Silverfish.h Removed redundant semicolons and re-added warning 2014-07-24 11:21:37 -07:00
Skeleton.cpp Fixed reported parentheses around comparisons. 2014-12-05 12:58:47 +01:00
Skeleton.h En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Slime.cpp En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Slime.h En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
SnowGolem.cpp Fixed reported parentheses around comparisons. 2014-12-05 12:58:47 +01:00
SnowGolem.h En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Spider.cpp En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Spider.h En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Squid.cpp En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Squid.h En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Villager.cpp formatter error 2014-11-21 23:58:35 -08:00
Villager.h Removed more unessicary includes 2014-09-26 18:13:19 +01:00
Witch.cpp En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Witch.h En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Wither.cpp Tailored death messages 2014-07-04 10:55:09 +01:00
Wither.h En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Wolf.cpp En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Wolf.h Wolf uses UUID for owner. 2014-08-03 22:04:52 +02:00
Zombie.cpp En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Zombie.h En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
ZombiePigman.cpp En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
ZombiePigman.h En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00