Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Speed improvements, crash fixes, & self-suggestions | Tiger Wang | 2014-07-22 | 1 | -2/+4 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-07-22 | 1 | -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 creators | archshift | 2014-07-20 | 1 | -0/+6 |
| | | |||||
* | | Suggestions | Tiger Wang | 2014-07-21 | 1 | -9/+21 |
| | | |||||
* | | 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 | ||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-07-18 | 1 | -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. | madmaxoft | 2014-07-17 | 1 | -1/+1 |
| | | |||||
| * | Basic style fixes. | madmaxoft | 2014-07-17 | 1 | -1/+1 |
| | | |||||
| * | Normalized comments. | madmaxoft | 2014-07-17 | 1 | -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 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 | archshift | 2014-07-10 | 1 | -2/+2 |
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Entities/Player.cpp src/Entities/ProjectileEntity.cpp | ||||
| | * | | Some Entity.cpp style improvements | Tiger Wang | 2014-06-22 | 1 | -2/+2 |
| | |/ | |||||
| * | | Cave spider now poisons its victim, added IsPawn function to Entity | archshift | 2014-06-17 | 1 | -0/+1 |
| | | | |||||
| * | | Player: made healing instantaneous | archshift | 2014-06-17 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-06-21 | 1 | -10/+25 |
|\| | | | | | | | | | | | | | 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 | -10/+25 |
| | | |||||
* | | Fixed invalid iterators | Tiger Wang | 2014-06-21 | 1 | -1/+9 |
| | | |||||
* | | Implemented PR suggestions | archshift | 2014-06-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | Furnace.txt: newline BlockID: removed extraneous dimension mapping cEntity: fixed typo cPlayer: WorldPtr typedef | ||||
* | | Reverted portal creation code | Tiger Wang | 2014-06-14 | 1 | -3/+0 |
| | | | | | | | | It wasn't really working and needs more development | ||||
* | | Portals animate and delay correctly | Tiger Wang | 2014-06-12 | 1 | -2/+8 |
| | | |||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-06-10 | 1 | -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 D | 2014-06-08 | 1 | -2/+3 |
| | | | | | | | | Fixes #1039, fixes #851 | ||||
| * | Added queue for adding entities to cWorld. | Mattes D | 2014-06-08 | 1 | -2/+3 |
| | | | | | | | | This alone doesn't work properly yet, further changes to cPlayer are needed. | ||||
* | | Portal improvements and suggestions | Tiger Wang | 2014-06-10 | 1 | -0/+3 |
| | | |||||
* | | Implemented end and nether portals | Tiger Wang | 2014-05-31 | 1 | -0/+6 |
|/ | |||||
* | Merge pull request #1010 from mc-server/cactidamage | Alexander Harkness | 2014-05-19 | 1 | -0/+3 |
|\ | | | | | Implemented cacti damage | ||||
| * | Implemented cacti damage | Tiger Wang | 2014-05-18 | 1 | -0/+3 |
| | | | | | | | | | | + Implemented cacti damage * Fixed pickup tossing (PR #994 bug) | ||||
* | | cEntity::Killed(cEntity *) Handler; Achievement triggers; cPlayer::AwardAchievement() | andrew | 2014-05-12 | 1 | -0/+3 |
|/ | |||||
* | A bit of reformatting. | madmaxoft | 2014-05-02 | 1 | -5/+10 |
| | |||||
* | Merge branch 'master' into fixes. | madmaxoft | 2014-05-02 | 1 | -10/+25 |
|\ | |||||
| * | Merge pull request #940 from Howaner/GlobalFixes | Mattes D | 2014-04-28 | 1 | -10/+22 |
| |\ | | | | | | | Add entity invulnerable | ||||
| | * | Fixes | Howaner | 2014-04-26 | 1 | -10/+13 |
| | | | |||||
| | * | Change m_InvulnerableTicks description again again :D | Howaner | 2014-04-26 | 1 | -1/+1 |
| | | | |||||
| | * | Change m_InvulnerableTicks description again. | Howaner | 2014-04-26 | 1 | -1/+1 |
| | | | |||||
| | * | Change m_InvulnerableTicks description | Howaner | 2014-04-26 | 1 | -1/+1 |
| | | | |||||
| | * | Add entity invulnerable | Howaner | 2014-04-26 | 1 | -4/+13 |
| | | | |||||
| * | | 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 | -0/+3 |
| |/ | |||||
* | | More comments! | Tiger Wang | 2014-04-27 | 1 | -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 fixes | Tiger Wang | 2014-04-24 | 1 | -0/+8 |
|\| | | | | | | | | | Conflicts: src/World.h | ||||
| * | Renamed getter and setter for IsFireproof. | archshift | 2014-04-23 | 1 | -2/+2 |
| | | |||||
| * | Fireproof status getter and setter. | archshift | 2014-04-23 | 1 | -0/+5 |
| | | |||||
| * | Fixed indentation and changed m_Fireproof to m_IsFireproof. | archshift | 2014-04-22 | 1 | -2/+2 |
| | | |||||
| * | Lay foundation for fireproof entities. | archshift | 2014-04-22 | 1 | -0/+3 |
| | | | | | | | | 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 | -7/+4 |
|/ | | | | * Added comments to BroadcastMovementUpdate() and the collision tracer | ||||
* | Merge pull request #891 from mc-server/fixes | Mattes D | 2014-04-17 | 1 | -15/+36 |
|\ | | | | | Fixes to redstone & general | ||||
| * | Entities handle chunks properly again | Tiger Wang | 2014-04-12 | 1 | -15/+36 |
| | | | | | | | | | | * Entities properly handle chunks * Changed EntityStatus enums to be less shouty | ||||
* | | Added new AI rules | Tiger Wang | 2014-04-17 | 1 | -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. | madmaxoft | 2014-04-03 | 1 | -7/+7 |
| | |||||
* | Ender crystals | andrew | 2014-03-25 | 1 | -11/+13 |
| | |||||
* | Merge branch 'master' into awesometnt | Tiger Wang | 2014-03-18 | 1 | -3/+1 |
|\ | | | | | | | | | Conflicts: src/ChunkMap.cpp | ||||
| * | Unified Vector classes | andrew | 2014-03-11 | 1 | -3/+1 |
| | | |||||
* | | Added extra awesomeness to TNT | Tiger Wang | 2014-03-05 | 1 | -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 itemframes | Tiger Wang | 2014-02-18 | 1 | -0/+2 |
|\ | | | | | | | | | | | Conflicts: src/Entities/Entity.h src/WorldStorage/NBTChunkSerializer.cpp | ||||
| * | Implemented paintings, fixes #689 | Tiger Wang | 2014-02-18 | 1 | -0/+2 |
| | | | | | | | | + Implemented paintings | ||||
* | | Implemented item frames, a part of #689 | Tiger Wang | 2014-02-18 | 1 | -0/+2 |
|/ | | | | | + Implemented Item Frames * Fixed Pitch and Yaw being wrongly flipped in the protocol (XOFT!) | ||||
* | Implemented fall damage for mobs | Tiger Wang | 2014-01-25 | 1 | -0/+5 |
| | | | | | | + Implemented mobile fall damage * Formatting fixes + Defined new Position->Integer macros | ||||
* | All mobs now drown (fixes #54) | Tiger Wang | 2014-01-25 | 1 | -1/+22 |
| | | | | | * Implemented mob drowning * Iron Golems and squids are excluded | ||||
* | Removed unused ReferenceManager | Tiger Wang | 2014-01-24 | 1 | -9/+1 |
| | |||||
* | Removed internal cEntity::GetRot() usage. | madmaxoft | 2014-01-17 | 1 | -2/+2 |
| | |||||
* | Removed obsoleted functions | Tiger Wang | 2014-01-16 | 1 | -3/+1 |
| | |||||
* | OBSOLETE'd obsolete functions | Tiger Wang | 2014-01-15 | 1 | -2/+2 |
| | |||||
* | Detaching improvements | Tiger Wang | 2014-01-13 | 1 | -1/+1 |
| | | | | | * Players now search for an area around themselves to teleport to when detaching from something | ||||
* | Fixed compilation in VC2008. | madmaxoft | 2013-12-30 | 1 | -2/+4 |
| | | | | Also removed an unused inline header file (yuck). | ||||
* | converted commneted paramater names to the unused macro | Tycho Bickerstaff | 2013-12-22 | 1 | -3/+7 |
| | |||||
* | ChunkSender is now warnings clean | Tycho Bickerstaff | 2013-12-21 | 1 | -4/+4 |
| | |||||
* | Sorted a few constructors to remove warnings. | madmaxoft | 2013-12-20 | 1 | -1/+1 |
| | |||||
* | Added cFloater class. | STRWarrior | 2013-12-19 | 1 | -0/+3 |
| | |||||
* | Added HandleSpeedFromAttachee so an entity can override the function. | STRWarrior | 2013-12-16 | 1 | -0/+1 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-26 | 1 | -0/+1 |
| | | | | | Conflicts: VC2008/MCServer.vcproj | ||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 1 | -0/+445 |