summaryrefslogtreecommitdiffstats
path: root/src/Entities/Entity.h (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into portalsTiger Wang2014-07-181-7/+8
|\
| * Fixed tabs used for alignment.madmaxoft2014-07-171-1/+1
| * Basic style fixes.madmaxoft2014-07-171-1/+1
| * Normalized comments.madmaxoft2014-07-171-1/+1
| * Merge branch 'master' into potionsmadmaxoft2014-07-171-1/+1
| |\
| | * Merge pull request #1193 from mc-server/deathmessagesMattes D2014-07-171-1/+1
| | |\
| | | * Tailored death messagesTiger Wang2014-07-041-1/+1
| * | | Merge remote-tracking branch 'origin/master' into potionsarchshift2014-07-101-2/+2
| |\| |
| | * | Some Entity.cpp style improvementsTiger Wang2014-06-221-2/+2
| | |/
| * | Cave spider now poisons its victim, added IsPawn function to Entityarchshift2014-06-171-0/+1
| * | Player: made healing instantaneousarchshift2014-06-171-1/+1
| |/
* | Merge branch 'master' into portalsTiger Wang2014-06-211-10/+25
|\|
| * Merge branch 'master' of github.com:mc-server/MCServerTycho2014-06-161-10/+25
* | Fixed invalid iteratorsTiger Wang2014-06-211-1/+9
* | Implemented PR suggestionsarchshift2014-06-161-1/+1
* | Reverted portal creation codeTiger Wang2014-06-141-3/+0
* | Portals animate and delay correctlyTiger Wang2014-06-121-2/+8
* | Merge branch 'master' into portalsTiger Wang2014-06-101-4/+6
|\|
| * Fixed deadlock when moving players to other worlds.Mattes D2014-06-081-2/+3
| * Added queue for adding entities to cWorld.Mattes D2014-06-081-2/+3
* | Portal improvements and suggestionsTiger Wang2014-06-101-0/+3
* | Implemented end and nether portalsTiger Wang2014-05-311-0/+6
|/
* Merge pull request #1010 from mc-server/cactidamageAlexander Harkness2014-05-191-0/+3
|\
| * Implemented cacti damageTiger Wang2014-05-181-0/+3
* | cEntity::Killed(cEntity *) Handler; Achievement triggers; cPlayer::AwardAchievement()andrew2014-05-121-0/+3
|/
* A bit of reformatting.madmaxoft2014-05-021-5/+10
* Merge branch 'master' into fixes.madmaxoft2014-05-021-10/+25
|\
| * Merge pull request #940 from Howaner/GlobalFixesMattes D2014-04-281-10/+22
| |\
| | * FixesHowaner2014-04-261-10/+13
| | * Change m_InvulnerableTicks description again again :DHowaner2014-04-261-1/+1
| | * Change m_InvulnerableTicks description again.Howaner2014-04-261-1/+1
| | * Change m_InvulnerableTicks descriptionHowaner2014-04-261-1/+1
| | * Add entity invulnerableHowaner2014-04-261-4/+13
| * | Further refactored, Reverted Minecart changearchshift2014-04-261-1/+1
| * | Moved switch{} out of GetArmorCoverAgainst().archshift2014-04-261-0/+3
| |/
* | More comments!Tiger Wang2014-04-271-2/+9
* | Merge branch 'master' into fixesTiger Wang2014-04-241-0/+8
|\|
| * Renamed getter and setter for IsFireproof.archshift2014-04-231-2/+2
| * Fireproof status getter and setter.archshift2014-04-231-0/+5
| * Fixed indentation and changed m_Fireproof to m_IsFireproof.archshift2014-04-221-2/+2
| * Lay foundation for fireproof entities.archshift2014-04-221-0/+3
* | Some change to Entity.cppTiger Wang2014-04-231-7/+4
|/
* Merge pull request #891 from mc-server/fixesMattes D2014-04-171-15/+36
|\
| * Entities handle chunks properly againTiger Wang2014-04-121-15/+36
* | Added new AI rulesTiger Wang2014-04-171-1/+2
|/
* Documented the units and range for entity rotations.madmaxoft2014-04-031-7/+7
* Ender crystalsandrew2014-03-251-11/+13
* Merge branch 'master' into awesometntTiger Wang2014-03-181-3/+1
|\
| * Unified Vector classesandrew2014-03-111-3/+1
* | Added extra awesomeness to TNTTiger Wang2014-03-051-0/+1
|/
* Merge branch 'master' into itemframesTiger Wang2014-02-181-0/+2
|\
| * Implemented paintings, fixes #689Tiger Wang2014-02-181-0/+2
* | Implemented item frames, a part of #689Tiger Wang2014-02-181-0/+2
|/
* Implemented fall damage for mobsTiger Wang2014-01-251-0/+5
* All mobs now drown (fixes #54)Tiger Wang2014-01-251-1/+22
* Removed unused ReferenceManagerTiger Wang2014-01-241-9/+1
* Removed internal cEntity::GetRot() usage.madmaxoft2014-01-171-2/+2
* Removed obsoleted functionsTiger Wang2014-01-161-3/+1
* OBSOLETE'd obsolete functionsTiger Wang2014-01-151-2/+2
* Detaching improvementsTiger Wang2014-01-131-1/+1
* Fixed compilation in VC2008.madmaxoft2013-12-301-2/+4
* converted commneted paramater names to the unused macroTycho Bickerstaff2013-12-221-3/+7
* ChunkSender is now warnings cleanTycho Bickerstaff2013-12-211-4/+4
* Sorted a few constructors to remove warnings.madmaxoft2013-12-201-1/+1
* Added cFloater class.STRWarrior2013-12-191-0/+3
* Added HandleSpeedFromAttachee so an entity can override the function.STRWarrior2013-12-161-0/+1
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-261-0/+1
* Moved source to srcAlexander Harkness2013-11-241-0/+445