Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fire effect now shown for creative and spectator mode players (#3998) | Alexander Harkness | 2017-09-07 | 1 | -0/+7 |
| | | | | | | | | * Fire effect now shown for creative and spectator mode players Fixes #3989 * Add documentation for IsFireproof | ||||
* | Add cWorld::RemoveEntity and use in cEntity (#4003) | peterbell10 | 2017-09-05 | 1 | -11/+10 |
| | | | | | | * Add cWorld::RemoveEntity and use in cEntity * cEntity: Remove uneeded asserts from Destroy and DoMoveToWorld | ||||
* | Revert "Replace ItemCallbacks with lambdas (#3948)" | LogicParrot | 2017-09-02 | 1 | -6/+22 |
| | | | | This reverts commit 496c337cdfa593654018c171f6a74c28272265b5. | ||||
* | SetSwimState now takes into account head height | Alexander Harkness | 2017-09-01 | 1 | -2/+3 |
| | | | | | | | This affects m_IsSubmerged and IsSubmerged() for entities of all types. Also prevent squids from suffocating in water. | ||||
* | Replace ItemCallbacks with lambdas (#3948) | peterbell10 | 2017-09-01 | 1 | -22/+6 |
| | |||||
* | Added ShouldSendRespawn parameter to ScheduleMoveToWorld (#3979) | Lane Kolbly | 2017-08-30 | 1 | -2/+3 |
| | |||||
* | Gives all entities the default airlevel on creation (#3942) | Bond-009 | 2017-08-25 | 1 | -2/+2 |
| | | | | * Guardians don't take damage on land * Squids suffocate on land | ||||
* | Minor changes (#3909) | mathiascode | 2017-08-24 | 1 | -5/+5 |
| | |||||
* | Added check in cEntity::TickBurning for whether the entity is planning to change worlds. (#3943) | Lane Kolbly | 2017-08-22 | 1 | -0/+6 |
| | |||||
* | Give arthropods slowness IV when hit with bane of arthropods (#3932) | Bond-009 | 2017-08-21 | 1 | -3/+7 |
| | |||||
* | Fully implemented leashes (#3798) | Pablo Beltrán | 2017-08-21 | 1 | -0/+36 |
| | |||||
* | Merge pull request #3489 from cuberite/EntityOwnership | Tiger Wang | 2017-08-18 | 1 | -9/+10 |
|\ | | | | | * Changed entity ownership model to use smart pointers | ||||
| * | Changed entity ownership model to use smart pointers | Tiger Wang | 2017-08-07 | 1 | -9/+10 |
| | | |||||
* | | Added knockback to arrows, fixed knockback enchantment handling (#3900) | Lane Kolbly | 2017-08-13 | 1 | -18/+14 |
|/ | | | | * Added knockback for arrows, fixed knockback enchantment handling. | ||||
* | Updated armor cover calculation. (#3858) | Lane Kolbly | 2017-07-23 | 1 | -122/+73 |
| | | | | | | | | * Updated armor damage calculation. + Added lua docs, added casts from float to int. * Changed verbage in docstring and comment. | ||||
* | If entity is a player, send relmove packets. | Lane Kolbly | 2017-07-12 | 1 | -1/+1 |
| | |||||
* | Players in creative and spectator aren't affected by cacti (#3824) | Bond-009 | 2017-07-02 | 1 | -1/+4 |
| | |||||
* | Entity: Replaced a mutexed counter with a std::atomic. (#3773) | Mattes D | 2017-06-15 | 1 | -7/+9 |
| | |||||
* | FastRandom rewrite (#3754) | peterbell10 | 2017-06-13 | 1 | -6/+4 |
| | |||||
* | Avoid pickups to sink into blocks and disappear (#3739) | Pablo Beltrán | 2017-06-04 | 1 | -22/+27 |
| | | | | * Avoid pickups to sink into blocks and disappear | ||||
* | Fixed tracer usage in Entity physics handling. (#3720) | Mattes D | 2017-05-28 | 1 | -7/+9 |
| | |||||
* | Tracer replacement (#3704) | Mattes D | 2017-05-11 | 1 | -46/+49 |
| | | | | | | * Replaced cTracer usage with cLineBlockTracer. * Exported new cLineBlockTracer utility functions to Lua API. | ||||
* | Added a nullptr check to cEntity::IsA (#3659) | Marvin Kopf | 2017-04-01 | 1 | -1/+1 |
| | | | Fixes #3603 | ||||
* | Fixed cactus detection and zombie pigman sword (#3584) | Bond-009 | 2017-02-25 | 1 | -1/+2 |
| | | | | Fixes for issues #902 and #2917 | ||||
* | Updated links and docs (#3488) | mathiascode | 2016-12-19 | 1 | -4/+4 |
| | |||||
* | Use cChunkDef::Height for Y coord comparison where applicable. | Moritz Borcherding | 2016-09-27 | 1 | -2/+2 |
| | |||||
* | Proper respawn packets on dimension travel | LogicParrot | 2016-08-29 | 1 | -9/+38 |
| | |||||
* | Fixed RasPi builds of unit tests. | Mattes D | 2016-08-04 | 1 | -1/+3 |
| | | | | | On RasPi with gcc 4.8.2, the asserts wouldn't compile when tests were enabled. Enforced the assumption that ASSERT code is generated only in Debug builds. | ||||
* | Fixes for boat entities (#3265) | beeduck | 2016-07-18 | 1 | -0/+22 |
| | | | protocol for vehicles now properly handled, protocol for boat paddles now properly handled, boats can no longer spawn underwater, boats now properly float, boat metadata now properly broadcasted. | ||||
* | 1.9 / 1.9.2 / 1.9.3 / 1.9.4 protocol support (#3135) | Pokechu22 | 2016-05-14 | 1 | -4/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Semistable update to 15w31a I'm going through snapshots in a sequential order since it should make things easier, and since protocol version history is written. * Update to 15w34b protocol Also, fix an issue with the Entity Equipment packet from the past version. Clients are able to connect and do stuff! * Partially update to 15w35e Chunk data doesn't work, but the client joins. I'm waiting to do chunk data because chunk data has an incomplete format until 15w36d. * Add '/blk' debug command This command lets one see what block they are looking at, and makes figuring out what's supposed to be where in a highly broken chunk possible. * Fix CRLF normalization in CheckBasicStyle.lua Normally, this doesn't cause an issue, but when running from cygwin, it detects the CR as whitespace and creates thousands of violations for every single line. Lua, when run on windows, will normalize automatically, but when run via cygwin, it won't. The bug was simply that gsub was returning a replaced version, but not changing the parameter, so the replaced version was ignored. * Update to 15w40b This includes chunk serialization. Fully functional chunk serialization for 1.9. I'm not completely happy with the chunk serialization as-is (correct use of palettes would be great), but cuberite also doesn't skip sending empty chunks so this performance optimization should probably come later. The creation of a full buffer is suboptimal, but it's the easiest way to implement this code. * Write long-by-long rather than creating a buffer This is a bit faster and should be equivalent. However, the code still doesn't look too good. * Update to 15w41a protocol This includes the new set passengers packet, which works off of the ridden entity, not the rider. That means, among other things, that information about the previously ridden vehicle is needed when detaching. So a new method with that info was added. * Update to 15w45a * 15w51b protocol * Update to 1.9.0 protocol Closes #3067. There are still a few things that need to be worked out (picking up items, effects, particles, and most importantly inventory), but in general this should work. I'll make a few more changes tomorrow to get the rest of the protocol set up, along with 1.9.1/1.9.2 (which did make a few changes). Chunks, however, _are_ working, along with most other parts of the game (placing/breaking blocks). * Fix item pickup packet not working That was a silly mistake, but at least it was an easy one. * 1.9.2 protocol support * Fix version info found in server list ping Thus, the client reports that it can connect rather than saying that the server is out of date. This required creating separate classes for 1.9.1 and 1.9.2, unfortunately. * Fix build errors generated by clang These didn't happen in MSVC. * Add protocol19x.cpp and protocol19x.h to CMakeLists * Ignore warnings in protocol19x that are ignored in protocol18x * Document BLOCK_FACE and DIG_STATUS constants * Fix BLOCK_FACE links and add separate section for DIG_STATUS * Fix bat animation and object spawning The causes of both of these are explained in #3135, but the gist is that both were typos. * Implement Use Item packet This means that buckets, bows, fishing rods, and several other similar items now work when not looking at a block. * Handle DIG_STATUS_SWAP_ITEM_IN_HAND * Add support for spawn eggs and potions The items are transformed from the 1.9 version to the 1.8 version when reading and transformed back when sending. * Remove spammy potion debug logging * Fix wolf collar color metadata The wrong type was being used, causing several clientside issues (including the screen going black). * Fix 1.9 chunk sending in the nether The nether and the end don't send skylight. * Fix clang build errors * Fix water bottles becoming mundane potions This happened because the can become splash potion bit got set incorrectly. Water bottles and mundane potions are only differentiated by the fact that water bottles have a metadata of 0, so setting that bit made it a mundane potion. Also add missing break statements to the read item NBT switch, which would otherwise break items with custom names and also cause incorrect "Unimplemented NBT data when parsing!" logging. * Copy Protocol18x as Protocol19x Aditionally, method and class names have been swapped to clean up other diffs. This commit is only added to make the following diffs more readable; it doesn't make any other changes (beyond class names). * Make thrown potions use the correct appearence This was caused by potions now using metadata. * Add missing api doc for cSplashPotionEntity::GetItem * Fix compile error in SplashPotionEntity.cpp * Fix fix of cSplashPotionEntity API doc * Temporarilly disable fall damage particles These were causing issues in 1.9 due to the changed effect ID. * Properly send a kick packet when connecting with an invalid version This means that the client no longer waits on the server screen with no indication whatsoever. However, right now the server list ping isn't implemented for unknown versions, so it'll only load "Old" on the ping. I also added a GetVarIntSize method to cByteBuffer. This helps clean up part of the code here (and I think it could clean up other parts), but it may make sense for it to be moved elsewhere (or declared in a different way). * Handle server list pings from unrecognized versions This isn't the cleanest way of writing it (it feels odd to use ProtocolRecognizer to send packets, and the addition of m_InPingForUnrecognizedVersion feels like the wrong technique), but it works and I can't think of a better way (apart from creating a full separate protocol class to handle only the ping... which would be worse). * Use cPacketizer for the disconnect packet This also should fix clang build errors. * Add 1.9.3 / 1.9.4 support * Fix incorrect indentation in APIDesc | ||||
* | Fix issues below y = 0 | LogicParrot | 2016-04-18 | 1 | -0/+6 |
| | |||||
* | MoveToWorld defaults to spawnpoint | LogicParrot | 2016-03-30 | 1 | -1/+19 |
| | |||||
* | Proper entity destruction in non-ticking chunks | LogicParrot | 2016-02-19 | 1 | -36/+94 |
| | |||||
* | remove cWorld::createAndInitializeWorld | LogicParrot | 2016-02-08 | 1 | -4/+10 |
| | |||||
* | cMonster::m_Target safety across worlds | LogicParrot | 2016-02-03 | 1 | -0/+7 |
| | |||||
* | Merge pull request #2941 from LogicParrot/chunkBug2 | LogicParrot | 2016-02-03 | 1 | -2/+11 |
|\ | | | | | [Attempt 2] Fixed cChunk::m_Entities corruption upon world travel | ||||
| * | Fixed cChunk::m_Entities corruption upon world travel | LogicParrot | 2016-02-02 | 1 | -2/+11 |
| | | |||||
* | | Fix cPawn pushing | Marvin Kopf | 2016-02-02 | 1 | -0/+13 |
|/ | | | | cPawn instances can no longer push an entity they are attached to. cEntity now has a IsAttachedTo method. | ||||
* | Updated old forum links | Mathias | 2016-01-31 | 1 | -1/+1 |
| | |||||
* | Improved tamed wolf pack cooperation and projectile reactions | LogicParrot | 2016-01-22 | 1 | -0/+41 |
| | |||||
* | Fix crash when tamed wolf is hit by arrows | LogicParrot | 2016-01-16 | 1 | -50/+57 |
| | |||||
* | Moved variables into scope, removed unused variables and fixed variables | Lukas Pioch | 2015-12-17 | 1 | -1/+1 |
| | |||||
* | blockheight mechanism | Gargaj | 2015-12-13 | 1 | -5/+6 |
| | |||||
* | Improved spawn location calculations. | samoatesgames | 2015-11-13 | 1 | -2/+2 |
| | | | | | | | | | | - Supports Overworld and Nether spawns. - Supports spawning under objects, but still above ground (e.g. under the leaves of a tree). - Protects against spawning in oceans. - Protects against spawning in water. - Uses a radial search about the origin, rather than a linear. - Correctly calculates Nether spawn on spawn world generation (fixes: cuberite#2548) - Fixes a bug in CheckPlayerSpawnPoint() where the X offset was used in both the X and Z coords (BLOCKTYPE BlockType = GetBlock(a_PosX + Coords[i].x, a_PosY, a_PosZ + Coords[i].x);) | ||||
* | Fix being set on fire while directly being under lava | Gargaj | 2015-11-04 | 1 | -1/+1 |
| | | | Right now you will be on fire if there is a block of lava right above you, even if it doesn't pour down. | ||||
* | Implemented the FireResistence potion effects. | bibo38 | 2015-10-31 | 1 | -3/+3 |
| | | | | | This not only provides fire resistence, but also prevents blaze fireballs. See #2556 | ||||
* | Fixed food drain bugs | Tiger Wang | 2015-08-20 | 1 | -94/+14 |
| | |||||
* | Unified the doxy-comment format. | Mattes D | 2015-07-31 | 1 | -6/+0 |
| | |||||
* | Silenced and fixed many warning messages across multiple files. | Samuel Barney | 2015-07-29 | 1 | -49/+49 |
| | |||||
* | Work on NetherPortalScanner. Setup portal scanner to reset PortalCooldown. Changed where player is spawned. Added a_InitSpawn flag to CreateAndInitializeWorld. | Lane Kolbly | 2015-06-13 | 1 | -5/+14 |
| | |||||
* | Added HOOK_KILLED | Nounours Heureux | 2015-06-13 | 1 | -0/+7 |
| | |||||
* | Implemented nether portal scanning code. | Lane Kolbly | 2015-06-10 | 1 | -6/+41 |
| | |||||
* | Merge branch 'master' into PreventNewWarnings | tycho | 2015-05-23 | 1 | -3/+3 |
|\ | |||||
| * | Renamed hook HOOK_ENTITY_CHANGE_WORLD | Lukas Pioch | 2015-05-21 | 1 | -3/+3 |
| | | |||||
* | | Make -Werror disabling file only | tycho | 2015-05-19 | 1 | -1/+1 |
|/ | | | | Ad fix a load of warnings | ||||
* | Added hooks HOOK_ENTITY_CHANGE_WORLD and HOOK_ENTITY_CHANGED_WORLD | Lukas Pioch | 2015-05-18 | 1 | -0/+11 |
| | | | | Fixes #1435. | ||||
* | More style checking. | Mattes D | 2015-05-09 | 1 | -3/+4 |
| | | | | Spaces around some operators are checked. | ||||
* | Entity improvements | Tiger Wang | 2015-05-04 | 1 | -1/+0 |
| | | | | | | | | •Pathfinder improvements •Fixes #1217 •Fixes #1933 Merge remote-tracking branch 'SafwatHalaby/water2' into fixes | ||||
* | Changed air drag units to 'interpolated ticks' per second | DevToaster | 2015-03-31 | 1 | -2/+2 |
| | |||||
* | Modified physics for more vanilla-like behavior | DevToaster | 2015-03-31 | 1 | -9/+11 |
| | |||||
* | Merge pull request #1826 from mc-server/UnifyPacketizer | Mattes D | 2015-03-24 | 1 | -37/+38 |
|\ | | | | | Unify packetizer | ||||
| * | Changed cEntity::m_UniqueID to UInt32. | Mattes D | 2015-03-21 | 1 | -37/+38 |
| | | |||||
* | | Changed linked world name variables and setters / getters. | Mattes D | 2015-03-21 | 1 | -5/+5 |
|/ | | | | | Ref.: #1792 Ref.: https://github.com/mc-server/MCServer/pull/1792#discussion_r25946707 | ||||
* | Added OnTeleportEntity hook for plugins. | joshi07 | 2015-03-05 | 1 | -2/+6 |
| | | | | | Plugins may or may not allow teleport to the new position. Updated the HookNotify plugin with it. | ||||
* | use DoSetSpeed in AddSpeed* in Entity.cpp | Raekye | 2015-02-26 | 1 | -10/+4 |
| | |||||
* | Fixed type-conversion warnings. | Mattes D | 2015-01-18 | 1 | -4/+4 |
| | |||||
* | Initial convertion of a_Dt to std::chrono | Tycho | 2015-01-11 | 1 | -13/+13 |
| | | | | also refactored cWorld::m_WorldAge and cWorld::m_TimeOfDay | ||||
* | BasicStyle: Added missing braces to control statements. | Mattes D | 2014-12-05 | 1 | -4/+16 |
| | |||||
* | Fixed reported parentheses around comparisons. | Mattes D | 2014-12-05 | 1 | -1/+1 |
| | |||||
* | En masse NULL -> nullptr replace | Tiger Wang | 2014-10-23 | 1 | -28/+28 |
| | |||||
* | Removed more unessicary includes | Tycho | 2014-09-26 | 1 | -1/+0 |
| | |||||
* | Merge branch 'master' into redstoneTests | Tycho | 2014-09-25 | 1 | -5/+6 |
|\ | | | | | | | | | Conflicts: src/Mobs/Monster.h | ||||
| * | A few compiler warning fixes | Chris Darnell | 2014-09-23 | 1 | -2/+3 |
| | | |||||
| * | Merge pull request #1398 from mc-server/1.8-Protocol | Alexander Harkness | 2014-09-22 | 1 | -1/+1 |
| |\ | | | | | | | 1.8 Protocol Update | ||||
| | * | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-14 | 1 | -16/+25 |
| | |\ | |||||
| | * \ | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-13 | 1 | -11/+13 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Items/ItemHoe.h | ||||
| | * | | | Added the player list to the 1.8 protocol. | Howaner | 2014-09-09 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Made it compile with clang | Chris Darnell | 2014-09-22 | 1 | -2/+2 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'master' into redstoneTests | Tycho | 2014-09-17 | 1 | -15/+26 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/ChunkInterface.h | ||||
| * | | | Entities experience water resistance | Tiger Wang | 2014-09-13 | 1 | -16/+25 |
| | |/ | |/| | |||||
| * | | Fixed friction being applied whilst airborne | Tiger Wang | 2014-09-12 | 1 | -11/+13 |
| |/ | | | | | | | Reported by tonibm9 in #1300. | ||||
* / | Added first test to show the object can be created | Tycho | 2014-09-17 | 1 | -10/+10 |
|/ | |||||
* | Fixed style and alpha-sorting. | madmaxoft | 2014-09-03 | 1 | -2/+2 |
| | |||||
* | Fixed previous commit's wrong assumptions. | madmaxoft | 2014-09-01 | 1 | -10/+10 |
| | | | | The equipment-getting functions return a copy already, so we can't take a pointer, really. | ||||
* | Fixed MSVC compilation, improved performance. | madmaxoft | 2014-09-01 | 1 | -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 style | Jaume Aloy | 2014-08-31 | 1 | -7/+5 |
| | |||||
* | Added a_Digger check | Jaume Aloy | 2014-08-30 | 1 | -2/+2 |
| | |||||
* | More Enchantments | Jaume Aloy | 2014-08-22 | 1 | -57/+70 |
| | | | | - Added Thorns and Respiration enchantments | ||||
* | Protection Enchantments, some fixes | Jaume Aloy | 2014-08-21 | 1 | -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 BlockHandler | Jaume Aloy | 2014-08-19 | 1 | -1/+0 |
| | |||||
* | Changed if for switch | Jaume Aloy | 2014-08-19 | 1 | -3/+2 |
| | |||||
* | Added more enchantments and some fixes | Jaume Aloy | 2014-08-19 | 1 | -3/+22 |
| | | | | | | | - Removed Debug messages - Added Punch enchantment effect - Added Silk Touch enchantment - Added Unbreaking enchantment effect | ||||
* | Added some Enchantments | Jaume Aloy | 2014-08-19 | 1 | -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. | Howaner | 2014-08-04 | 1 | -15/+13 |
| | |||||
* | Entity.cpp: Air timer comment fix | archshift | 2014-08-03 | 1 | -1/+1 |
| | |||||
* | Code reduction and clarity fixes | archshift | 2014-08-03 | 1 | -19/+9 |
| | |||||
* | Entity.cpp: On portal check, use if-else for current dimension | archshift | 2014-08-03 | 1 | -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 whitespace | Tiger Wang | 2014-07-29 | 1 | -3/+3 |
| | |||||
* | Merge branch 'master' into portals | Tiger Wang | 2014-07-29 | 1 | -5/+8 |
|\ | | | | | | | | | Conflicts: src/World.h | ||||
| * | Fix item durability. | Howaner | 2014-07-23 | 1 | -5/+8 |
| | | | | | | Fixes #1181 | ||||
* | | 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 |