summaryrefslogtreecommitdiffstats
path: root/src/Entities/Player.h (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Fixed hunger bugs, Implemented golden apple, added jump statistic, added correct food effects.Howaner2014-07-311-4/+1
|
* Merge branch 'master' into portalsTiger Wang2014-07-291-2/+2
|\ | | | | | | | | Conflicts: src/World.h
| * Merge branch 'master' into Inventory2Howaner2014-07-261-1/+1
| |\ | | | | | | | | | | | | Conflicts: src/BlockInfo.cpp
| | * Removed redundant semicolons and re-added warningarchshift2014-07-241-1/+1
| | |
| * | Fix item durability.Howaner2014-07-231-1/+1
| |/ | | | | Fixes #1181
* | SuggestionsTiger Wang2014-07-231-3/+3
| |
* | Speed improvements, crash fixes, & self-suggestionsTiger Wang2014-07-221-1/+0
| |
* | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-07-221-7/+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-7/+7
| |
* | SuggestionsTiger Wang2014-07-211-1/+1
| |
* | 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
* | Fix failed merge and other issuesTiger Wang2014-07-181-10/+1
| |
* | Merge branch 'master' into portalsTiger Wang2014-07-181-37/+69
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-13/+13
| |
| * Basic style fixes.madmaxoft2014-07-171-2/+2
| |
| * Normalized comments.madmaxoft2014-07-171-3/+3
| | | | | | | | | | 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 potionsmadmaxoft2014-07-171-1/+1
| |\| |
| | * | Another fix for excessive food drainTiger Wang2014-07-161-1/+1
| | | |
| * | | Merge remote-tracking branch 'origin/master' into potionsarchshift2014-07-121-13/+30
| |\| |
| | * | Player data filenames are based on UUID.madmaxoft2014-07-111-13/+21
| | | |
| | * | Preparation for player UUID-based storage: LoadFromFile()madmaxoft2014-07-111-0/+9
| | |/
| * | Merge remote-tracking branch 'origin/master' into potionsarchshift2014-07-101-3/+15
| |\| | | | | | | | | | | | | | | | Conflicts: src/Entities/Player.cpp src/Entities/ProjectileEntity.cpp
| | * Merge pull request #1138 from mc-server/enderchestMattes D2014-07-021-2/+9
| | |\ | | | | | | | | Properly implemented enderchests
| | | * Properly implemented enderchestsTiger Wang2014-06-291-2/+9
| | | |
| | * | Fixed player teleport food drainTiger Wang2014-07-021-0/+5
| | |/
| | * Add bow charging animationHowaner2014-06-161-1/+1
| | |
| * | EntityEffects.x -> EntityEffect.x, Object-Oriented effectsarchshift2014-06-191-3/+0
| | | | | | | | | | | | Changed effect map to take a pointer of the effect as a result.
| * | Pawn: renamed HandleEntityEffects to HandleEntityEffectarchshift2014-06-171-1/+1
| | | | | | | | | | | | Exported entity effect functions for ToLua and documented them in APIDesc.lua
| * | Player: made healing instantaneousarchshift2014-06-171-1/+1
| | |
| * | Player: Removed food-poisoning-specific code, set duration to 30 secondsarchshift2014-06-171-6/+1
| | | | | | | | | | | | http://minecraft.gamepedia.com/Hunger#Behavior
| * | Entity effects: Added handlers for entity effectsarchshift2014-06-171-0/+3
| |/ | | | | | | | | | | Implemented hunger, instant health, damage, poison, regen Added "template" entity effect implementations
* | Merge branch 'master' into portalsTiger Wang2014-06-211-2/+9
|\| | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h
| * Merge branch 'master' of github.com:mc-server/MCServerTycho2014-06-161-2/+9
| |
* | More suggestionsTiger Wang2014-06-211-2/+4
| |
* | Implemented PR suggestionsarchshift2014-06-161-1/+2
| | | | | | | | | | | | | | Furnace.txt: newline BlockID: removed extraneous dimension mapping cEntity: fixed typo cPlayer: WorldPtr typedef
* | Portals animate and delay correctlyTiger Wang2014-06-121-5/+5
| |
* | Merge branch 'master' into portalsTiger Wang2014-06-101-0/+2
|\| | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/Player.cpp src/Entities/Player.h src/Protocol/Protocol125.cpp src/Protocol/Protocol17x.cpp
| * Added queue for adding entities to cWorld.Mattes D2014-06-081-0/+2
| | | | | | | | This alone doesn't work properly yet, further changes to cPlayer are needed.
* | SuggestionsTiger Wang2014-06-041-4/+8
| |
* | Implemented bed homesTiger Wang2014-06-011-3/+12
| | | | | | | | | | | | + Implemented bed home positions * Fixed some inventory and health server/client mismatches after world change
* | Implemented end and nether portalsTiger Wang2014-05-311-1/+1
|/
* Cleaned up cPlayer::UpdateMovementStats; Wither achievementsandrew2014-05-201-0/+3
|
* Fixesandrew2014-05-131-6/+3
|
* Movement Statisticsandrew2014-05-121-0/+6
|
* cEntity::Killed(cEntity *) Handler; Achievement triggers; cPlayer::AwardAchievement()andrew2014-05-121-0/+11
|
* Statistic Managerandrew2014-05-111-0/+7
|
* Merge branch 'master' into fixes.madmaxoft2014-05-021-1/+1
|\
| * Add entity invulnerableHowaner2014-04-261-1/+1
| |
* | Merge branch 'master' into fixesTiger Wang2014-04-241-1/+1
|\| | | | | | | | | Conflicts: src/World.h
| * Fixed Flint and Steel, reverted Minecart change, renamed a parameter namejfhumann2014-04-191-1/+1
| |
| * Did some static analysis, fixed some bugs and optimized a lot of codejfhumann2014-04-181-1/+1
| |
* | Some change to Entity.cppTiger Wang2014-04-231-3/+0
|/ | | | * Added comments to BroadcastMovementUpdate() and the collision tracer
* Added cPlayer:SendRotation() API function.madmaxoft2014-04-051-0/+6
|
* Plugins can set flying speed.madmaxoft2014-03-201-72/+88
|
* Rewritten player speeds to be relative unit-less.madmaxoft2014-03-201-5/+9
| | | | Value of 1 means "default speed", 2 means "double the speed", 0.5 means "half the speed". This allows for easier plugins and is more future-proof.
* Merge pull request #782 from mc-server/bedsMattes D2014-03-161-3/+14
|\ | | | | Beds now work properly, fixes #707
| * Beds now work properly fixes #707Tiger Wang2014-03-091-3/+14
| | | | | | | | | | | | | | | | Also fixes FS392 Conflicts: src/Blocks/WorldInterface.h src/ClientHandle.cpp
* | CheckBlockInteractionsRate() fixed & enabledTiger Wang2014-03-091-10/+1
|/
* Links sent via chat messages are clickable.madmaxoft2014-02-161-1/+2
| | | | Fixes #658.
* Fixed minor formatting issues from #682Tiger Wang2014-02-161-2/+0
| | | | | - Removed unused PlaySoundEffect * Simplified and parenthesised code
* Add Exp Bottle EffectsHowaner2014-02-161-0/+2
|
* Implemented cCompositeChat.madmaxoft2014-02-151-0/+1
| | | | | This allows plugins to send composite chat messages, containing URLs, commands to run and cmdline suggestions. Fixes #678.
* Merge remote-tracking branch 'origin/master' into playerimprovementsTiger Wang2014-02-091-1/+0
|\ | | | | | | | | | | | | Conflicts: src/Root.cpp src/Root.h src/World.cpp
| * Removed deprecated HasCommand functionSTRWarrior2014-02-051-1/+0
| |
* | Improved chat messaging functionsTiger Wang2014-02-071-7/+8
| | | | | | | | | | | | | | * Moved string manipulation into cClientHandle and therefore... + Added configuration option for prefixes. * Cleaned up code. * Updated documentation for API.
* | Added more chat functionsTiger Wang2014-02-061-1/+0
| |
* | Fixed annoying creative on fire bugTiger Wang2014-02-051-0/+3
| |
* | Added more SendMessageXXX() functionsTiger Wang2014-02-041-0/+4
| |
* | Added SendMessageXXX() to cPlayerTiger Wang2014-02-031-0/+3
|/ | | | | | As requested by @bearbin, one no longer needs to download a file that links to Core. The server does it! Hopefully this encourages standards compliance.
* Implemented fall damage for mobsTiger Wang2014-01-251-1/+1
| | | | | | + Implemented mobile fall damage * Formatting fixes + Defined new Position->Integer macros
* All mobs now drown (fixes #54)Tiger Wang2014-01-251-22/+0
| | | | | * Implemented mob drowning * Iron Golems and squids are excluded
* Merge remote-tracking branch 'MikeHunsinger/master'madmaxoft2014-01-241-1/+8
|\
| * Fixed spacing and doxycomments.Mike Hunsinger2014-01-241-3/+3
| |
| * Split TossItem into three Toss functions (Held, Equipped and Pickup)Mike Hunsinger2014-01-231-1/+8
| |
* | Scoreboard deserializationandrew2014-01-201-2/+5
| |
* | Basic scoreboard implementationandrew2014-01-191-1/+10
|/
* Detaching improvementsTiger Wang2014-01-131-0/+2
| | | | | * Players now search for an area around themselves to teleport to when detaching from something
* converted commneted paramater names to the unused macroTycho Bickerstaff2013-12-221-1/+1
|
* Merge branch 'master' of github.com:mc-server/MCServerTycho Bickerstaff2013-12-221-0/+3
|\
| * Floater now dissapears when the player doesn't have an fishing rod equipped.STRWarrior2013-12-211-0/+3
| |
* | Root is now warnings cleanTycho Bickerstaff2013-12-211-2/+2
|/
* Sorted a few constructors to remove warnings.madmaxoft2013-12-201-3/+6
|
* Implented IsFishing, SetIsFishing and GetFloaterID().STRWarrior2013-12-191-0/+10
|
* Fixed cClientHandle::Tick() being called from two threads.madmaxoft2013-12-161-2/+0
| | | | | When the player was initialized, the Tick() function continued to stream chunk, while the cWorld called Tick() from its tick thread. Final fix for #187.
* Renamed ShootTo function to ForceSetSpeed.STRWarrior2013-12-151-2/+2
|
* This adds a function that allows you to 'shoot' a player towards a direction.STRWarrior2013-12-151-0/+3
|
* Added m_IsFlying and m_CanFly. Both have a Get and Set function. Added cClientHandle::SendPlayerAbilities() functionSTRWarrior2013-12-151-1/+13
|
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-241-17/+26
| | | | | Conflicts: GNUmakefile
* Moved source to srcAlexander Harkness2013-11-241-0/+447