summaryrefslogtreecommitdiffstats
path: root/src/Entities/Entity.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Removed more unessicary includesTycho2014-09-261-1/+0
|
* Merge branch 'master' into redstoneTestsTycho2014-09-251-5/+6
|\ | | | | | | | | Conflicts: src/Mobs/Monster.h
| * A few compiler warning fixesChris Darnell2014-09-231-2/+3
| |
| * Merge pull request #1398 from mc-server/1.8-ProtocolAlexander Harkness2014-09-221-1/+1
| |\ | | | | | | 1.8 Protocol Update
| | * Merge branch 'master' into 1.8-ProtocolHowaner2014-09-141-16/+25
| | |\
| | * \ Merge branch 'master' into 1.8-ProtocolHowaner2014-09-131-11/+13
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/Items/ItemHoe.h
| | * | | Added the player list to the 1.8 protocol.Howaner2014-09-091-1/+1
| | | | |
| * | | | Made it compile with clangChris Darnell2014-09-221-2/+2
| | |_|/ | |/| |
* | | | Merge branch 'master' into redstoneTestsTycho2014-09-171-15/+26
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/ChunkInterface.h
| * | | Entities experience water resistanceTiger Wang2014-09-131-16/+25
| | |/ | |/|
| * | Fixed friction being applied whilst airborneTiger Wang2014-09-121-11/+13
| |/ | | | | | | Reported by tonibm9 in #1300.
* / Added first test to show the object can be createdTycho2014-09-171-10/+10
|/
* Fixed style and alpha-sorting.madmaxoft2014-09-031-2/+2
|
* Fixed previous commit's wrong assumptions.madmaxoft2014-09-011-10/+10
| | | | The equipment-getting functions return a copy already, so we can't take a pointer, really.
* Fixed MSVC compilation, improved performance.madmaxoft2014-09-011-30/+59
| | | | We're not creating copies of the equipped items anymore, rather, we're using pointers to them. Also pow() is needlessly slow for a simple second power, and MSVC2008 was confused about the pow() overloads.
* Fixed styleJaume Aloy2014-08-311-7/+5
|
* Added a_Digger checkJaume Aloy2014-08-301-2/+2
|
* More EnchantmentsJaume Aloy2014-08-221-57/+70
| | | | - Added Thorns and Respiration enchantments
* Protection Enchantments, some fixesJaume Aloy2014-08-211-2/+108
| | | | | | | | - Protection echantments (fire, blast, feather falling, protection and projectile). It isn't finished, add secondary effects and optimize the code. - Removed some brackets. - Silk touch fixed.
* Changed if in BlockHandlerJaume Aloy2014-08-191-1/+0
|
* Changed if for switchJaume Aloy2014-08-191-3/+2
|
* Added more enchantments and some fixesJaume Aloy2014-08-191-3/+22
| | | | | | | - Removed Debug messages - Added Punch enchantment effect - Added Silk Touch enchantment - Added Unbreaking enchantment effect
* Added some EnchantmentsJaume Aloy2014-08-191-1/+61
| | | | | | - Bow enchantments: Infinity, Flame and Power - Sword and tools enchantments: Fire Aspect, Bane of Arthropods, Smite, Sharpness
* Attempt to fix knockback and swimming.Howaner2014-08-041-15/+13
|
* Entity.cpp: Air timer comment fixarchshift2014-08-031-1/+1
|
* Code reduction and clarity fixesarchshift2014-08-031-19/+9
|
* Entity.cpp: On portal check, use if-else for current dimensionarchshift2014-08-031-60/+54
| | | | If current dimension corresponds with the portal (nether portal in the nether) send to the overworld, else send to the portal dimension. No need to switch on the dimension and exclude potential others.
* Detrailed whitespaceTiger Wang2014-07-291-3/+3
|
* Merge branch 'master' into portalsTiger Wang2014-07-291-5/+8
|\ | | | | | | | | Conflicts: src/World.h
| * Fix item durability.Howaner2014-07-231-5/+8
| | | | | | Fixes #1181
* | SuggestionsTiger Wang2014-07-231-9/+14
| |
* | Speed improvements, crash fixes, & self-suggestionsTiger Wang2014-07-221-30/+29
| |
* | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-07-221-10/+7
|\| | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp
| * Style: Normalized to no spaces before closing parenthesis.madmaxoft2014-07-211-2/+2
| |
| * Added m_TicksAlive to entities, allows projectiles to hit their creatorsarchshift2014-07-201-0/+3
| |
| * Fixed clamping issuesarchshift2014-07-191-4/+1
| |
| * Merge branch 'Entities'madmaxoft2014-07-181-4/+1
| |\
| | * Fixed many slime bugs.Howaner2014-07-171-4/+1
| | | | | | | | | | | | | | | | | | | | | - Fixed slime hurt/death sound - Added slime spawning on death. - Fixed the max health. - Fixed the attack damage. - Little slimes should not attack players.
* | | SuggestionsTiger Wang2014-07-211-35/+43
| | |
* | | Bug and crash fixesTiger Wang2014-07-201-18/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | Fix failed merge and other issuesTiger Wang2014-07-181-3/+3
| | |
* | | Merge branch 'master' into portalsTiger Wang2014-07-181-59/+48
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | |
| * | More trailing whitespace fixes.madmaxoft2014-07-171-2/+2
| | |
| * | Basic style fixes.madmaxoft2014-07-171-15/+15
| | |
| * | Merge branch 'master' of https://github.com/mc-server/MCServermadmaxoft2014-07-171-23/+8
| |\|
| | * Fixed mob knockbackTiger Wang2014-07-171-23/+8
| | | | | | | | | | | | * Fixes #901
| * | Normalized comments.madmaxoft2014-07-171-14/+14
| |/ | | | | | | | | 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-4/+4
| |\
| | * Merge pull request #1193 from mc-server/deathmessagesMattes D2014-07-171-4/+4
| | |\ | | | | | | | | Death messages
| | | * Resolved backwards compatibility issuesTiger Wang2014-07-161-1/+1
| | | |
| | | * Tailored death messagesTiger Wang2014-07-041-4/+4
| | | |
| * | | Readability and clarity changesarchshift2014-07-141-3/+6
| | | |
| * | | Merge remote-tracking branch 'origin/master' into potionsarchshift2014-07-101-9/+8
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Entities/Player.cpp src/Entities/ProjectileEntity.cpp
| | * | Merge pull request #1135 from mc-server/fixesTiger Wang2014-07-091-8/+4
| | |\ \ | | | |/ | | |/| Fixes to projectiles and the undead
| | | * SuggestionsTiger Wang2014-06-291-2/+3
| | | |
| | | * Some Entity.cpp style improvementsTiger Wang2014-06-221-11/+6
| | | |
| | * | Fixed server forcing players afloatTiger Wang2014-06-281-1/+4
| | |/ | | | | | | | | | * Fixes #1131
| * | Added wither damage type, wither entity effect.archshift2014-06-171-0/+1
| | |
| * | Entity: only fire critical hit if damage type is physicalarchshift2014-06-171-1/+2
| |/
* | Conforms to standardsTiger Wang2014-06-221-1/+1
| |
* | Merge branch 'master' into portalsTiger Wang2014-06-211-20/+18
|\| | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h
| * Merge branch 'master' of github.com:mc-server/MCServerTycho2014-06-161-20/+18
| |
* | Fixed invalid iteratorsTiger Wang2014-06-211-1/+2
| |
* | More suggestionsTiger Wang2014-06-211-1/+1
| |
* | Reverted portal creation codeTiger Wang2014-06-141-100/+0
| | | | | | | | It wasn't really working and needs more development
* | Fixed compileworktycho2014-06-121-1/+1
| |
* | Portals animate and delay correctlyTiger Wang2014-06-121-28/+93
| |
* | Merge branch 'master' into portalsTiger Wang2014-06-101-5/+5
|\| | | | | | | | | | | | | | | | | 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-5/+5
| | | | | | | | Fixes #1039, fixes #851
* | Portal improvements and suggestionsTiger Wang2014-06-101-41/+89
| |
* | SuggestionsTiger Wang2014-06-041-2/+4
| |
* | Configurable portalsTiger Wang2014-06-041-13/+32
| |
* | Added checks for no downfall biomesTiger Wang2014-06-041-1/+1
| |
* | Implemented bed homesTiger Wang2014-06-011-0/+6
| | | | | | | | | | | | + Implemented bed home positions * Fixed some inventory and health server/client mismatches after world change
* | Implemented end and nether portalsTiger Wang2014-05-311-0/+117
|/
* Merge branch 'master' into achievementtranslateTiger Wang2014-05-251-2/+2
|\ | | | | | | | | Conflicts: src/Entities/Player.cpp
| * Fixed datatype conversion warning.Mattes D2014-05-231-2/+2
| |
* | Fixed a cactus Y position issueTiger Wang2014-05-191-2/+3
| |
* | Simplified cacti conditionsTiger Wang2014-05-191-2/+2
|/
* Merge pull request #1010 from mc-server/cactidamageAlexander Harkness2014-05-191-0/+24
|\ | | | | Implemented cacti damage
| * DerpAlexander Harkness2014-05-191-1/+1
| |
| * Should have fixed assumptions about entity width.Alexander Harkness2014-05-191-4/+5
| | | | | | @madmaxoft can you comment?
| * Fixed clanging errors.Alexander Harkness2014-05-191-5/+5
| | | | | | Please @tigerw make sure this is correct.
| * Implemented cacti damageTiger Wang2014-05-181-0/+23
| | | | | | | | | | + Implemented cacti damage * Fixed pickup tossing (PR #994 bug)
* | There's no "round" function in MSVC2008.madmaxoft2014-05-181-1/+1
| |
* | Movement Statisticsandrew2014-05-121-2/+13
| |
* | cEntity::Killed(cEntity *) Handler; Achievement triggers; cPlayer::AwardAchievement()andrew2014-05-121-0/+5
|/
* Suggestions'dTiger Wang2014-05-061-1/+1
|
* Merge branch 'master' into fixes.madmaxoft2014-05-021-15/+81
|\
| * Merge pull request #940 from Howaner/GlobalFixesMattes D2014-04-281-3/+18
| |\ | | | | | | Add entity invulnerable
| | * FixesHowaner2014-04-261-1/+1
| | |
| | * Merge branch 'master' into GlobalFixesHowaner2014-04-261-7/+34
| | |\
| | * | Add entity invulnerableHowaner2014-04-261-3/+18
| | | |
| * | | Fixed warnings.madmaxoft2014-04-271-0/+1
| | | |
| * | | Added static const, initialized fields.archshift2014-04-271-0/+2
| | | |
| * | | Merge pull request #941 from archshift/masterMattes D2014-04-261-5/+26
| |\ \ \ | | |_|/ | |/| | Fixed lots of warnings, and other small changes.
| | * | Further refactored, Reverted Minecart changearchshift2014-04-261-1/+1
| | | | | | | | | | | | | | | | Other small changes.
| | * | Moved switch{} out of GetArmorCoverAgainst().archshift2014-04-261-5/+26
| | |/
| * | Fix formattingr.ramazanov2014-04-251-9/+15
| | |
| * | Fix for clangr.ramazanov2014-04-251-5/+1
| | |
| * | Mobs shouldn't burn when it's Raining & Mob Knockback is far too muchr.ramazanov2014-04-251-8/+5
| | |
| * | Merge branch 'master' of https://github.com/mc-server/MCServerr.ramazanov2014-04-231-3/+23
| |\|
| * | Mobs shouldn't burn when it's Raining #906r.ramazanov2014-04-231-9/+30
| | | | | | | | | | | | Mob Knockback is far too much #776
| * | Mobs shouldn't burn when it's Raining #906r.ramazanov2014-04-211-5/+12
| | |
* | | More comments!Tiger Wang2014-04-271-1/+1
| | | | | | | | | | | | | | | * Also fixed a potential issue with position sending - if someone moved slowly enough, their position would never be updated.
* | | Implemented suggestionsTiger Wang2014-04-241-7/+6
| | |
* | | Merge branch 'master' into fixesTiger Wang2014-04-241-3/+23
|\ \ \ | | |/ | |/| | | | | | | Conflicts: src/World.h
| * | Renamed getter and setter for IsFireproof.archshift2014-04-231-1/+1
| | |
| * | Fireproof status getter and setter.archshift2014-04-231-0/+11
| | |
| * | Fixed indentation and changed m_Fireproof to m_IsFireproof.archshift2014-04-221-12/+12
| | |
| * | Lay foundation for fireproof entities.archshift2014-04-221-3/+12
| |/ | | | | | | Prevent any entities with the m_Fireproof flag from taking fire or lava damage.
* / Some change to Entity.cppTiger Wang2014-04-231-92/+90
|/ | | | * Added comments to BroadcastMovementUpdate() and the collision tracer
* Fixed #906Tiger Wang2014-04-181-0/+10
|
* Merge pull request #891 from mc-server/fixesMattes D2014-04-171-66/+49
|\ | | | | Fixes to redstone & general
| * Entities handle chunks properly againTiger Wang2014-04-121-66/+49
| | | | | | | | | | * Entities properly handle chunks * Changed EntityStatus enums to be less shouty
* | Added new AI rulesTiger Wang2014-04-171-1/+1
|/ | | | | | | + 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
* Fixed Endiannes conversion routines for floats and doubles.madmaxoft2014-04-051-1/+1
| | | | | This bug has been introduced in 8825d30aabbee8cb2e452dc5a17deb6f9b6892a7. This change fixes #854.
* Minor Entity.cpp cleanupTiger Wang2014-03-201-12/+9
|
* Merge branch 'master' into awesometntTiger Wang2014-03-181-1/+1
|\ | | | | | | | | Conflicts: src/ChunkMap.cpp
| * Unified Matrix4 codeandrew2014-03-111-1/+1
| |
* | Added extra awesomeness to TNTTiger Wang2014-03-051-188/+192
|/ | | | | | | + 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
* g_BlockXXX => cBlockInfo::XXXandrew2014-03-011-3/+3
|
* Fixed most of the reordering warningsTycho2014-02-051-2/+2
|
* Creative players take Plugin damageTiger Wang2014-02-021-1/+2
|
* All mobs now drown (fixes #54)Tiger Wang2014-01-251-1/+94
| | | | | * Implemented mob drowning * Iron Golems and squids are excluded
* Removed unused ReferenceManagerTiger Wang2014-01-241-36/+0
|
* Fixed crash with failed entity-loading.madmaxoft2014-01-241-1/+2
| | | | | | This should fix issues reported in: http://forum.mc-server.org/showthread.php?tid=1328 http://forum.mc-server.org/showthread.php?tid=1308
* Merge remote-tracking branch 'origin/customnames'madmaxoft2014-01-171-3/+3
|\
| * Removed obsoleted functionsTiger Wang2014-01-161-3/+3
| |
* | Disabled excessive entity-related logging in Debug mode.madmaxoft2014-01-161-1/+11
|/
* Final improvements to MinecartsTiger Wang2014-01-131-36/+8
| | | | | | | | | | | | | * Fixed curved rails being a little broken + Implemented detector rails + Implemented block collisions on rails * Fixed snapping to rail - Removed minecart physics conditions in Entity.cpp as minecarts use their own simulator when on rails Fixes #148 and #217; partially implemented #215. This is Cave Johnson, and we're done here.
* Detaching improvementsTiger Wang2014-01-131-3/+5
| | | | | * Players now search for an area around themselves to teleport to when detaching from something
* Multiple enhancements and fixes to minecartsTiger Wang2014-01-121-1/+4
| | | | | | + They are destroyed instantly by creative mode * Physics is much improved + Basic implementation of powered rails
* Improved knockback animationTiger Wang2013-12-241-3/+3
| | | | | | | * Critical hits now actually increase damage * Looking down at an entity and hitting them still produces upwards motion (as per Vanilla experience) * Reduced force to be more realistic
* Fixed a comment in Entity.cppTiger Wang2013-12-231-1/+1
|
* Implemented knockback and critical hitTiger Wang2013-12-221-4/+21
|
* More reordering fixes.madmaxoft2013-12-201-2/+2
|
* Sorted a few constructors to remove warnings.madmaxoft2013-12-201-5/+5
|
* Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT).madmaxoft2013-12-201-1/+1
|
* Added HandleSpeedFromAttachee so an entity can override the function.STRWarrior2013-12-161-4/+14
|
* Fixed angle normalization typo.madmaxoft2013-12-081-1/+1
|
* Fixed normalizing large angles.madmaxoft2013-12-081-6/+3
|
* Moved bindings-related to a Bindings subfolder.madmaxoft2013-12-081-1/+1
| | | | Ref.: #407
* Moved source to srcAlexander Harkness2013-11-241-0/+1450
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 01:48:35 +0100