Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Speed improvements, crash fixes, & self-suggestions | Tiger Wang | 2014-07-22 | 1 | -1/+0 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-07-22 | 1 | -7/+7 |
|\ | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp | ||||
| * | Style: Normalized to no spaces before closing parenthesis. | madmaxoft | 2014-07-21 | 1 | -7/+7 |
| | | |||||
* | | Suggestions | Tiger Wang | 2014-07-21 | 1 | -1/+1 |
| | | |||||
* | | Bug and crash fixes | Tiger Wang | 2014-07-20 | 1 | -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 issues | Tiger Wang | 2014-07-18 | 1 | -10/+1 |
| | | |||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-07-18 | 1 | -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. | madmaxoft | 2014-07-17 | 1 | -13/+13 |
| | | |||||
| * | Basic style fixes. | madmaxoft | 2014-07-17 | 1 | -2/+2 |
| | | |||||
| * | Normalized comments. | madmaxoft | 2014-07-17 | 1 | -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 potions | madmaxoft | 2014-07-17 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge pull request #1193 from mc-server/deathmessages | Mattes D | 2014-07-17 | 1 | -1/+1 |
| | |\ | | | | | | | | | Death messages | ||||
| | | * | Tailored death messages | Tiger Wang | 2014-07-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'origin/master' into potions | madmaxoft | 2014-07-17 | 1 | -1/+1 |
| |\| | | |||||
| | * | | Another fix for excessive food drain | Tiger Wang | 2014-07-16 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'origin/master' into potions | archshift | 2014-07-12 | 1 | -13/+30 |
| |\| | | |||||
| | * | | Player data filenames are based on UUID. | madmaxoft | 2014-07-11 | 1 | -13/+21 |
| | | | | |||||
| | * | | Preparation for player UUID-based storage: LoadFromFile() | madmaxoft | 2014-07-11 | 1 | -0/+9 |
| | |/ | |||||
| * | | Merge remote-tracking branch 'origin/master' into potions | archshift | 2014-07-10 | 1 | -3/+15 |
| |\| | | | | | | | | | | | | | | | | Conflicts: src/Entities/Player.cpp src/Entities/ProjectileEntity.cpp | ||||
| | * | Merge pull request #1138 from mc-server/enderchest | Mattes D | 2014-07-02 | 1 | -2/+9 |
| | |\ | | | | | | | | | Properly implemented enderchests | ||||
| | | * | Properly implemented enderchests | Tiger Wang | 2014-06-29 | 1 | -2/+9 |
| | | | | |||||
| | * | | Fixed player teleport food drain | Tiger Wang | 2014-07-02 | 1 | -0/+5 |
| | |/ | |||||
| | * | Add bow charging animation | Howaner | 2014-06-16 | 1 | -1/+1 |
| | | | |||||
| * | | EntityEffects.x -> EntityEffect.x, Object-Oriented effects | archshift | 2014-06-19 | 1 | -3/+0 |
| | | | | | | | | | | | | Changed effect map to take a pointer of the effect as a result. | ||||
| * | | Pawn: renamed HandleEntityEffects to HandleEntityEffect | archshift | 2014-06-17 | 1 | -1/+1 |
| | | | | | | | | | | | | Exported entity effect functions for ToLua and documented them in APIDesc.lua | ||||
| * | | Player: made healing instantaneous | archshift | 2014-06-17 | 1 | -1/+1 |
| | | | |||||
| * | | Player: Removed food-poisoning-specific code, set duration to 30 seconds | archshift | 2014-06-17 | 1 | -6/+1 |
| | | | | | | | | | | | | http://minecraft.gamepedia.com/Hunger#Behavior | ||||
| * | | Entity effects: Added handlers for entity effects | archshift | 2014-06-17 | 1 | -0/+3 |
| |/ | | | | | | | | | | | Implemented hunger, instant health, damage, poison, regen Added "template" entity effect implementations | ||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-06-21 | 1 | -2/+9 |
|\| | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h | ||||
| * | Merge branch 'master' of github.com:mc-server/MCServer | Tycho | 2014-06-16 | 1 | -2/+9 |
| | | |||||
* | | More suggestions | Tiger Wang | 2014-06-21 | 1 | -2/+4 |
| | | |||||
* | | Implemented PR suggestions | archshift | 2014-06-16 | 1 | -1/+2 |
| | | | | | | | | | | | | | | Furnace.txt: newline BlockID: removed extraneous dimension mapping cEntity: fixed typo cPlayer: WorldPtr typedef | ||||
* | | Portals animate and delay correctly | Tiger Wang | 2014-06-12 | 1 | -5/+5 |
| | | |||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-06-10 | 1 | -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 D | 2014-06-08 | 1 | -0/+2 |
| | | | | | | | | This alone doesn't work properly yet, further changes to cPlayer are needed. | ||||
* | | Suggestions | Tiger Wang | 2014-06-04 | 1 | -4/+8 |
| | | |||||
* | | Implemented bed homes | Tiger Wang | 2014-06-01 | 1 | -3/+12 |
| | | | | | | | | | | | | + Implemented bed home positions * Fixed some inventory and health server/client mismatches after world change | ||||
* | | Implemented end and nether portals | Tiger Wang | 2014-05-31 | 1 | -1/+1 |
|/ | |||||
* | Cleaned up cPlayer::UpdateMovementStats; Wither achievements | andrew | 2014-05-20 | 1 | -0/+3 |
| | |||||
* | Fixes | andrew | 2014-05-13 | 1 | -6/+3 |
| | |||||
* | Movement Statistics | andrew | 2014-05-12 | 1 | -0/+6 |
| | |||||
* | cEntity::Killed(cEntity *) Handler; Achievement triggers; cPlayer::AwardAchievement() | andrew | 2014-05-12 | 1 | -0/+11 |
| | |||||
* | Statistic Manager | andrew | 2014-05-11 | 1 | -0/+7 |
| | |||||
* | Merge branch 'master' into fixes. | madmaxoft | 2014-05-02 | 1 | -1/+1 |
|\ | |||||
| * | Add entity invulnerable | Howaner | 2014-04-26 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into fixes | Tiger Wang | 2014-04-24 | 1 | -1/+1 |
|\| | | | | | | | | | Conflicts: src/World.h | ||||
| * | Fixed Flint and Steel, reverted Minecart change, renamed a parameter name | jfhumann | 2014-04-19 | 1 | -1/+1 |
| | | |||||
| * | Did some static analysis, fixed some bugs and optimized a lot of code | jfhumann | 2014-04-18 | 1 | -1/+1 |
| | | |||||
* | | Some change to Entity.cpp | Tiger Wang | 2014-04-23 | 1 | -3/+0 |
|/ | | | | * Added comments to BroadcastMovementUpdate() and the collision tracer | ||||
* | Added cPlayer:SendRotation() API function. | madmaxoft | 2014-04-05 | 1 | -0/+6 |
| | |||||
* | Plugins can set flying speed. | madmaxoft | 2014-03-20 | 1 | -72/+88 |
| | |||||
* | Rewritten player speeds to be relative unit-less. | madmaxoft | 2014-03-20 | 1 | -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/beds | Mattes D | 2014-03-16 | 1 | -3/+14 |
|\ | | | | | Beds now work properly, fixes #707 | ||||
| * | Beds now work properly fixes #707 | Tiger Wang | 2014-03-09 | 1 | -3/+14 |
| | | | | | | | | | | | | | | | | Also fixes FS392 Conflicts: src/Blocks/WorldInterface.h src/ClientHandle.cpp | ||||
* | | CheckBlockInteractionsRate() fixed & enabled | Tiger Wang | 2014-03-09 | 1 | -10/+1 |
|/ | |||||
* | Links sent via chat messages are clickable. | madmaxoft | 2014-02-16 | 1 | -1/+2 |
| | | | | Fixes #658. | ||||
* | Fixed minor formatting issues from #682 | Tiger Wang | 2014-02-16 | 1 | -2/+0 |
| | | | | | - Removed unused PlaySoundEffect * Simplified and parenthesised code | ||||
* | Add Exp Bottle Effects | Howaner | 2014-02-16 | 1 | -0/+2 |
| | |||||
* | Implemented cCompositeChat. | madmaxoft | 2014-02-15 | 1 | -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 playerimprovements | Tiger Wang | 2014-02-09 | 1 | -1/+0 |
|\ | | | | | | | | | | | | | Conflicts: src/Root.cpp src/Root.h src/World.cpp | ||||
| * | Removed deprecated HasCommand function | STRWarrior | 2014-02-05 | 1 | -1/+0 |
| | | |||||
* | | Improved chat messaging functions | Tiger Wang | 2014-02-07 | 1 | -7/+8 |
| | | | | | | | | | | | | | | * Moved string manipulation into cClientHandle and therefore... + Added configuration option for prefixes. * Cleaned up code. * Updated documentation for API. | ||||
* | | Added more chat functions | Tiger Wang | 2014-02-06 | 1 | -1/+0 |
| | | |||||
* | | Fixed annoying creative on fire bug | Tiger Wang | 2014-02-05 | 1 | -0/+3 |
| | | |||||
* | | Added more SendMessageXXX() functions | Tiger Wang | 2014-02-04 | 1 | -0/+4 |
| | | |||||
* | | Added SendMessageXXX() to cPlayer | Tiger Wang | 2014-02-03 | 1 | -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 mobs | Tiger Wang | 2014-01-25 | 1 | -1/+1 |
| | | | | | | + Implemented mobile fall damage * Formatting fixes + Defined new Position->Integer macros | ||||
* | All mobs now drown (fixes #54) | Tiger Wang | 2014-01-25 | 1 | -22/+0 |
| | | | | | * Implemented mob drowning * Iron Golems and squids are excluded | ||||
* | Merge remote-tracking branch 'MikeHunsinger/master' | madmaxoft | 2014-01-24 | 1 | -1/+8 |
|\ | |||||
| * | Fixed spacing and doxycomments. | Mike Hunsinger | 2014-01-24 | 1 | -3/+3 |
| | | |||||
| * | Split TossItem into three Toss functions (Held, Equipped and Pickup) | Mike Hunsinger | 2014-01-23 | 1 | -1/+8 |
| | | |||||
* | | Scoreboard deserialization | andrew | 2014-01-20 | 1 | -2/+5 |
| | | |||||
* | | Basic scoreboard implementation | andrew | 2014-01-19 | 1 | -1/+10 |
|/ | |||||
* | Detaching improvements | Tiger Wang | 2014-01-13 | 1 | -0/+2 |
| | | | | | * Players now search for an area around themselves to teleport to when detaching from something | ||||
* | converted commneted paramater names to the unused macro | Tycho Bickerstaff | 2013-12-22 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of github.com:mc-server/MCServer | Tycho Bickerstaff | 2013-12-22 | 1 | -0/+3 |
|\ | |||||
| * | Floater now dissapears when the player doesn't have an fishing rod equipped. | STRWarrior | 2013-12-21 | 1 | -0/+3 |
| | | |||||
* | | Root is now warnings clean | Tycho Bickerstaff | 2013-12-21 | 1 | -2/+2 |
|/ | |||||
* | Sorted a few constructors to remove warnings. | madmaxoft | 2013-12-20 | 1 | -3/+6 |
| | |||||
* | Implented IsFishing, SetIsFishing and GetFloaterID(). | STRWarrior | 2013-12-19 | 1 | -0/+10 |
| | |||||
* | Fixed cClientHandle::Tick() being called from two threads. | madmaxoft | 2013-12-16 | 1 | -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. | STRWarrior | 2013-12-15 | 1 | -2/+2 |
| | |||||
* | This adds a function that allows you to 'shoot' a player towards a direction. | STRWarrior | 2013-12-15 | 1 | -0/+3 |
| | |||||
* | Added m_IsFlying and m_CanFly. Both have a Get and Set function. Added cClientHandle::SendPlayerAbilities() function | STRWarrior | 2013-12-15 | 1 | -1/+13 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-24 | 1 | -17/+26 |
| | | | | | Conflicts: GNUmakefile | ||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 1 | -0/+447 |