summaryrefslogtreecommitdiffstats
path: root/src/Entities/Entity.h (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into portalsTiger Wang2014-07-291-1/+1
|\ | | | | | | | | Conflicts: src/World.h
| * Removed redundant semicolons and re-added warningarchshift2014-07-241-1/+1
| |
* | SuggestionsTiger Wang2014-07-231-3/+5
| |
* | Speed improvements, crash fixes, & self-suggestionsTiger Wang2014-07-221-2/+4
| |
* | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-07-221-0/+6
|\| | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp
| * Added m_TicksAlive to entities, allows projectiles to hit their creatorsarchshift2014-07-201-0/+6
| |
* | SuggestionsTiger Wang2014-07-211-9/+21
| |
* | Bug and crash fixesTiger Wang2014-07-201-6/+9
| | | | | | | | | | | | | | | | | | * Fixes end portals' solidity * Fixed crashes to do with multithreading and removing an entity from the wrong world * Fixed crashes due to bad merge * Fixed crashes due to an object being deleted twice * Simplified cWorld::Start() and added comments to configuration files
* | Merge branch 'master' into portalsTiger Wang2014-07-181-7/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * 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
| | | | | | | | | | This was mostly done automatically and then visually inspected for obvious errors. All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign.
| * Merge branch 'master' into potionsmadmaxoft2014-07-171-1/+1
| |\
| | * Merge pull request #1193 from mc-server/deathmessagesMattes D2014-07-171-1/+1
| | |\ | | | | | | | | Death messages
| | | * Tailored death messagesTiger Wang2014-07-041-1/+1
| | | |
| * | | Merge remote-tracking branch 'origin/master' into potionsarchshift2014-07-101-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Entities/Player.cpp src/Entities/ProjectileEntity.cpp
| | * | 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
|\| | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h
| * 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
| | | | | | | | | | | | | | Furnace.txt: newline BlockID: removed extraneous dimension mapping cEntity: fixed typo cPlayer: WorldPtr typedef
* | Reverted portal creation codeTiger Wang2014-06-141-3/+0
| | | | | | | | It wasn't really working and needs more development
* | Portals animate and delay correctlyTiger Wang2014-06-121-2/+8
| |
* | Merge branch 'master' into portalsTiger Wang2014-06-101-4/+6
|\| | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/Player.cpp src/Entities/Player.h src/Protocol/Protocol125.cpp src/Protocol/Protocol17x.cpp
| * Fixed deadlock when moving players to other worlds.Mattes D2014-06-081-2/+3
| | | | | | | | Fixes #1039, fixes #851
| * Added queue for adding entities to cWorld.Mattes D2014-06-081-2/+3
| | | | | | | | This alone doesn't work properly yet, further changes to cPlayer are needed.
* | 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 damage
| * Implemented cacti damageTiger Wang2014-05-181-0/+3
| | | | | | | | | | + Implemented cacti damage * Fixed pickup tossing (PR #994 bug)
* | 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
| |\ | | | | | | Add entity invulnerable
| | * 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
| | | | | | | | | | | | Other small changes.
| * | Moved switch{} out of GetArmorCoverAgainst().archshift2014-04-261-0/+3
| |/
* | More comments!Tiger Wang2014-04-271-2/+9
| | | | | | | | | | * Also fixed a potential issue with position sending - if someone moved slowly enough, their position would never be updated.
* | Merge branch 'master' into fixesTiger Wang2014-04-241-0/+8
|\| | | | | | | | | Conflicts: src/World.h
| * 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
| | | | | | | | Prevent any entities with the m_Fireproof flag from taking fire or lava damage.
* | Some change to Entity.cppTiger Wang2014-04-231-7/+4
|/ | | | * Added comments to BroadcastMovementUpdate() and the collision tracer
* Merge pull request #891 from mc-server/fixesMattes D2014-04-171-15/+36
|\ | | | | Fixes to redstone & general
| * Entities handle chunks properly againTiger Wang2014-04-121-15/+36
| | | | | | | | | | * Entities properly handle chunks * Changed EntityStatus enums to be less shouty
* | Added new AI rulesTiger Wang2014-04-171-1/+2
|/ | | | | | | + Added new AI rules handling cacti and large heights * Fixed cIniFile not recognising comments in cIniFile::ReadFile() * Fixed users.ini not being properly generated * Changed all instances of (int)floor(GetPosXXX()) to POSXXX_TOINT
* 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
|\ | | | | | | | | Conflicts: src/ChunkMap.cpp
| * Unified Vector classesandrew2014-03-111-3/+1
| |
* | Added extra awesomeness to TNTTiger Wang2014-03-051-0/+1
|/ | | | | | | + TNT now has a chance of flinging FallingBlock entities around * Improved TNT damage * Improved TNT spawning visuals * Possible fix for 'SetSwimState failure' messages in debug
* Merge branch 'master' into itemframesTiger Wang2014-02-181-0/+2
|\ | | | | | | | | | | Conflicts: src/Entities/Entity.h src/WorldStorage/NBTChunkSerializer.cpp
| * Implemented paintings, fixes #689Tiger Wang2014-02-181-0/+2
| | | | | | | | + Implemented paintings
* | Implemented item frames, a part of #689Tiger Wang2014-02-181-0/+2
|/ | | | | + Implemented Item Frames * Fixed Pitch and Yaw being wrongly flipped in the protocol (XOFT!)
* Implemented fall damage for mobsTiger Wang2014-01-251-0/+5
| | | | | | + Implemented mobile fall damage * Formatting fixes + Defined new Position->Integer macros
* All mobs now drown (fixes #54)Tiger Wang2014-01-251-1/+22
| | | | | * Implemented mob drowning * Iron Golems and squids are excluded
* 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
| | | | | * Players now search for an area around themselves to teleport to when detaching from something
* Fixed compilation in VC2008.madmaxoft2013-12-301-2/+4
| | | | Also removed an unused inline header file (yuck).
* 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
| | | | | Conflicts: VC2008/MCServer.vcproj
* Moved source to srcAlexander Harkness2013-11-241-0/+445
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 12:38:18 +0100