Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Suggestions | Tiger Wang | 2014-07-23 | 1 | -9/+14 |
| | |||||
* | Speed improvements, crash fixes, & self-suggestions | Tiger Wang | 2014-07-22 | 1 | -30/+29 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-07-22 | 1 | -10/+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 | -2/+2 |
| | | |||||
| * | Added m_TicksAlive to entities, allows projectiles to hit their creators | archshift | 2014-07-20 | 1 | -0/+3 |
| | | |||||
| * | Fixed clamping issues | archshift | 2014-07-19 | 1 | -4/+1 |
| | | |||||
| * | Merge branch 'Entities' | madmaxoft | 2014-07-18 | 1 | -4/+1 |
| |\ | |||||
| | * | Fixed many slime bugs. | Howaner | 2014-07-17 | 1 | -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. | ||||
* | | | Suggestions | Tiger Wang | 2014-07-21 | 1 | -35/+43 |
| | | | |||||
* | | | Bug and crash fixes | Tiger Wang | 2014-07-20 | 1 | -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 issues | Tiger Wang | 2014-07-18 | 1 | -3/+3 |
| | | | |||||
* | | | Merge branch 'master' into portals | Tiger Wang | 2014-07-18 | 1 | -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. | madmaxoft | 2014-07-17 | 1 | -1/+1 |
| | | | |||||
| * | | More trailing whitespace fixes. | madmaxoft | 2014-07-17 | 1 | -2/+2 |
| | | | |||||
| * | | Basic style fixes. | madmaxoft | 2014-07-17 | 1 | -15/+15 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/mc-server/MCServer | madmaxoft | 2014-07-17 | 1 | -23/+8 |
| |\| | |||||
| | * | Fixed mob knockback | Tiger Wang | 2014-07-17 | 1 | -23/+8 |
| | | | | | | | | | | | | * Fixes #901 | ||||
| * | | Normalized comments. | madmaxoft | 2014-07-17 | 1 | -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 potions | madmaxoft | 2014-07-17 | 1 | -4/+4 |
| |\ | |||||
| | * | Merge pull request #1193 from mc-server/deathmessages | Mattes D | 2014-07-17 | 1 | -4/+4 |
| | |\ | | | | | | | | | Death messages | ||||
| | | * | Resolved backwards compatibility issues | Tiger Wang | 2014-07-16 | 1 | -1/+1 |
| | | | | |||||
| | | * | Tailored death messages | Tiger Wang | 2014-07-04 | 1 | -4/+4 |
| | | | | |||||
| * | | | Readability and clarity changes | archshift | 2014-07-14 | 1 | -3/+6 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'origin/master' into potions | archshift | 2014-07-10 | 1 | -9/+8 |
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Entities/Player.cpp src/Entities/ProjectileEntity.cpp | ||||
| | * | | Merge pull request #1135 from mc-server/fixes | Tiger Wang | 2014-07-09 | 1 | -8/+4 |
| | |\ \ | | | |/ | | |/| | Fixes to projectiles and the undead | ||||
| | | * | Suggestions | Tiger Wang | 2014-06-29 | 1 | -2/+3 |
| | | | | |||||
| | | * | Some Entity.cpp style improvements | Tiger Wang | 2014-06-22 | 1 | -11/+6 |
| | | | | |||||
| | * | | Fixed server forcing players afloat | Tiger Wang | 2014-06-28 | 1 | -1/+4 |
| | |/ | | | | | | | | | | * Fixes #1131 | ||||
| * | | Added wither damage type, wither entity effect. | archshift | 2014-06-17 | 1 | -0/+1 |
| | | | |||||
| * | | Entity: only fire critical hit if damage type is physical | archshift | 2014-06-17 | 1 | -1/+2 |
| |/ | |||||
* | | Conforms to standards | Tiger Wang | 2014-06-22 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-06-21 | 1 | -20/+18 |
|\| | | | | | | | | | | | | | 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 | -20/+18 |
| | | |||||
* | | Fixed invalid iterators | Tiger Wang | 2014-06-21 | 1 | -1/+2 |
| | | |||||
* | | More suggestions | Tiger Wang | 2014-06-21 | 1 | -1/+1 |
| | | |||||
* | | Reverted portal creation code | Tiger Wang | 2014-06-14 | 1 | -100/+0 |
| | | | | | | | | It wasn't really working and needs more development | ||||
* | | Fixed compile | worktycho | 2014-06-12 | 1 | -1/+1 |
| | | |||||
* | | Portals animate and delay correctly | Tiger Wang | 2014-06-12 | 1 | -28/+93 |
| | | |||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-06-10 | 1 | -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 D | 2014-06-08 | 1 | -5/+5 |
| | | | | | | | | Fixes #1039, fixes #851 | ||||
* | | Portal improvements and suggestions | Tiger Wang | 2014-06-10 | 1 | -41/+89 |
| | | |||||
* | | Suggestions | Tiger Wang | 2014-06-04 | 1 | -2/+4 |
| | | |||||
* | | Configurable portals | Tiger Wang | 2014-06-04 | 1 | -13/+32 |
| | | |||||
* | | Added checks for no downfall biomes | Tiger Wang | 2014-06-04 | 1 | -1/+1 |
| | | |||||
* | | Implemented bed homes | Tiger Wang | 2014-06-01 | 1 | -0/+6 |
| | | | | | | | | | | | | + 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 | -0/+117 |
|/ | |||||
* | Merge branch 'master' into achievementtranslate | Tiger Wang | 2014-05-25 | 1 | -2/+2 |
|\ | | | | | | | | | Conflicts: src/Entities/Player.cpp | ||||
| * | Fixed datatype conversion warning. | Mattes D | 2014-05-23 | 1 | -2/+2 |
| | | |||||
* | | Fixed a cactus Y position issue | Tiger Wang | 2014-05-19 | 1 | -2/+3 |
| | | |||||
* | | Simplified cacti conditions | Tiger Wang | 2014-05-19 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #1010 from mc-server/cactidamage | Alexander Harkness | 2014-05-19 | 1 | -0/+24 |
|\ | | | | | Implemented cacti damage | ||||
| * | Derp | Alexander Harkness | 2014-05-19 | 1 | -1/+1 |
| | | |||||
| * | Should have fixed assumptions about entity width. | Alexander Harkness | 2014-05-19 | 1 | -4/+5 |
| | | | | | | @madmaxoft can you comment? | ||||
| * | Fixed clanging errors. | Alexander Harkness | 2014-05-19 | 1 | -5/+5 |
| | | | | | | Please @tigerw make sure this is correct. | ||||
| * | Implemented cacti damage | Tiger Wang | 2014-05-18 | 1 | -0/+23 |
| | | | | | | | | | | + Implemented cacti damage * Fixed pickup tossing (PR #994 bug) | ||||
* | | There's no "round" function in MSVC2008. | madmaxoft | 2014-05-18 | 1 | -1/+1 |
| | | |||||
* | | Movement Statistics | andrew | 2014-05-12 | 1 | -2/+13 |
| | | |||||
* | | cEntity::Killed(cEntity *) Handler; Achievement triggers; cPlayer::AwardAchievement() | andrew | 2014-05-12 | 1 | -0/+5 |
|/ | |||||
* | Suggestions'd | Tiger Wang | 2014-05-06 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into fixes. | madmaxoft | 2014-05-02 | 1 | -15/+81 |
|\ | |||||
| * | Merge pull request #940 from Howaner/GlobalFixes | Mattes D | 2014-04-28 | 1 | -3/+18 |
| |\ | | | | | | | Add entity invulnerable | ||||
| | * | Fixes | Howaner | 2014-04-26 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'master' into GlobalFixes | Howaner | 2014-04-26 | 1 | -7/+34 |
| | |\ | |||||
| | * | | Add entity invulnerable | Howaner | 2014-04-26 | 1 | -3/+18 |
| | | | | |||||
| * | | | Fixed warnings. | madmaxoft | 2014-04-27 | 1 | -0/+1 |
| | | | | |||||
| * | | | Added static const, initialized fields. | archshift | 2014-04-27 | 1 | -0/+2 |
| | | | | |||||
| * | | | Merge pull request #941 from archshift/master | Mattes D | 2014-04-26 | 1 | -5/+26 |
| |\ \ \ | | |_|/ | |/| | | Fixed lots of warnings, and other small changes. | ||||
| | * | | Further refactored, Reverted Minecart change | archshift | 2014-04-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Other small changes. | ||||
| | * | | Moved switch{} out of GetArmorCoverAgainst(). | archshift | 2014-04-26 | 1 | -5/+26 |
| | |/ | |||||
| * | | Fix formatting | r.ramazanov | 2014-04-25 | 1 | -9/+15 |
| | | | |||||
| * | | Fix for clang | r.ramazanov | 2014-04-25 | 1 | -5/+1 |
| | | | |||||
| * | | Mobs shouldn't burn when it's Raining & Mob Knockback is far too much | r.ramazanov | 2014-04-25 | 1 | -8/+5 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/mc-server/MCServer | r.ramazanov | 2014-04-23 | 1 | -3/+23 |
| |\| | |||||
| * | | Mobs shouldn't burn when it's Raining #906 | r.ramazanov | 2014-04-23 | 1 | -9/+30 |
| | | | | | | | | | | | | Mob Knockback is far too much #776 | ||||
| * | | Mobs shouldn't burn when it's Raining #906 | r.ramazanov | 2014-04-21 | 1 | -5/+12 |
| | | | |||||
* | | | More comments! | Tiger Wang | 2014-04-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | * Also fixed a potential issue with position sending - if someone moved slowly enough, their position would never be updated. | ||||
* | | | Implemented suggestions | Tiger Wang | 2014-04-24 | 1 | -7/+6 |
| | | | |||||
* | | | Merge branch 'master' into fixes | Tiger Wang | 2014-04-24 | 1 | -3/+23 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: src/World.h | ||||
| * | | Renamed getter and setter for IsFireproof. | archshift | 2014-04-23 | 1 | -1/+1 |
| | | | |||||
| * | | Fireproof status getter and setter. | archshift | 2014-04-23 | 1 | -0/+11 |
| | | | |||||
| * | | Fixed indentation and changed m_Fireproof to m_IsFireproof. | archshift | 2014-04-22 | 1 | -12/+12 |
| | | | |||||
| * | | Lay foundation for fireproof entities. | archshift | 2014-04-22 | 1 | -3/+12 |
| |/ | | | | | | | Prevent any entities with the m_Fireproof flag from taking fire or lava damage. | ||||
* / | Some change to Entity.cpp | Tiger Wang | 2014-04-23 | 1 | -92/+90 |
|/ | | | | * Added comments to BroadcastMovementUpdate() and the collision tracer | ||||
* | Fixed #906 | Tiger Wang | 2014-04-18 | 1 | -0/+10 |
| | |||||
* | Merge pull request #891 from mc-server/fixes | Mattes D | 2014-04-17 | 1 | -66/+49 |
|\ | | | | | Fixes to redstone & general | ||||
| * | Entities handle chunks properly again | Tiger Wang | 2014-04-12 | 1 | -66/+49 |
| | | | | | | | | | | * Entities properly handle chunks * Changed EntityStatus enums to be less shouty | ||||
* | | Added new AI rules | Tiger Wang | 2014-04-17 | 1 | -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. | madmaxoft | 2014-04-05 | 1 | -1/+1 |
| | | | | | This bug has been introduced in 8825d30aabbee8cb2e452dc5a17deb6f9b6892a7. This change fixes #854. | ||||
* | Minor Entity.cpp cleanup | Tiger Wang | 2014-03-20 | 1 | -12/+9 |
| | |||||
* | Merge branch 'master' into awesometnt | Tiger Wang | 2014-03-18 | 1 | -1/+1 |
|\ | | | | | | | | | Conflicts: src/ChunkMap.cpp | ||||
| * | Unified Matrix4 code | andrew | 2014-03-11 | 1 | -1/+1 |
| | | |||||
* | | Added extra awesomeness to TNT | Tiger Wang | 2014-03-05 | 1 | -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::XXX | andrew | 2014-03-01 | 1 | -3/+3 |
| | |||||
* | Fixed most of the reordering warnings | Tycho | 2014-02-05 | 1 | -2/+2 |
| | |||||
* | Creative players take Plugin damage | Tiger Wang | 2014-02-02 | 1 | -1/+2 |
| | |||||
* | All mobs now drown (fixes #54) | Tiger Wang | 2014-01-25 | 1 | -1/+94 |
| | | | | | * Implemented mob drowning * Iron Golems and squids are excluded | ||||
* | Removed unused ReferenceManager | Tiger Wang | 2014-01-24 | 1 | -36/+0 |
| | |||||
* | Fixed crash with failed entity-loading. | madmaxoft | 2014-01-24 | 1 | -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' | madmaxoft | 2014-01-17 | 1 | -3/+3 |
|\ | |||||
| * | Removed obsoleted functions | Tiger Wang | 2014-01-16 | 1 | -3/+3 |
| | | |||||
* | | Disabled excessive entity-related logging in Debug mode. | madmaxoft | 2014-01-16 | 1 | -1/+11 |
|/ | |||||
* | Final improvements to Minecarts | Tiger Wang | 2014-01-13 | 1 | -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 improvements | Tiger Wang | 2014-01-13 | 1 | -3/+5 |
| | | | | | * Players now search for an area around themselves to teleport to when detaching from something | ||||
* | Multiple enhancements and fixes to minecarts | Tiger Wang | 2014-01-12 | 1 | -1/+4 |
| | | | | | | + They are destroyed instantly by creative mode * Physics is much improved + Basic implementation of powered rails | ||||
* | Improved knockback animation | Tiger Wang | 2013-12-24 | 1 | -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.cpp | Tiger Wang | 2013-12-23 | 1 | -1/+1 |
| | |||||
* | Implemented knockback and critical hit | Tiger Wang | 2013-12-22 | 1 | -4/+21 |
| | |||||
* | More reordering fixes. | madmaxoft | 2013-12-20 | 1 | -2/+2 |
| | |||||
* | Sorted a few constructors to remove warnings. | madmaxoft | 2013-12-20 | 1 | -5/+5 |
| | |||||
* | Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT). | madmaxoft | 2013-12-20 | 1 | -1/+1 |
| | |||||
* | Added HandleSpeedFromAttachee so an entity can override the function. | STRWarrior | 2013-12-16 | 1 | -4/+14 |
| | |||||
* | Fixed angle normalization typo. | madmaxoft | 2013-12-08 | 1 | -1/+1 |
| | |||||
* | Fixed normalizing large angles. | madmaxoft | 2013-12-08 | 1 | -6/+3 |
| | |||||
* | Moved bindings-related to a Bindings subfolder. | madmaxoft | 2013-12-08 | 1 | -1/+1 |
| | | | | Ref.: #407 | ||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 1 | -0/+1450 |