Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Stabilise MoveToWorld (#4004) | Mat | 2020-03-05 | 2 | -5/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Stabilise MoveToWorld * Fix comments and deprecate ScheduleMoveToWorld * Enhanced thread safety for m_WorldChangeInfo * Return unique_ptr from cAtomicUniquePtr::exchange * cWorld now calls entity cEntity::OnAddToWorld and cEntity::OnRemoveFromWorld. Allows broadcasting entities added to the world from the world's tick thread. This also factors out some common code from cEntity::DoMoveToWorld and cEntity::Initialize. As a consequence, cEntity::Destroy(false) (i.e. Destroying the entity without broadcasting) is impossible. This isn't used anywhere in Cuberite so it's now deprecated. * Update entity position after removing it from the world. Fixes broadcasts being sent to the wrong chunk. * Fix style * cEntity: Update LastSentPosition when sending spawn packet * Add Wno-deprecated-declarations to the lua bindings * Kill uses of ScheduleMoveToWorld | ||||
* | Refactored block-to-pickup conversion. (#4417) | Mattes D | 2019-10-16 | 1 | -5/+1 |
| | |||||
* | Refactored more of Entities and BlockEntities to use Vector3. (#4403) | Mattes D | 2019-09-29 | 3 | -3/+3 |
| | |||||
* | Fixed MSVC warnings (#4400) | Mattes D | 2019-09-27 | 1 | -1/+1 |
| | |||||
* | Add BurnsInDaylight to Lua API and Monsters.ini (#4295) | Muhammad Kaisar Arkhan | 2018-09-24 | 3 | -4/+2 |
| | | | | | | | | | | | | | * Monster.h: Export SetBurnsInDaylight This commit also adds BurnsInDaylight to check if the Monster burns in daylight or not. Closes https://github.com/cuberite/cuberite/issues/4294 * MonsterConfig.cpp: Add BurnsInDaylight Closes https://github.com/cuberite/cuberite/issues/4294 | ||||
* | Force all headers other than "Globals.h" to be included with relative paths (#4269) | peterbell10 | 2018-08-29 | 11 | -14/+11 |
| | | | | | | | Closes #4236 CMake now creates a header file in the build directory under the path "include/Globals.h" which just includes "src/Globals.h" with an absolute path. Then instead of adding "src/" to the include directories, it adds "include/". #include "Globals.h" still works by including the build generated file and any other src-relative path will not work. | ||||
* | Experience orb (#4259) | changyong guo | 2018-08-02 | 4 | -23/+23 |
| | | | | | | | * Replace cWorld::FindClosesPlayer with cWorld::DoWithClosestPlayer * Implement experience reward splitting into the orb sizes used in vanilla * Modified speed calculation in cExpOrb::Tick to make the orbs fly towards the player Fixes #4216 | ||||
* | Ocelots no longer multiply exponentially (#4272) | peterbell10 | 2018-07-30 | 2 | -15/+9 |
| | | | | | Along with a call to `destroyentities`, this fixes #4271 I'm guessing the intention of this code was to modify the normal spawning of ocelots. However, `cEntity::SpawnOn` is actually called to send the entity to an individual client. That means this code was run for every single player, every time they were sent a chunk with ocelots in it. Thus, the ocelots population would grow exponentially as players log in and move around. | ||||
* | cWorld: Manually bind deprecated broadcast functions (#4265) | peterbell10 | 2018-07-27 | 2 | -5/+5 |
| | | | Ref: https://github.com/cuberite/cuberite/pull/4264#discussion_r204769193 | ||||
* | CheckBasicStyle: Check number of empty lines between functions (#4267) | peterbell10 | 2018-07-26 | 10 | -11/+18 |
| | | | | Add check for number of empty lines between functions and fix the corresponding failures | ||||
* | Broadcast refactor (#4264) | peterbell10 | 2018-07-24 | 3 | -8/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | * Move Broadcast functions from cChunkMap to cBroadcaster - Remove cBroadcastInterface in favour of cBroadcaster. - cChunk: Remove broadcast functions. * resurect broadcast interface * Absorb cBroadcaster into cWorld. Removes the need for forwarding the function calls. * Improve const-correctness * Use Int8 instead of char + Comment `ForClients` functions * Improve comments * Broadcaster: Rename ForClients functions | ||||
* | Use clang-tidy to check more code conventions (#4214) | Bond-009 | 2018-05-06 | 2 | -6/+6 |
| | | | | | | | * Create clang-tidy.sh * Add clang-tidy to circle.yml * Fixed some naming violations Fixes #4164 | ||||
* | Prefer static_cast to reinterpret_cast (#4223) | peterbell10 | 2018-05-02 | 1 | -1/+1 |
| | | | | | | | * Change reinterpret_cast -> static_cast wherever possible * Remove more unnecessary `const_cast`s. reinterpret_casts should be avoided for the same reason as c-style casts - they don't do any type-checking. reinterpret_cast was mainly being used for down-casting in inheritance hierarchies but static_cast works just as well while also making sure that there is actually an inheritance relationship there. | ||||
* | Deal with covered switches consistently (#4161) | peterbell10 | 2018-02-05 | 1 | -7/+1 |
| | | | | | | | * Fixes a number of "<function>: not all control paths return a value" warnings on MSVC. * Introduces the UNREACHABLE global macro and uses it instead of conditionally compiled switch defaults. * Move cNBTParseErrorCategory from FastNBT.h into FastNBT.cpp to prevent bad calls to message() | ||||
* | Ocelots don't take fall damage (#4171) | Bond-009 | 2018-02-04 | 4 | -6/+19 |
| | |||||
* | New movement system for leashed entities (#4147) | peterbell10 | 2018-01-17 | 2 | -35/+47 |
| | | | | | | | * New movement system for leashed entities Entities are accelerated towards the leashed to entity as if by a spring. * Mobs now pathfind close to but not directly to the leashing entity. * Also minor comment changes | ||||
* | Don't burn mobs in daylight when swimming (#4145) | Bond-009 | 2018-01-15 | 1 | -1/+2 |
| | |||||
* | Rename cEntity swim states (#3996) | Alexander Harkness | 2018-01-14 | 3 | -8/+5 |
| | | | | | | | | | | * Replace cEntity:m_IsSubmerged with m_IsHeadInWater * Replace cEntity:m_IsSwimming with m_IsInWater * Add API documentation for new symbols * Apply SetSwimState to all entities, not just mobs and players * Pickups now use IsOnFire to check if they are on fire before destruction Fixes #3987 | ||||
* | Item durability loss now depends on the item used. (#4123) | Alexander Harkness | 2018-01-05 | 3 | -3/+0 |
| | | | | | | | Armour durability also no longer changes when it is used to break blocks or attack mobs. Fixes #4119 | ||||
* | Add the fmt library (#4065) | peterbell10 | 2018-01-03 | 1 | -0/+1 |
| | | | | | | | * Replaces AppendVPrintf with fmt::sprintf * fmt::ArgList now used as a type safe alternative to varargs. * Removed SIZE_T_FMT compatibility macros. fmt::sprintf is fully portable and supports %zu. * Adds FLOG functions to log with fmt's native formatting style. | ||||
* | improve rain simulation (#4017) | Alexander Harkness | 2017-12-26 | 2 | -34/+4 |
| | | | | | | | | | | | * Uses vanilla logic to decide which blocks rain falls through. * Rain falls infinitely above the world, and stops at y=0. * Entities will now be extinguished if they are under rain-blocking blocks, and fire will now be extinguished by rain similarly. * Create IsWeatherWetAtXYZ to identify wetness at a particular location. * Use new code for enderman rain detection. * Fixes issue #916 * Disable warnings for global constructors in the fire simulator. | ||||
* | Implement horse inventory (#4053) | peterbell10 | 2017-10-21 | 2 | -25/+137 |
| | | | | | | | | | | * Implement horse inventory * Fix sign conversions * Add API doc for ItemCategory::IsHorseArmor * Improve HandleOpenHorseInventory comment and style fixes. | ||||
* | Fixed some small passive mob issues (#4057) | Bond-009 | 2017-10-21 | 9 | -10/+44 |
| | | | | | * Chickens can be bred with seeds, beetroot seeds, melon seeds, or pumpkin seeds Ref: https://minecraft.gamepedia.com/Chicken#Baby_chicken * Baby passive mobs don't drop items * Fixed the size of some mobs | ||||
* | Changed BroadcastSoundEffect, SendSoundEffect, and CastThunderbolt parameters to vectors (#3959) | Lane Kolbly | 2017-09-19 | 4 | -7/+7 |
| | | | | | | | | | | | | | | | | | | * Made BroadcastSoundEffect take vector parameters. * Added docs for new vectored methods * Removed old code * Fixed lua warnings * Made old BroadcastSoundEffect not an override. * m_Block to m_BlockPos, used Vector3d constructor where prettier. * a_Block to a_BlockPos * Changed thunderbolt a_Block to a_BlockPos | ||||
* | Fix switch warnings (#4013) | peterbell10 | 2017-09-14 | 2 | -10/+10 |
| | | | | | | | | | | | | | | | * Fix switch warnings * Fix a variety of -Wswitch and -Wswitch-enum warnings * Remove unneeded -Wno-error flags * Reorganise some eMonsterType switches * Alpha sort eMonsterType cases in WriteMobMetadata and in cNBTChunkSerializer::AddMonsterEntity * List all mob types in protocol 1.12 and NBTChunkSerializer * cStructGenTrees::GetNumTrees: remove switch default * cWSSAnvil::LoadOldMinecartFromNBT: Log unhandled minecart type | ||||
* | Replace ItemCallbacks with lambdas (#3993) | peterbell10 | 2017-09-11 | 6 | -131/+75 |
| | |||||
* | Revert "Replace ItemCallbacks with lambdas (#3948)" | LogicParrot | 2017-09-02 | 6 | -75/+131 |
| | | | | This reverts commit 496c337cdfa593654018c171f6a74c28272265b5. | ||||
* | SetSwimState now takes into account head height | Alexander Harkness | 2017-09-01 | 1 | -1/+0 |
| | | | | | | | This affects m_IsSubmerged and IsSubmerged() for entities of all types. Also prevent squids from suffocating in water. | ||||
* | Remove double-checking below world for burning | Alexander Harkness | 2017-09-01 | 1 | -5/+0 |
| | |||||
* | Replace ItemCallbacks with lambdas (#3948) | peterbell10 | 2017-09-01 | 6 | -131/+75 |
| | |||||
* | Fix mobs not burning in daylight when on snow (#3961) | Alexander Harkness | 2017-08-25 | 1 | -3/+3 |
| | | | | | | | | | | * Fix mobs not burning in daylight when on snow or other non-transparent partial blocks. Fixes #3945 * Change from floor to ceil | ||||
* | Gives all entities the default airlevel on creation (#3942) | Bond-009 | 2017-08-25 | 2 | -15/+28 |
| | | | | * Guardians don't take damage on land * Squids suffocate on land | ||||
* | Add cUUID class (#3871) | peterbell10 | 2017-08-25 | 3 | -11/+13 |
| | |||||
* | Use ref instead of pointer | Lukas Pioch | 2017-08-24 | 2 | -7/+7 |
| | |||||
* | Minor changes (#3909) | mathiascode | 2017-08-24 | 1 | -1/+1 |
| | |||||
* | Removed outdated pathfinder comment (#3955) | Safwat Halaby | 2017-08-23 | 1 | -2/+1 |
| | |||||
* | Fully implemented leashes (#3798) | Pablo Beltrán | 2017-08-21 | 5 | -14/+239 |
| | |||||
* | Changed type of FastRandom in monster drop calculation. (#3920) | Lane Kolbly | 2017-08-18 | 1 | -1/+8 |
| | | | | | | | | * Fixed type of FastRandom in monster drop calculation. * Distribute dropped items into stacks. * Moved while loop outside if statement. | ||||
* | Merge pull request #3489 from cuberite/EntityOwnership | Tiger Wang | 2017-08-18 | 8 | -84/+63 |
|\ | | | | | * Changed entity ownership model to use smart pointers | ||||
| * | Changed entity ownership model to use smart pointers | Tiger Wang | 2017-08-07 | 8 | -84/+63 |
| | | |||||
* | | Sitting cats block enderchests from opening (#3906) | Bond-009 | 2017-08-17 | 2 | -0/+31 |
| | | |||||
* | | Replaced includes with forward declarations | Lukas Pioch | 2017-08-13 | 2 | -2/+2 |
|/ | |||||
* | Removed unneeded includes (#3902) | Lukas Pioch | 2017-08-06 | 2 | -3/+0 |
| | |||||
* | Remove double includes part 2 (#3890) | peterbell10 | 2017-08-03 | 6 | -7/+0 |
| | |||||
* | Removed unused forward declarations (#3888) | Lukas Pioch | 2017-08-03 | 1 | -1/+1 |
| | |||||
* | Consolidated food effects into EatItem, added all fish type FoodInfos. (#3875) | Lane Kolbly | 2017-07-30 | 1 | -4/+7 |
| | | | | | | | | * Consolidated food effects into EatItem, added all fish types. * Changed type of NumFishInfos to satisfy clang. * Removed unused call for a_Item in EatItem | ||||
* | Creepers explode when burned by flint and steel (#3865) | Bond-009 | 2017-07-22 | 1 | -1/+1 |
| | | | Fixed an issue where creepers didn't explode when they were burned with flint and steel | ||||
* | Added basic ocelot behavior (#3829) | Bond-009 | 2017-07-12 | 4 | -5/+252 |
| | |||||
* | Sound effect horse rejects player when taming | Pablo Beltrán | 2017-07-10 | 1 | -0/+1 |
| | |||||
* | Fix horse taming (#3820) | Bond-009 | 2017-07-02 | 1 | -14/+26 |
| | | | | * Horses rear when untamed and right-clicked with an item | ||||
* | When right-clicking on a passive mob with 'his' spawn egg spawn a baby | Bond_009 | 2017-07-02 | 1 | -2/+20 |
| | |||||
* | Endermen take damage from rain | Bond-009 | 2017-06-30 | 2 | -3/+29 |
| | |||||
* | Spider should attack only when the light level is lower than 11 (#3815) | Bond-009 | 2017-06-30 | 1 | -1/+4 |
| | |||||
* | FastRandom rewrite (#3754) | peterbell10 | 2017-06-13 | 13 | -62/+60 |
| | |||||
* | Fixed tracer usage in Entity physics handling. (#3720) | Mattes D | 2017-05-28 | 2 | -10/+11 |
| | |||||
* | Spawn eggs works again | Lukas Pioch | 2017-05-22 | 2 | -31/+63 |
| | |||||
* | Clang 5.0 fixes | Lukas Pioch | 2017-05-21 | 3 | -4/+4 |
| | | | | | - Added override keyword - Removed inherited member variables | ||||
* | Don't destroy monster when last target type is a player (#3721) | Pablo Beltrán | 2017-05-21 | 2 | -0/+7 |
| | | | In current Cuberite version if you are pursued by monsters you just have to disconnect and connect again to get rid of them. If no other player is in your chunk monsters will get destroyed. | ||||
* | Tracer replacement (#3704) | Mattes D | 2017-05-11 | 2 | -19/+18 |
| | | | | | | * Replaced cTracer usage with cLineBlockTracer. * Exported new cLineBlockTracer utility functions to Lua API. | ||||
* | Fixed cactus detection and zombie pigman sword (#3584) | Bond-009 | 2017-02-25 | 2 | -0/+12 |
| | | | | Fixes for issues #902 and #2917 | ||||
* | Updated sounds and effect IDs (#3422) | mathiascode | 2017-02-15 | 31 | -47/+41 |
| | |||||
* | Added some blocks and items (#3503) | mathiascode | 2017-02-14 | 1 | -0/+1 |
| | |||||
* | Fixed bindings for cBlockArea:Read and Write. (#3568) | Mattes D | 2017-02-05 | 1 | -1/+1 |
| | | | The original bindings accepted nil as the World param, causing a crash. | ||||
* | cWolf: Fixed targetting a nullptr. | Mattes D | 2016-11-22 | 1 | -3/+3 |
| | |||||
* | Spectators added (#2852) | bibo38 | 2016-10-12 | 9 | -25/+38 |
| | |||||
* | APIDump: Reformatted the docs to include type information. | Mattes D | 2016-09-12 | 1 | -1/+1 |
| | | | | Also fixed a bit of documentation in the CPP source. | ||||
* | Entities now bail out of ticks if destroyed (#3363) | LogicParrot | 2016-09-03 | 14 | -0/+71 |
| | |||||
* | Fixed type-casting-related warnings. | Mattes D | 2016-08-24 | 2 | -2/+1 |
| | |||||
* | Fixed implicit rounding warnings. | Mattes D | 2016-08-19 | 1 | -1/+1 |
| | |||||
* | CMake: Remove needless minimum version specifications. | Mattes D | 2016-07-18 | 1 | -2/+0 |
| | |||||
* | 1.9 / 1.9.2 / 1.9.3 / 1.9.4 protocol support (#3135) | Pokechu22 | 2016-05-14 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
* | Out of world blocks are now always considered air blocks | LogicParrot | 2016-04-23 | 1 | -1/+1 |
| | |||||
* | Fix issues below y = 0 | LogicParrot | 2016-04-18 | 2 | -5/+15 |
| | |||||
* | Manual mob burn code | LogicParrot | 2016-04-06 | 1 | -7/+34 |
| | |||||
* | Fix passive mob destruction crashes | LogicParrot | 2016-03-28 | 1 | -0/+1 |
| | |||||
* | fixed horse bug | tonibm19 | 2016-03-01 | 1 | -1/+4 |
| | | | | horse could be "controlled" without a saddle or being tamed | ||||
* | Merge pull request #3026 from iam10K/master | worktycho | 2016-02-19 | 1 | -4/+12 |
|\ | | | | | Stop Tamed Wolf from following player when he is flying | ||||
| * | Stop Wolf from following player when he is flying | Tyler Encke | 2016-02-19 | 1 | -4/+12 |
| | | | | | | | | | | | | Check to make sure player is not flying before allowing wolf to move to player. Fixed isFlying to IsFlying | ||||
* | | Proper entity destruction in non-ticking chunks | LogicParrot | 2016-02-19 | 3 | -7/+17 |
|/ | |||||
* | Merge pull request #2974 from LogicParrot/perl | Julian Laubstein | 2016-02-06 | 27 | -41/+41 |
|\ | | | | | Bulk clearing of whitespace | ||||
| * | Bulk clearing of whitespace | LogicParrot | 2016-02-05 | 27 | -41/+41 |
| | | |||||
* | | Merge pull request #2958 from LogicParrot/fence | LogicParrot | 2016-02-06 | 1 | -11/+15 |
|\ \ | |/ |/| | Pathfinder now properly treats nonsolids above fence | ||||
| * | Pathfinder now properly treats nonsolids above fence | LogicParrot | 2016-02-04 | 1 | -11/+15 |
| | | |||||
* | | Correct typo in documentation. | Alexander Harkness | 2016-02-05 | 1 | -1/+1 |
| | | |||||
* | | Prevent interspecies breeding | LogicParrot | 2016-02-04 | 1 | -11/+25 |
|/ | |||||
* | cMonster::m_Target safety across worlds | LogicParrot | 2016-02-03 | 11 | -64/+145 |
| | |||||
* | Updated old forum links | Mathias | 2016-01-31 | 1 | -1/+1 |
| | |||||
* | Improved tamed wolf pack cooperation and projectile reactions | LogicParrot | 2016-01-22 | 2 | -36/+109 |
| | |||||
* | Spiders now friendly at daylight, new cChunk functions | LogicParrot | 2016-01-21 | 10 | -33/+38 |
| | |||||
* | Merge pull request #2887 from LogicParrot/water | LogicParrot | 2016-01-17 | 1 | -1/+1 |
|\ | | | | | Use IsBlockWater in cPath | ||||
| * | Use IsBlockWater in cPath | LogicParrot | 2016-01-17 | 1 | -1/+1 |
| | | |||||
* | | No second spawn broadcast necessary | WinfieldSteve | 2016-01-17 | 3 | -3/+0 |
|/ | |||||
* | Fix crash when tamed wolf is hit by arrows | LogicParrot | 2016-01-16 | 2 | -2/+6 |
| | |||||
* | Fixed creeper calling TargetIsInRange with null m_Target | LogicParrot | 2016-01-12 | 1 | -2/+2 |
| | |||||
* | Merge pull request #2859 from LogicParrot/attack2 | LogicParrot | 2016-01-12 | 7 | -24/+28 |
|\ | | | | | Fix mob attack interval | ||||
| * | Fix mob attack interval | LogicParrot | 2016-01-12 | 7 | -24/+28 |
| | | |||||
* | | Friendly wolf attack safety checks | LogicParrot | 2016-01-12 | 1 | -1/+14 |
|/ | |||||
* | Tamed wolf assists owner (attack / defence) | LogicParrot | 2016-01-12 | 3 | -32/+100 |
| | |||||
* | Renamed leftover strings to Cuberite / Server, as needed. | Mattes D | 2016-01-01 | 1 | -1/+1 |
| | | | | Also upgraded the user setting file for MSVC to 2013. | ||||
* | Fixed the monster burn code. | Mattes D | 2015-12-30 | 1 | -3/+15 |
| | | | | The old code failed when the monster was out of Y range. | ||||
* | Deleted cPath::BlockTypeIsFence | LogicParrot | 2015-12-27 | 2 | -30/+2 |
| | |||||
* | Update fences and gates list | Safwat Halaby | 2015-12-25 | 1 | -2/+9 |
| | | | | Update fences and gates list | ||||
* | PF - "Special blocks" handling | Safwat Halaby | 2015-12-24 | 10 | -215/+396 |
| | |||||
* | Chicken egg code early bailout | Safwat Halaby | 2015-12-23 | 1 | -19/+21 |
| | |||||
* | Baby chickens don't lay eggs | Gargaj | 2015-12-23 | 1 | -16/+19 |
| | |||||
* | PF - Improved mob jumping | Safwat Halaby | 2015-12-21 | 3 | -81/+151 |
| | |||||
* | Revert "Changed cPath to have a reset method". | Safwat Halaby | 2015-12-21 | 4 | -103/+38 |
| | |||||
* | Merge pull request #2753 from cuberite/pathFix | Safwat Halaby | 2015-12-16 | 4 | -37/+109 |
|\ | | | | | Path fix | ||||
| * | Changed cPath to have a reset method. | tycho | 2015-12-16 | 4 | -38/+103 |
| | | | | | | | | | | | | Also reverts "Changed raw cPath to an unique_ptr, fixes memory leak" This reverts commit 1515d37684b469f212bb9858cca6128d74e591b6. | ||||
| * | Delete copy and move constructors from cPath | tycho | 2015-12-15 | 1 | -0/+7 |
| | | | | | | | | cPath is not safe to copy or move due to pointers into the std::map m_Map. | ||||
* | | allow horse control (still quite buggy) | Gargaj | 2015-12-15 | 2 | -1/+24 |
|/ | |||||
* | Changed raw cPath to an unique_ptr, fixes memory leak | Lukas Pioch | 2015-12-15 | 2 | -9/+9 |
| | |||||
* | blockheight mechanism | Gargaj | 2015-12-13 | 2 | -18/+4 |
| | |||||
* | snow golems are "neutral" | Gargaj | 2015-12-13 | 1 | -5/+5 |
| | |||||
* | sheep color inheritance | Gargaj | 2015-12-13 | 4 | -1/+64 |
| | |||||
* | Remove stray "return" | Safwat Halaby | 2015-12-13 | 1 | -1/+0 |
| | |||||
* | Fixed mobs attacking Creative Mode players | Safwat Halaby | 2015-12-13 | 2 | -11/+15 |
| | |||||
* | Decoupled cMonster and path recalc logic, re-implemented recalc | Safwat Halaby | 2015-12-13 | 8 | -335/+486 |
| | |||||
* | Stop pathfinding over cobble walls | Gargaj | 2015-12-13 | 1 | -0/+1 |
| | | | Also 1.5 blocks high, shouldn't pathfind over it. | ||||
* | stop creepers from exploding even if they just died | Gargaj | 2015-12-08 | 1 | -1/+1 |
| | |||||
* | fix wolf collars | Gargaj | 2015-12-03 | 1 | -2/+2 |
| | | | | I don't know why this had an inversion but it consistently made the wrong collar color (i.e. yellow dye made the collar blue) | ||||
* | Added documentation for breeding code | Safwat Halaby | 2015-11-30 | 2 | -5/+25 |
| | |||||
* | implement breeding | Gargaj | 2015-11-29 | 9 | -14/+186 |
| | |||||
* | Add enum for Sound and Particle Effects | Dave Tucker | 2015-11-24 | 3 | -6/+9 |
| | | | | | | Fixes #2603 Signed-off-by: Dave Tucker <dave@dtucker.co.uk> | ||||
* | change from single followable item to multiple | Gargaj | 2015-11-23 | 8 | -12/+33 |
| | |||||
* | changed mob age from char to int | Julian Laubstein | 2015-11-16 | 1 | -3/+3 |
| | |||||
* | Blocks outside the world are never solid | worktycho | 2015-11-13 | 1 | -0/+4 |
| | | | Fixes #2539 | ||||
* | Add comment to Attack() return values | Gargaj | 2015-11-09 | 1 | -0/+4 |
| | |||||
* | neutral mobs shouldn't chase the player unless aggro'd | Gargaj | 2015-11-08 | 3 | -1/+8 |
| | | | | | | | | | | | | | | | | | code style neutral mobs shouldn't chase the player unless aggro'd neutral mobs shouldn't chase the player unless aggro'd Merge branch 'chilloutyo' of github.com:Gargaj/cuberite into chilloutyo Conflicts: src/Mobs/PassiveAggressiveMonster.h code style Merge branch 'chilloutyo' of github.com:Gargaj/cuberite into chilloutyo | ||||
* | Merge pull request #2615 from Gargaj/cavespider-attack | worktycho | 2015-11-08 | 16 | -27/+48 |
|\ | | | | | Fix cavespider poisoning even if attack is in cooldown | ||||
| * | fix cavespider poisoning even if attack is in cooldown | Gargaj | 2015-11-08 | 16 | -27/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make attack function more responsive fix cavespider poisoning even if attack is in cooldown make attack function more responsive Merge branch 'cavespider-attack' of github.com:Gargaj/cuberite into cavespider-attack code style fix cavespider poisoning even if attack is in cooldown make attack function more responsive fix cavespider poisoning even if attack is in cooldown make attack function more responsive Merge branch 'cavespider-attack' of github.com:Gargaj/cuberite into cavespider-attack code style Merge branch 'cavespider-attack' of github.com:Gargaj/cuberite into cavespider-attack Merge branch 'master' into cavespider-attack Merge branch 'master' into cavespider-attack fix cavespider poisoning even if attack is in cooldown make attack function more responsive fix cavespider poisoning even if attack is in cooldown make attack function more responsive Merge branch 'cavespider-attack' of github.com:Gargaj/cuberite into cavespider-attack code style fix cavespider poisoning even if attack is in cooldown make attack function more responsive fix cavespider poisoning even if attack is in cooldown make attack function more responsive Merge branch 'cavespider-attack' of github.com:Gargaj/cuberite into cavespider-attack code style Merge branch 'cavespider-attack' of github.com:Gargaj/cuberite into cavespider-attack Merge branch 'master' into cavespider-attack Merge branch 'master' into cavespider-attack Merge branch 'cavespider-attack' of github.com:Gargaj/cuberite into cavespider-attack | ||||
* | | Fix chicken flying | Gargaj | 2015-11-08 | 1 | -0/+2 |
|/ | | | | | | | | | | The gravity might not be correct but my rough timing (with a stopwatch) seems to be close. Merge branch 'master' into patch-1 Merge branch 'master' into patch-1 Merge branch 'master' into patch-1 | ||||
* | Only send creeper updates when there is a change | Gargaj | 2015-11-07 | 1 | -3/+6 |
| | | | Otherwise this keeps spamming the metadata packet for all the creepers on the server. | ||||
* | don't attack if dead | Gargaj | 2015-11-07 | 1 | -1/+1 |
| | |||||
* | chickens don't take fall damage | Gargaj | 2015-11-06 | 2 | -0/+6 |
| | |||||
* | Fixed failed assertation | bibo38 | 2015-11-03 | 1 | -20/+23 |
| | | | | | This was caused by a monster with a negative Y-axis. Fixes #2336 | ||||
* | StyleCheck: Check spaces around ==, <=, >= | Mattes D | 2015-10-08 | 1 | -3/+3 |
| | |||||
* | Partial revert of #2446 | Safwat Halaby | 2015-09-28 | 2 | -7/+53 |
| | |||||
* | Disabled squids and Guardians pathfinding, #2460 | Safwat Halaby | 2015-09-27 | 2 | -2/+2 |
| | |||||
* | Namechange to Cuberite | Mattes D | 2015-09-25 | 2 | -2/+2 |
| | |||||
* | Merge pull request #2446 from cuberite/asyncpathfinder | Tiger Wang | 2015-08-27 | 4 | -101/+25 |
|\ | | | | | Fixed a position bug in the pathfinder | ||||
| * | Fixed a position bug in the pathfinder | Tiger Wang | 2015-08-22 | 4 | -101/+25 |
| | | |||||
* | | Removed unused function | Tiger Wang | 2015-08-22 | 2 | -23/+0 |
|/ | | | | * Fixes #2444 | ||||
* | Unified the doxy-comment format. | Mattes D | 2015-07-31 | 8 | -27/+44 |
| | |||||
* | Silenced and fixed many warning messages across multiple files. | Samuel Barney | 2015-07-29 | 4 | -28/+26 |
| | |||||
* | Added Rabbit Metadata values. | bibo38 | 2015-07-17 | 2 | -2/+38 |
| | | | | | Added the Rabbit Types and the MoreCarrotTicks value. Types are selected randomly on creation. Fixes #1867 | ||||
* | Merge pull request #2363 from scribblemaniac/improve-spider-ai | Tiger Wang | 2015-07-16 | 2 | -1/+43 |
|\ | | | | | Improved spider AI | ||||
| * | Improved spider AI | scribblemaniac | 2015-07-16 | 2 | -1/+43 |
| | | | | | | | | Fixes #2335 | ||||
* | | Spawn baby mobs | hallucino | 2015-07-16 | 4 | -3/+5 |
|/ | |||||
* | Merge pull request #2349 from cuberite/maps | Tiger Wang | 2015-07-15 | 1 | -1/+1 |
|\ | | | | | Improved maps | ||||
| * | Improved maps | Tiger Wang | 2015-07-14 | 1 | -1/+1 |
| | | |||||
* | | Support ageable mobs | Hallucino | 2015-07-14 | 2 | -1/+8 |
|/ | | | | Move ageable stuff in Monster directly | ||||
* | Now Horses spawn with correct data values. | bibo38 | 2015-06-26 | 1 | -3/+3 |
| | | | | | | | The max-value of style is 4, of color is 6. See http://wiki.vg/Entities#Horse Also based on the if, the max value of HorseType is 7. Bugfix #2259 | ||||
* | Vector hasher is now a separate class | Tiger Wang | 2015-06-07 | 1 | -1/+1 |
| | |||||
* | Changed appropriate containers to unordered_map | Tiger Wang | 2015-06-06 | 1 | -16/+1 |
| | | | | | | Thanks to @worktycho for guidance! * Potential speed improvements | ||||
* | Fixed wrong indent. | Alexander Harkness | 2015-05-30 | 1 | -1/+1 |
| | |||||
* | Merge pull request #2171 from SafwatHalaby/fence | Alexander Harkness | 2015-05-30 | 1 | -1/+7 |
|\ | | | | | PF - Handle all fencetypes | ||||
| * | PF - Handle all fencetypes | SafwatHalaby | 2015-05-30 | 1 | -1/+7 |
| | | |||||
* | | Merge pull request #2167 from SafwatHalaby/diags | worktycho | 2015-05-30 | 1 | -5/+12 |
|\ \ | | | | | | | PF - Fixed diagonal cutting | ||||
| * | | PF - Fixed diagonal cutting | SafwatHalaby | 2015-05-30 | 1 | -5/+12 |
| |/ | |||||
* | | Merge pull request #2166 from SafwatHalaby/squid | Safwat Halaby | 2015-05-30 | 2 | -2/+4 |
|\ \ | | | | | | | Disabled squid and Guardian Pathfinding | ||||
| * | | Disabled squid and Guardian Pathfinding | SafwatHalaby | 2015-05-30 | 2 | -2/+4 |
| |/ | |||||
* / | Fixed creeper explosions | SafwatHalaby | 2015-05-30 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'master' into PreventNewWarnings | tycho | 2015-05-29 | 4 | -9/+21 |
|\ | | | | | | | | | Conflicts: src/Entities/ArrowEntity.cpp | ||||
| * | AI - Sane Skeleton | SafwatHalaby | 2015-05-28 | 4 | -9/+21 |
| | | |||||
* | | Fix comments | tycho | 2015-05-28 | 4 | -19/+19 |
| | | |||||
* | | Merge branch 'master' into PreventNewWarnings | tycho | 2015-05-28 | 2 | -3/+13 |
|\| | | | | | | | | | Conflicts: src/Inventory.cpp | ||||
| * | AI - Tweaked wolf speed and teleport threshold | SafwatHalaby | 2015-05-28 | 1 | -1/+2 |
| | | |||||
| * | AI - Saner Livestock | SafwatHalaby | 2015-05-27 | 1 | -2/+11 |
| | | |||||
* | | Fix warnings in cPath | tycho | 2015-05-24 | 1 | -9/+9 |
| | | |||||
* | | Merge branch 'master' into PreventNewWarnings | tycho | 2015-05-24 | 3 | -26/+114 |
|\| | |||||
| * | Merge pull request #2122 from SafwatHalaby/bounding | worktycho | 2015-05-24 | 3 | -26/+114 |
| |\ | | | | | | | Pathfinder - Bounding boxes and some tweaks | ||||
| | * | Pathfinder - Bounding boxes and some tweaks | SafwatHalaby | 2015-05-23 | 3 | -26/+114 |
| | | | |||||
* | | | Made -Weverything an error. | tycho | 2015-05-24 | 12 | -27/+29 |
| | | | |||||
* | | | Merge branch 'master' into PreventNewWarnings | tycho | 2015-05-23 | 2 | -3/+3 |
|\| | | |||||
| * | | Fixed missing overrides and added a ignore flag for reserved macro for clang version 3.6 and higher. | Lukas Pioch | 2015-05-23 | 2 | -3/+3 |
| | | | |||||
* | | | Merge branch 'master' into PreventNewWarnings | tycho | 2015-05-23 | 4 | -31/+47 |
|\| | | |||||
| * | | Fixed creeper not exploding when 1 block higher than player | SafwatHalaby | 2015-05-23 | 1 | -2/+4 |
| |/ | |||||
| * | Path recalculation improvements | SafwatHalaby | 2015-05-20 | 3 | -10/+17 |
| | | |||||
| * | Merge pull request #2074 from SafwatHalaby/rmUnique | worktycho | 2015-05-20 | 2 | -19/+26 |
| |\ | | | | | | | Removed UniquePTR from PathFinder | ||||
| | * | newlines | SafwatHalaby | 2015-05-19 | 1 | -0/+9 |
| | | | |||||
| | * | Removed UniquePTR from PathFinder | SafwatHalaby | 2015-05-19 | 2 | -19/+17 |
| | | | |||||
* | | | Make -Werror disabling file only | tycho | 2015-05-19 | 24 | -30/+34 |
|/ / | | | | | | | Ad fix a load of warnings | ||||
* / | Manual merge of #2066 | Alexander Harkness | 2015-05-19 | 1 | -1/+1 |
|/ | |||||
* | Pathfinder - approximated paths when original destination unreachable | SafwatHalaby | 2015-05-17 | 5 | -55/+193 |
| | |||||
* | PathFinder uses UniquePtr for cell map. | SafwatHalaby | 2015-05-16 | 2 | -8/+3 |
| | |||||
* | Revert "PathFinder - smart pointers" | worktycho | 2015-05-15 | 2 | -3/+8 |
| | |||||
* | uniquePTR | SafwatHalaby | 2015-05-15 | 2 | -8/+3 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into warnings | Tiger Wang | 2015-05-10 | 8 | -11/+27 |
|\ | | | | | | | | | | | Conflicts: src/Mobs/Monster.cpp src/Vector3.h | ||||
| * | PF - Less calcs per tick | wiseoldman95 | 2015-05-10 | 1 | -1/+1 |
| | | |||||
| * | More style checking. | Mattes D | 2015-05-09 | 2 | -2/+2 |
| | | | | | | | | Spaces around some operators are checked. | ||||
| * | Merge pull request #1956 from Tri125/master | Mattes D | 2015-05-09 | 5 | -6/+20 |
| |\ | | | | | | | Fixed Magma cube sound and spawn size | ||||
| | * | GetSizeName of cSlime and cMagmaCube is now static | Tristan | 2015-05-09 | 4 | -4/+4 |
| | | | |||||
| | * | Big Magma Cube can now spawn | Tri125 | 2015-05-07 | 2 | -2/+2 |
| | | | | | | | | | | | | Following the same method as the Slime, Magma Cube can now spawn with the size of 1, 2 or 4. | ||||
| | * | Fixed the sound issue with the MagmaCube | Tri125 | 2015-05-07 | 2 | -2/+16 |
| | | | | | | | | | | | | | | | | | | -Name of the sound is correctly capitalized -Get the appropriate sound depending on its size | ||||
| * | | Move chunk position accesses after the chunk validity checks | worktycho | 2015-05-09 | 1 | -2/+4 |
| | | | |||||
* | | | Fixed some warnings and logic errors in Monster.cpp | Tiger Wang | 2015-05-10 | 1 | -5/+7 |
| | | | |||||
* | | | Fixed some Visual Studio warnings | Tiger Wang | 2015-05-09 | 1 | -5/+5 |
|/ / | |||||
* | | Spaces in cPath | wiseoldman95 | 2015-05-08 | 2 | -0/+2 |
| | | |||||
* | | Merge pull request #1949 from SafwatHalaby/burn | worktycho | 2015-05-07 | 3 | -35/+93 |
|\ \ | | | | | | | AI - Better shade cover | ||||
| * | | AI - Safer WouldBurnAt() | wiseoldman95 | 2015-05-06 | 1 | -3/+8 |
| | | | |||||
| * | | AI - Better shade cover | wiseoldman95 | 2015-05-06 | 1 | -1/+9 |
| | | | |||||
| * | | (duplicate) AI - Livestock escape fixed, water jumping fixed | wiseoldman95 | 2015-05-06 | 3 | -34/+79 |
| | | | |||||
* | | | Merge pull request #1951 from mc-server/BroadcastRefactor | Mattes D | 2015-05-07 | 1 | -2/+3 |
|\ \ \ | |_|/ |/| | | Added support for sending additional data in the ParticleEffect packet | ||||
| * | | Added support for additional data in the ParticleEffect Packet | tycho | 2015-05-07 | 1 | -2/+3 |
| |/ | | | | | | | Also started refactoring how broadcasts are handled | ||||
* / | Actually empty the open list | worktycho | 2015-05-06 | 1 | -1/+1 |
|/ | |||||
* | PF - Swimming bugfix | wiseoldman95 | 2015-05-06 | 1 | -3/+3 |
| | |||||
* | PF - Fixed mobs not reaching leaning player | wiseoldman95 | 2015-05-06 | 2 | -3/+10 |
| | |||||
* | AI - More conservative use of ResetPathFinding, fixed minor swimming / jumping bug | wiseoldman95 | 2015-05-05 | 2 | -26/+47 |
| | |||||
* | Entity improvements | Tiger Wang | 2015-05-04 | 5 | -262/+222 |
| | | | | | | | | •Pathfinder improvements •Fixes #1217 •Fixes #1933 Merge remote-tracking branch 'SafwatHalaby/water2' into fixes | ||||
* | Merge pull request #1930 from SafwatHalaby/AI_Jump | Tiger Wang | 2015-05-03 | 2 | -5/+16 |
|\ | | | | | AI - Improved Mob Jumping | ||||
| * | AI - Improved Mob Jumping | wiseoldman95 | 2015-05-03 | 2 | -5/+16 |
| | | |||||
* | | PathFinder - Crash fix, chunks in parameters are now references | wiseoldman95 | 2015-05-03 | 3 | -10/+8 |
|/ | |||||
* | Merge pull request #1925 from SafwatHalaby/PathFinder_Optimze | Tiger Wang | 2015-05-02 | 4 | -66/+38 |
|\ | | | | | Pathfinder optimization | ||||
| * | PathFinding - Chunk querying optimization and improve cPath::IsSolid | wiseoldman95 | 2015-05-02 | 4 | -66/+38 |
| | | |||||
* | | AI - Better daylight handling | wiseoldman95 | 2015-05-02 | 6 | -63/+22 |
|/ | |||||
* | A* Pathfinding and better monster AI | wiseoldman95 | 2015-05-01 | 11 | -156/+716 |
| | |||||
* | Update IronGolem.cpp | mathias-gh | 2015-04-17 | 1 | -1/+1 |
| | |||||
* | Added MobTypeName for Giant | mathias-gh | 2015-04-17 | 1 | -0/+1 |
| | |||||
* | Changed air drag units to 'interpolated ticks' per second | DevToaster | 2015-03-31 | 2 | -1/+3 |
| | |||||
* | Modified physics for more vanilla-like behavior | DevToaster | 2015-03-31 | 1 | -0/+2 |
| | |||||
* | Merge pull request #1826 from mc-server/UnifyPacketizer | Mattes D | 2015-03-24 | 1 | -11/+10 |
|\ | | | | | Unify packetizer | ||||
| * | Creeper: Fixed skeleton check. | Mattes D | 2015-03-21 | 1 | -11/+10 |
| | | |||||
* | | Correct world height validations. | Tommy Santerre | 2015-03-20 | 2 | -2/+2 |
|/ | | | | | Unify the way we test block above the current one (Height - 1 instead of a_RelY + 1). Allow generation of world of flat height = 255 | ||||
* | Monsters will now attack. Additional checks have been added when generating spawn. | tumultenrx | 2015-03-13 | 4 | -7/+5 |
| | | | | Monsters will now attack. Additional checks have been added when generating spawn. | ||||
* | Converted Monster to std::chrono | Tycho | 2015-01-16 | 4 | -18/+18 |
| | |||||
* | Initial convertion of a_Dt to std::chrono | Tycho | 2015-01-11 | 40 | -58/+56 |
| | | | | also refactored cWorld::m_WorldAge and cWorld::m_TimeOfDay | ||||
* | Fixed basic style. | Mattes D | 2014-12-25 | 2 | -2/+2 |
| | |||||
* | Fixed damn empty line with no use | Masy98 | 2014-12-20 | 2 | -5/+1 |
| | |||||
* | Added Rabbit.h and Rabbit.cpp to the CMakeList | Masy98 | 2014-12-20 | 1 | -0/+2 |
| | |||||
* | Fixed Rabbit size | Masy98 | 2014-12-20 | 1 | -1/+1 |
| | |||||
* | Added Rabbits | Masy98 | 2014-12-20 | 5 | -0/+68 |
| | |||||
* | Fixed Guardians size and health | Masy98 | 2014-12-19 | 1 | -1/+1 |
| | |||||
* | Guardian can now spawn if wanted!? | Masy98 | 2014-12-18 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into entities | Masy98 | 2014-12-18 | 1 | -0/+1 |
|\ | |||||
| * | derp | Howaner | 2014-12-17 | 1 | -1/+1 |
| | | |||||
| * | Added comment. | Howaner | 2014-12-17 | 1 | -1/+1 |
| | | |||||
| * | Fixed eMonsterType lua bugs. | Howaner | 2014-12-17 | 1 | -0/+1 |
| | | |||||
* | | Added Entity Guardian | Masy98 | 2014-12-18 | 7 | -1/+105 |
|/ | |||||
* | Merge remote-tracking branch 'origin/master' into c++11 | Tiger Wang | 2014-12-06 | 6 | -9/+28 |
|\ | | | | | | | | | Conflicts: src/OSSupport/Thread.cpp | ||||
| * | BasicStyle: Added missing braces to control statements. | Mattes D | 2014-12-05 | 2 | -5/+24 |
| | | |||||
| * | Fixed reported parentheses around comparisons. | Mattes D | 2014-12-05 | 4 | -4/+4 |
| | | |||||
* | | Merged branch 'origin/master' into c++11. | Mattes D | 2014-12-04 | 4 | -80/+75 |
|\| | |||||
| * | clearing CheckBasicStyle.lua messages | p-mcgowan | 2014-12-03 | 1 | -4/+4 |
| | | |||||
| * | MobSpawner fixes. | Howaner | 2014-12-01 | 2 | -1/+2 |
| | | |||||
| * | Merge branch 'master' into MobSpawner | Howaner | 2014-12-01 | 2 | -19/+1 |
| |\ | | | | | | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua | ||||
| | * | Removed old StringToMobType() function from Monster.cpp | Howaner | 2014-11-30 | 1 | -10/+0 |
| | | | |||||
| | * | Mark StringToMobType() as deprecated. Use cMonster:StringToMobType() instead | Howaner | 2014-11-29 | 1 | -9/+1 |
| | | | |||||
| * | | Many api fixes, add vanilla names to mob type -> string functions and mob spawner fixes. | Howaner | 2014-11-29 | 2 | -56/+68 |
| | | | |||||
| * | | Merge branch 'master' into MobSpawner | Howaner | 2014-11-29 | 5 | -5/+37 |
| |\| | |||||
| | * | Merge remote-tracking branch 'origin/master' into GeneratorShapeRefactor | Mattes D | 2014-11-23 | 3 | -0/+30 |
| | |\ | |||||
| | * | | Mobs: Fixed crash with terrain too high. | Mattes D | 2014-11-15 | 2 | -5/+7 |
| | | | | |||||
| * | | | Merge branch 'master' into MobSpawner | Howaner | 2014-11-18 | 51 | -120/+158 |
| |\| | | | | | | | | | | | | | | | | | | Conflicts: MCServer/Plugins/Core | ||||
| * | | | Merge branch 'master' into MobSpawner | Howaner | 2014-09-26 | 13 | -113/+200 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/MobSpawner.h src/Mobs/Monster.h | ||||
| * | | | | Implemented mob spawner. | Howaner | 2014-09-19 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge remote-tracking branch 'origin-master' into c++11 | Tiger Wang | 2014-11-26 | 2 | -5/+7 |
| | | | | | |||||
* | | | | | Merge remote-tracking branch 'origin/master' into c++11 | Tiger Wang | 2014-11-23 | 3 | -0/+30 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | Conflicts: src/Noise/Noise.h src/World.h | ||||
| * | | | | formatting - newline at EOF inserted: Pig.cpp | p-mcgowan | 2014-11-23 | 1 | -1/+5 |
| | | | | | |||||
| * | | | | pigs turn into pigmen on lightning | p-mcgowan | 2014-11-23 | 2 | -0/+19 |
| | | | | | |||||
| * | | | | formatter error | p-mcgowan | 2014-11-22 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | villagers turn into witches on lightning | p-mcgowan | 2014-11-22 | 1 | -2/+4 |
| | | | | | |||||
| * | | | | villagers turn into witches when struck by lightning | p-mcgowan | 2014-11-22 | 1 | -0/+5 |
| | |_|/ | |/| | | |||||
* | | | | Merged branch 'master' into c++11. | Mattes D | 2014-10-23 | 1 | -32/+28 |
|\| | | | |||||
| * | | | En masse NULL -> nullptr replace | Tiger Wang | 2014-10-23 | 48 | -86/+86 |
| | | | | |||||
| * | | | convert old style casts to fix warnings | Steven Riehl | 2014-10-12 | 1 | -32/+28 |
| | | | | |||||
* | | | | En masse NULL -> nullptr replace | Tiger Wang | 2014-10-20 | 48 | -86/+86 |
| | | | | |||||
* | | | | Migrated random generators to std::random | Tiger Wang | 2014-10-19 | 3 | -2/+1 |
|/ / / | |||||
* | | | Fixed a missed value. | madmaxoft | 2014-10-05 | 1 | -1/+1 |
| | | | |||||
* | | | Removed obsolete cMonster::eType. | madmaxoft | 2014-10-05 | 1 | -3/+0 |
| | | | | | | | | | | | | Has been replaced with global eMonsterType. | ||||
* | | | Fixed eMonsterType Lua API mismatch. | madmaxoft | 2014-10-05 | 3 | -0/+24 |
| | | | |||||
* | | | Derp | Jonathan Frederick | 2014-09-29 | 1 | -1/+1 |
| | | | |||||
* | | | Fix comments | Jonathan Frederick | 2014-09-29 | 1 | -2/+2 |
| | | | |||||
* | | | Make endermen take damage in water | Jonathan Frederick | 2014-09-28 | 2 | -0/+21 |
| | | | |||||
* | | | Fixed minor style issues. | madmaxoft | 2014-09-27 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge pull request #1415 from Masy98/blocks | Mattes D | 2014-09-26 | 1 | -1/+1 |
|\ \ | | | | | | | Added 1.8 Blocks and Items | ||||
| * \ | Merge branch 'master' into blocks | Masy98 | 2014-09-26 | 12 | -112/+208 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Items/ItemHandler.cpp src/Simulator/IncrementalRedstoneSimulator.cpp | ||||
| * | | | Fixed mutton name in Sheep.cpp | Masy98 | 2014-09-11 | 1 | -1/+1 |
| | | | | |||||
* | | | | Removed more unessicary includes | Tycho | 2014-09-26 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | Merge pull request #1419 from mc-server/redstoneTests | worktycho | 2014-09-26 | 10 | -107/+117 |
|\ \ \ | | | | | | | | | Added test mocking to IncrementalRedstoneSimulator | ||||
| * | | | Fixed style | Tycho | 2014-09-25 | 1 | -0/+3 |
| | | | | |||||
| * | | | Merge branch 'master' into redstoneTests | Tycho | 2014-09-25 | 3 | -2/+81 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Mobs/Monster.h | ||||
| * \ \ \ | Merge branch 'master' into redstoneTests | Tycho | 2014-09-17 | 2 | -1/+10 |
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | Conflicts: src/Blocks/ChunkInterface.h | ||||
| * | | | | Added first test to show the object can be created | Tycho | 2014-09-17 | 10 | -110/+115 |
| | |_|/ | |/| | | |||||
* | | | | Fixed wrong Surrounding size | Howaner | 2014-09-25 | 1 | -3/+3 |
| |_|/ |/| | | |||||
* | | | Merge branch 'master' into EntityCustomName | Howaner | 2014-09-23 | 3 | -1/+17 |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/ClientHandle.h src/Protocol/Protocol.h src/Protocol/Protocol125.cpp src/Protocol/Protocol125.h src/Protocol/Protocol17x.cpp src/Protocol/Protocol17x.h src/Protocol/ProtocolRecognizer.cpp src/Protocol/ProtocolRecognizer.h src/World.cpp src/World.h | ||||
| * | | Improved cBlockHandler::DropBlock | Tiger Wang | 2014-09-13 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into Effects | Howaner | 2014-09-12 | 1 | -0/+7 |
| |\| | |||||
| | * | Revert "Globals.h: Added Floor and Ciel casting, C++ cast cleanups, etc" | archshift | 2014-09-04 | 1 | -7/+5 |
| | | | | | | | | | | | | | | | | | | This reverts commit 472efa8174626a00ffdf5b39e1a44ac419cd3698. Apparently we don't support some of these features quite yet (darn you C++98!) | ||||
| | * | Globals.h: Added Floor and Ciel casting, C++ cast cleanups, etc | archshift | 2014-09-04 | 1 | -5/+7 |
| | | | | | | | | | | | | Snow Golems must also be above 64Y to spawn snow (as of 1.8). | ||||
| | * | Fixed style and alpha-sorting. | madmaxoft | 2014-09-03 | 1 | -7/+7 |
| | | | |||||
| | * | Added mutton, which sheep now drop when killed | archshift | 2014-09-03 | 1 | -0/+7 |
| | | | |||||
| * | | Renamed SetWalkSpeed() to SetRelativeWalkSpeed() | Howaner | 2014-09-02 | 2 | -5/+5 |
| | | | |||||
| * | | Added SetWalkSpeed() to cMonster. | Howaner | 2014-08-30 | 2 | -0/+9 |
| |/ | |||||
* | | Added CustomName saving. | Howaner | 2014-09-02 | 1 | -2/+8 |
| | | |||||
* | | Added the new functions to APIDump. | Howaner | 2014-09-02 | 1 | -2/+2 |
| | | |||||
* | | Added SetCustomName() to players. | Howaner | 2014-09-02 | 1 | -1/+2 |
| | | |||||
* | | Added name tag | Howaner | 2014-09-01 | 3 | -0/+23 |
| | | |||||
* | | Added CustomName to cMonster. | Howaner | 2014-09-01 | 2 | -1/+48 |
|/ | |||||
* | Fixed mob burning. | reiter | 2014-08-28 | 1 | -1/+1 |
| | | | Fixes #1298 | ||||
* | BasicStyleCheck: Dividers are exactly 80 slashes. | madmaxoft | 2014-08-04 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into Monster | Howaner | 2014-08-04 | 1 | -2/+1 |
|\ | |||||
| * | Refactored case-conversion functions. | madmaxoft | 2014-08-04 | 1 | -2/+1 |
| | | | | | | | | StrToLower() returns a modified copy of the string, InPlaceLowercase() modifies the string in-place. | ||||
* | | Changed /** to /* | Howaner | 2014-08-04 | 1 | -3/+5 |
| | | |||||
* | | Fixed warnings | Howaner | 2014-08-04 | 1 | -3/+3 |
| | | |||||
* | | Attempt to fix knockback and swimming. | Howaner | 2014-08-04 | 1 | -3/+9 |
|/ | |||||
* | Wolf uses UUID for owner. | madmaxoft | 2014-08-03 | 2 | -3/+13 |
| | | | | Fixes #1277. | ||||
* | Trailing whitespace fix. | madmaxoft | 2014-08-03 | 1 | -1/+1 |
| | |||||
* | Improved endermen code a little | Tiger Wang | 2014-08-01 | 3 | -20/+56 |
| | |||||
* | Merge pull request #1047 from mc-server/Enderman | Tiger Wang | 2014-07-31 | 2 | -0/+121 |
|\ | | | | | Enderman attacks a player if he's looking at him | ||||
| * | Comment suggestions | Tiger Wang | 2014-07-31 | 1 | -9/+8 |
| | | |||||
| * | Added lighting code and added comments | STRWarrior | 2014-07-30 | 1 | -0/+17 |
| | | |||||
| * | Removed lighting code in cEnderman::CheckEventSeePlayer | STRWarrior | 2014-07-30 | 1 | -9/+1 |
| | | |||||
| * | Changed comment | worktycho | 2014-06-30 | 1 | -1/+1 |
| | | |||||
| * | Replaced strange algebra with dot product. | worktycho | 2014-06-18 | 1 | -4/+6 |
| | | | | | | | | 10 degrees is a completely arbitary constant I pulled from nowhere. Feel free to adjust this value. | ||||
| * | Improved Enderman code | Tiger Wang | 2014-06-18 | 2 | -14/+34 |
| | | |||||
| * | Swapped m_Player and m_EndermanPos | STRWarrior | 2014-06-18 | 1 | -2/+2 |
| | | |||||
| * | Enderman attacks a player if he's looking at him. | STRWarrior | 2014-06-18 | 2 | -0/+91 |
| | | |||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-07-29 | 31 | -36/+32 |
|\ \ | | | | | | | | | | | | | Conflicts: src/World.h | ||||
| * \ | Merge branch 'master' into Inventory2 | Howaner | 2014-07-26 | 30 | -31/+31 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: src/BlockInfo.cpp | ||||
| | * | | Removed redundant semicolons and re-added warning | archshift | 2014-07-24 | 30 | -31/+31 |
| | | | | |||||
| * | | | Fix item durability. | Howaner | 2014-07-23 | 1 | -5/+1 |
| |/ / | | | | | | | Fixes #1181 | ||||
* | | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-07-22 | 10 | -34/+173 |
|\| | | | | | | | | | | | | | | | | | | | | | | | 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 | -1/+1 |
| | | | |||||
| * | | Style: Normalized spaces after if, for and while. | madmaxoft | 2014-07-21 | 1 | -1/+1 |
| | | | |||||
| * | | Monsters: Made IsUndead overridable by the respective mob classes | archshift | 2014-07-19 | 6 | -13/+11 |
| | | | |||||
| * | | Fixed style: spaces after commas. | madmaxoft | 2014-07-19 | 2 | -2/+2 |
| | | | |||||
| * | | Merge pull request #1214 from mc-server/anti-glob | Mattes D | 2014-07-19 | 1 | -5/+71 |
| |\ \ | | | | | | | | | CMake - Explicitly lists all source files | ||||
| | * | | Subdirs: Only add_library if not using MSVC | archshift | 2014-07-19 | 1 | -1/+3 |
| | | | | |||||
| | * | | Mobs/CMakeLists.txt: Replaced glob with list of files | archshift | 2014-07-19 | 1 | -5/+69 |
| | | | | |||||
| * | | | Fixed clamping issues | archshift | 2014-07-19 | 1 | -5/+1 |
| |/ / | |||||
| * | | Merge branch 'Entities' | madmaxoft | 2014-07-18 | 3 | -7/+86 |
| |\ \ | |||||
| | * | | Fixed slime-related comments. | madmaxoft | 2014-07-18 | 3 | -5/+10 |
| | | | | |||||
| | * | | Slime sizes are 1, 2 or 4 and not 1, 2 or 3. | Howaner | 2014-07-18 | 3 | -4/+4 |
| | | | | |||||
| | * | | Split into more lines. | Howaner | 2014-07-17 | 2 | -6/+10 |
| | | | | |||||
| | * | | Fixed many slime bugs. | Howaner | 2014-07-17 | 2 | -3/+73 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed slime hurt/death sound - Added slime spawning on death. - Fixed the max health. - Fixed the attack damage. - Little slimes should not attack players. | ||||
* | | | | Merge branch 'master' into portals | Tiger Wang | 2014-07-18 | 23 | -111/+238 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | Monster fixes | Tiger Wang | 2014-07-18 | 6 | -31/+5 |
| | | | | | | | | | | | | | | | | | | | | * Fixes #1203 * Fixes #627 | ||||
| * | | | Fixed spaces before commas. | madmaxoft | 2014-07-18 | 1 | -3/+3 |
| | | | | |||||
| * | | | Skeletons should spawn with a bow in the hand. | Howaner | 2014-07-18 | 2 | -0/+17 |
| | | | | | | | | | | | | Fixes #1184 | ||||
| * | | | Fixed tabs used for alignment. | madmaxoft | 2014-07-17 | 1 | -1/+1 |
| | | | | |||||
| * | | | More trailing whitespace fixes. | madmaxoft | 2014-07-17 | 2 | -2/+2 |
| | | | | |||||
| * | | | Basic style fixes. | madmaxoft | 2014-07-17 | 4 | -9/+9 |
| | | | | |||||
| * | | | Normalized comments. | madmaxoft | 2014-07-17 | 7 | -31/+30 |
| |/ / | | | | | | | | | | | | | 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 | 7 | -12/+12 |
| |\ \ | |||||
| | * \ | Merge pull request #1193 from mc-server/deathmessages | Mattes D | 2014-07-17 | 7 | -12/+12 |
| | |\ \ | | | | | | | | | | | Death messages | ||||
| | | * | | Resolved backwards compatibility issues | Tiger Wang | 2014-07-16 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Tailored death messages | Tiger Wang | 2014-07-04 | 6 | -11/+11 |
| | | | | | |||||
| * | | | | Merge branch 'master' into potions | madmaxoft | 2014-07-15 | 4 | -10/+68 |
| |\| | | | |||||
| | * | | | Update. | Howaner | 2014-07-13 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge branch 'master' into Sounds | Howaner | 2014-07-13 | 3 | -6/+64 |
| | |\ \ \ | |||||
| | | * | | | Changed comments. | Howaner | 2014-07-13 | 1 | -3/+5 |
| | | | | | | |||||
| | | * | | | Merge branch 'master' into Sheep | Howaner | 2014-07-13 | 4 | -9/+25 |
| | | |\ \ \ | |||||
| | | * | | | | Add doxy-comments. | Howaner | 2014-07-01 | 1 | -1/+4 |
| | | | | | | | |||||
| | | * | | | | Moved the random code to a function (cSheep::GenerateNaturalRandomColor()) | Howaner | 2014-06-30 | 2 | -36/+47 |
| | | | | | | | |||||
| | | * | | | | Save IsSheared from Sheep. | Howaner | 2014-06-28 | 1 | -0/+3 |
| | | | | | | | |||||
| | | * | | | | Fix sheep color's, add shear sound. | Howaner | 2014-06-28 | 3 | -3/+42 |
| | | | |/ / | | | |/| | | |||||
| | * | | | | Changed BroadcastSoundEffect function to take floating pos. | Howaner | 2014-07-13 | 2 | -4/+4 |
| | | |/ / | | |/| | | |||||
| * | | | | For now, removed creator member from Entity Effect for pointer safety | archshift | 2014-07-12 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'origin/master' into potions | archshift | 2014-07-10 | 8 | -9/+49 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Entities/Player.cpp src/Entities/ProjectileEntity.cpp | ||||
| | * | | | Merge pull request #1135 from mc-server/fixes | Tiger Wang | 2014-07-09 | 3 | -8/+24 |
| | |\ \ \ | | | | | | | | | | | | | Fixes to projectiles and the undead | ||||
| | | * | | | Changed everything to callbacks | Tiger Wang | 2014-07-05 | 1 | -2/+20 |
| | | | | | | |||||
| | | * | | | Bettered zombie and skeleton AI | Tiger Wang | 2014-06-22 | 2 | -6/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Fixed potential issues with skylight detection | ||||
| | * | | | | Fixed slime handling in cMonster::StringToMobType(). | madmaxoft | 2014-07-06 | 1 | -1/+1 |
| | | |/ / | | |/| | | |||||
| | * | | | Merged branch 'tonibm19/master'. | Mattes D | 2014-06-26 | 2 | -0/+21 |
| | |\ \ \ | | | |/ / | | |/| | | |||||
| | | * | | Added pig riding. | tonibm19 | 2014-06-20 | 2 | -0/+14 |
| | |/ / | | | | | | | | | | | | | Now you can ride a pig using a carrot on a stick. | ||||
| * | | | EntityEffects.x -> EntityEffect.x, Object-Oriented effects | archshift | 2014-06-19 | 2 | -47/+0 |
| | | | | | | | | | | | | | | | | Changed effect map to take a pointer of the effect as a result. | ||||
| * | | | Entity effects: changed User to Creator, removed pawn pass-by-value | archshift | 2014-06-17 | 1 | -1/+1 |
| | | | | |||||
| * | | | Entity Effects: Clarified user, added it to AddEntityEffect | archshift | 2014-06-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Added second AddEntityEffect with a pass-by-value of the class. | ||||
| * | | | Changed the AddEntityEffect() params for easier calls. | madmaxoft | 2014-06-17 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fixed MSVC compilation. | madmaxoft | 2014-06-17 | 1 | -3/+3 |
| | | | | |||||
| * | | | Pawn: renamed HandleEntityEffects to HandleEntityEffect | archshift | 2014-06-17 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | Exported entity effect functions for ToLua and documented them in APIDesc.lua | ||||
| * | | | Cave spider now poisons its victim, added IsPawn function to Entity | archshift | 2014-06-17 | 3 | -4/+22 |
| | | | | |||||
| * | | | Monster: added IsUndead(), undead-specific entity effects | archshift | 2014-06-17 | 2 | -0/+71 |
| | |/ | |/| | |||||
* | | | Merge branch 'master' into portals | Tiger Wang | 2014-06-21 | 3 | -0/+3 |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h | ||||
| * | | Nullify deleted pointers. | archshift | 2014-06-19 | 3 | -0/+3 |
| |/ | |||||
* | | More suggestions | Tiger Wang | 2014-06-21 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-06-10 | 7 | -10/+7 |
|\| | | | | | | | | | | | | | | | | | 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 | 5 | -5/+5 |
| | | | | | | | | Fixes #1039, fixes #851 | ||||
| * | Fixed mob hitbox sizes, removed TODOs | archshift | 2014-06-07 | 3 | -5/+2 |
| | | | | | | | | | | Measured bat and blaze in vanilla, updated values. Cavespiders are, in fact, passive in the day. | ||||
* | | Fixed decision failure | Tiger Wang | 2014-06-05 | 1 | -1/+1 |
| | | |||||
* | | Added checks for no downfall biomes | Tiger Wang | 2014-06-04 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-06-04 | 2 | -6/+22 |
|\| | |||||
| * | Exploded creepers drop nothing, part of #1058 | Tiger Wang | 2014-06-04 | 1 | -2/+8 |
| | | |||||
| * | Small tweak for mobs | STRWarrior | 2014-06-02 | 1 | -4/+14 |
| | | | | | | | | Mobs move a bit smoother and aren't able to move allot when in air. | ||||
* | | Very minor code changes | Tiger Wang | 2014-05-29 | 1 | -1/+1 |
|/ | |||||
* | Fixed cWither::KilledBy | andrew | 2014-05-21 | 1 | -1/+2 |
| | |||||
* | Cleaned up cPlayer::UpdateMovementStats; Wither achievements | andrew | 2014-05-20 | 2 | -0/+34 |
| | |||||
* | Merge pull request #998 from mc-server/StatManager | Mattes D | 2014-05-18 | 1 | -1/+3 |
|\ | | | | | Statistic Manager | ||||
| * | Fixes | andrew | 2014-05-13 | 1 | -1/+1 |
| | | |||||
| * | Movement Statistics | andrew | 2014-05-12 | 1 | -1/+3 |
| | | |||||
* | | Fixed a few more switch warnings. | archshift | 2014-05-12 | 1 | -0/+2 |
|/ | |||||
* | Merge branch 'master' into redstoneimprovements | Tiger Wang | 2014-05-04 | 17 | -32/+65 |
|\ | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/FallingBlock.cpp src/Mobs/AggressiveMonster.cpp src/Simulator/IncrementalRedstoneSimulator.cpp | ||||
| * | Fixed MagmaCube spawning. | madmaxoft | 2014-05-02 | 1 | -0/+4 |
| | | | | | | | | Fixes #928. | ||||
| * | Merge pull request #940 from Howaner/GlobalFixes | Mattes D | 2014-04-28 | 14 | -32/+58 |
| |\ | | | | | | | Add entity invulnerable | ||||
| | * | Revert "Withers now use the new invulnerable." | Howaner | 2014-04-28 | 2 | -10/+26 |
| | | | | | | | | | This reverts commit 619592b5a0ab651e714d55932bc7909e4204cee9. | ||||
| | * | Revert "Changed the old invulnerable methods from the wither to the new." | Howaner | 2014-04-28 | 1 | -3/+0 |
| | | | | | | | | | This reverts commit d50f8f6f11f69e7e1e56be92fb2d72a5014a3e34. | ||||
| | * | Changed the old invulnerable methods from the wither to the new. | Howaner | 2014-04-26 | 1 | -0/+3 |
| | | | |||||
| | * | Withers now use the new invulnerable. | Howaner | 2014-04-26 | 2 | -26/+10 |
| | | | |||||
| | * | Fixes | Howaner | 2014-04-26 | 2 | -8/+8 |
| | | | |||||
| | * | Add entity invulnerable | Howaner | 2014-04-26 | 14 | -24/+50 |
| | | | |||||
| * | | Merge pull request #954 from mc-server/projectiles-split | Mattes D | 2014-04-28 | 3 | -0/+3 |
| |\ \ | | | | | | | | | Totally refactored ProjectileEntity.h, splitting up into several files. | ||||
| | * | | Fixed projectile source filenames, indentations | archshift | 2014-04-28 | 3 | -3/+3 |
| | | | | |||||
| | * | | Moved cGhastFireballEntity out of ProjectileEntity.h | archshift | 2014-04-27 | 1 | -0/+1 |
| | | | | |||||
| | * | | Moved cFireChargeEntity out of ProjectileEntity.h | archshift | 2014-04-27 | 1 | -0/+1 |
| | | | | |||||
| | * | | Moved cArrowEntity out of ProjectileEntity.h | archshift | 2014-04-27 | 1 | -0/+1 |
| | | | | |||||
| * | | | Fixed warnings. | madmaxoft | 2014-04-27 | 1 | -2/+2 |
| | | | | |||||
| * | | | Added static const, initialized fields. | archshift | 2014-04-27 | 1 | -1/+1 |
| |/ / | |||||
* / / | Redstone simulator now directly accesses cChunk | Tiger Wang | 2014-04-27 | 1 | -3/+2 |
|/ / | | | | | | | | | | | * Redstone simulator performance improvements * Added return values to some functions * Minor fixes | ||||
* | | Further refactored, Reverted Minecart change | archshift | 2014-04-26 | 2 | -3/+3 |
| | | | | | | | | Other small changes. | ||||
* | | Fixed mobs that don't naturally spawn. | archshift | 2014-04-26 | 2 | -2/+6 |
| | | |||||
* | | Moved huge conditional out of InStateChasing(), improving readability | archshift | 2014-04-26 | 2 | -1/+20 |
| | | | | | | | | Squashed a warning. | ||||
* | | Merge remote-tracking branch 'upstream/master' | archshift | 2014-04-25 | 1 | -0/+1 |
|\| | |||||
| * | Cmake generated projects for IDEs include headers in project files. | archshift | 2014-04-25 | 1 | -0/+1 |
| | | |||||
* | | Giants! | archshift | 2014-04-25 | 2 | -7/+12 |
|/ | | | | Changed mfMaxplusone to mfUnhandled for readability, and fixed a default case warning. | ||||
* | Fixed class capitalization for the cave spider. | archshift | 2014-04-24 | 3 | -6/+6 |
| | |||||
* | Fixed references to renamed files. | archshift | 2014-04-24 | 4 | -7/+7 |
| | |||||
* | Rename mob source files to fit CamelCase. | archshift | 2014-04-24 | 6 | -6/+0 |
| | | | | | | | | | | | | | | Rename Cavespider.cpp to CaveSpider.cpp Rename Cavespider.h to CaveSpider.h Rename Magmacube.cpp to MagmaCube.cpp Rename Magmacube.h to MagmaCube.h Rename Zombiepigman.cpp to ZombiePigman.cpp Rename Zombiepigman.h to ZombiePigman.h | ||||
* | Merge pull request #909 from jfhumann/fixes | Mattes D | 2014-04-22 | 2 | -4/+5 |
|\ | | | | | | | | | Bug fixes and optimizations. We need to visit the API functions and check that they return only those values expected. `cWorld::CreateProjectile()` seems affected, too, by the same issue of ToLua returning extra values. In the cleanest form, these functions will need moving to ManualBindings.cpp | ||||
| * | Merge remote-tracking branch 'origin/master' into fixes | jfhumann | 2014-04-18 | 5 | -18/+32 |
| |\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Authenticator.cpp src/ClientHandle.cpp src/Entities/Minecart.cpp src/Protocol/Protocol17x.cpp | ||||
| * | | Did some static analysis, fixed some bugs and optimized a lot of code | jfhumann | 2014-04-18 | 2 | -4/+5 |
| | | | |||||
* | | | Compilation fix | Tiger Wang | 2014-04-18 | 1 | -1/+1 |
| | | | |||||
* | | | Fixed #906 | Tiger Wang | 2014-04-18 | 1 | -1/+2 |
| | | | |||||
* | | | Fixed #904 | Tiger Wang | 2014-04-18 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge pull request #891 from mc-server/fixes | Mattes D | 2014-04-17 | 3 | -4/+4 |
|\ \ | | | | | | | Fixes to redstone & general | ||||
| * | | Entities handle chunks properly again | Tiger Wang | 2014-04-12 | 3 | -4/+4 |
| |/ | | | | | | | | | * Entities properly handle chunks * Changed EntityStatus enums to be less shouty | ||||
* / | Added new AI rules | Tiger Wang | 2014-04-17 | 2 | -14/+28 |
|/ | | | | | | | + 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 GitHuB WebEdit fail. | Alexander Harkness | 2014-04-10 | 1 | -0/+1 |
| | |||||
* | Update Monster.cpp | Alexander Harkness | 2014-04-10 | 1 | -2/+4 |
| | |||||
* | Merge pull request #849 from mc-server/minorfixes | Mattes D | 2014-04-02 | 1 | -8/+10 |
|\ | | | | | Minor fixes | ||||
| * | Final realisation of suggestions | Tiger Wang | 2014-03-31 | 1 | -5/+7 |
| | | |||||
| * | Fixed a few Y too high/low asserts | Tiger Wang | 2014-03-31 | 1 | -5/+5 |
| | | |||||
* | | Merge branch 'MacFixes' | Tycho | 2014-04-02 | 3 | -6/+2 |
|\ \ | | | | | | | | | | | | | | | | Conflicts: src/DeadlockDetect.cpp src/World.cpp | ||||
| * | | More fixes to get it to compile for me on Mac 10.9. Mostly just newline additions, but some of the unused variables were causing errors, so I wrapped them in #ifndef __APPLE__ calls, since I didn't know if they were going to be used in the future. | Samuel Barney | 2014-03-25 | 3 | -6/+2 |
| |/ | | | | | | | Also had to undefine TOLUA_TEMPLATE_BIND a couple of times. | ||||
* | | Fixed clang compilation | andrew | 2014-03-25 | 1 | -1/+1 |
| | | |||||
* | | Fixed wither summoning | andrew | 2014-03-25 | 2 | -2/+13 |
| | | |||||
* | | Protocol: Wither metadata | andrew | 2014-03-25 | 2 | -0/+19 |
|/ | |||||
* | Minor fixes | andrew | 2014-03-25 | 2 | -4/+3 |
| | |||||
* | Wither invulnerability | andrew | 2014-03-24 | 3 | -1/+66 |
| | |||||
* | Fixed double to float conversions. | madmaxoft | 2014-03-16 | 1 | -5/+5 |
| | |||||
* | Unified Vector classes | andrew | 2014-03-11 | 2 | -2/+2 |
| | |||||
* | Merge branch 'master' into ballisticmissiles | Tiger Wang | 2014-03-09 | 6 | -17/+43 |
|\ | | | | | | | | | Conflicts: src/ClientHandle.cpp | ||||
| * | cBlockInfo now manages the respective cBlockHandler | andrew | 2014-03-02 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #738 from xdot/master | Mattes D | 2014-03-02 | 2 | -6/+6 |
| |\ | | | | | | | Refactored global block property arrays | ||||
| | * | g_BlockXXX => cBlockInfo::XXX | andrew | 2014-03-01 | 2 | -6/+6 |
| | | | |||||
| * | | Creeper fixes | tonibm19 | 2014-03-02 | 2 | -10/+34 |
| |/ | | | | | | | | | - Fixed explosion time (1.5s, according to minecraftwiki) - Creeper explodes if right clicked with flint and steel | ||||
| * | added mooshroom to cow conversion | tonibm19 | 2014-02-27 | 1 | -0/+2 |
| | | |||||
* | | Fixed sheep ASSERTing sometimes | Tiger Wang | 2014-02-27 | 1 | -8/+18 |
|/ | |||||
* | Merge pull request #710 from TheJumper/master | Mattes D | 2014-02-24 | 24 | -38/+319 |
|\ | | | | | Fixed Mob Drops, Add Rare, Uncommon and Gear Drops, Looting inflicts Drops | ||||
| * | Fixed Formatting, added compiler warning suppressing methods, fixed comments | TheJumper | 2014-02-24 | 5 | -3/+6 |
| | | |||||
| * | Fixed Formatting, Added DropChances and CanPickUpLoot attributes to Monsters | TheJumper | 2014-02-23 | 24 | -38/+316 |
| | | |||||
* | | Add Wolf Heal with Food | Howaner | 2014-02-20 | 1 | -10/+34 |
|/ | |||||
* | Merge pull request #690 from tonibm19/master | Alexander Harkness | 2014-02-17 | 1 | -2/+2 |
|\ | | | | | Now mobs can't escape from fences. | ||||
| * | Improved formatting | tonibm19 | 2014-02-17 | 1 | -2/+2 |
| | | |||||
| * | Now mobs can't escape from fences. | tonibm19 | 2014-02-16 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #692 from mc-server/wolfcleanup | Alexander Harkness | 2014-02-17 | 1 | -30/+15 |
|\ \ | | | | | | | Wolf cleanup | ||||
| * | | Fixes to previous commit | Tiger Wang | 2014-02-16 | 1 | -9/+10 |
| | | | |||||
| * | | Slight cleanup of wolf code | Tiger Wang | 2014-02-16 | 1 | -23/+7 |
| |/ | |||||
* / | Fixed TNT fizzing everywhere | Tiger Wang | 2014-02-15 | 1 | -1/+1 |
|/ | |||||
* | Simplified Attack() tracing | Tiger Wang | 2014-02-12 | 1 | -1/+6 |
| | |||||
* | Fixed #627 | Tiger Wang | 2014-02-11 | 4 | -19/+10 |
| | | | | | | | - Attack() is now called from cAggressive instead of cMonster * Monsters can no longer attack through walls * Should fix last remnants of player damage after teleporting (that both STR and bearbin contributed fixes to :P) | ||||
* | Merge remote-tracking branch 'origin/master' into playerimprovements | Tiger Wang | 2014-02-09 | 2 | -6/+6 |
|\ | | | | | | | | | | | | | Conflicts: src/Root.cpp src/Root.h src/World.cpp | ||||
| * | Merge pull request #646 from worktycho/warningfixes | Alexander Harkness | 2014-02-05 | 2 | -6/+6 |
| |\ | | | | | | | Fixed most of the reordering warnings | ||||
| | * | Fixed most of the reordering warnings | Tycho | 2014-02-05 | 2 | -6/+6 |
| | | | |||||
* | | | Merge branch 'master' into playerimprovements | Tiger Wang | 2014-02-09 | 3 | -1/+14 |
|\| | | | | | | | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua | ||||
| * | | Merge pull request #635 from tonibm19/master | Mattes D | 2014-02-04 | 2 | -0/+13 |
| |\ \ | | |/ | |/| | Exported Item:IsEnchantable and Monster:MoveToPosition to Lua API | ||||
| | * | Blank lines and indentation. | tonibm19 | 2014-02-04 | 1 | -0/+4 |
| | | | | | | | | | | | | Also removed GetClosestPlayer documentation | ||||
| | * | Exporded World:FindClosestPlayer, Item:IsEnchantable and Monster:MoveToPosition to Lua API | tonibm19 | 2014-02-03 | 2 | -0/+9 |
| | | | |||||
| * | | Increased Type safety of Biomes | Tycho | 2014-02-03 | 1 | -1/+1 |
| |/ | | | | | | | | | Changed a number of funcictions from using integers to store biomes to using EMCSBiome Note that switching from an int to an Enum is a non-breaking chang to the lua bindings | ||||
* / | Fixed a bunch of MSVS warnings | Tiger Wang | 2014-02-05 | 1 | -1/+1 |
|/ | | | | | * Possibly also fixed some bugs with pathfinding and TNT, though unlikely | ||||
* | Merge branch 'master' into GeneratingBenchmark2 | Tycho | 2014-02-02 | 2 | -1/+2 |
|\ | | | | | | | | | Conflicts: src/Blocks/BlockTorch.h | ||||
| * | Monster's nominal speed was increased. | Kirill Kirilenko | 2014-02-01 | 1 | -1/+1 |
| | | |||||
| * | Fixed teleport to air, if owner is flying. | Kirill Kirilenko | 2014-02-01 | 1 | -0/+1 |
| | | |||||
* | | Changed Signiture of OnUpdate | Tycho | 2014-02-02 | 1 | -1/+4 |
|/ | |||||
* | Did what xoft said | tonibm19 | 2014-01-29 | 4 | -5/+3 |
| | |||||
* | Rewritten code. | tonibm19 | 2014-01-29 | 12 | -152/+25 |
| | | | | | Implemented xoft suggestion. Using MoveToPosition as tigerw suggested. | ||||
* | Fixed sheep | tonibm19 | 2014-01-29 | 1 | -18/+17 |
| | |||||
* | Fixed a copypasta error... | tonibm19 | 2014-01-29 | 4 | -1/+5 |
| | |||||
* | Now mobs follow you when holding their breed item | tonibm19 | 2014-01-29 | 10 | -5/+153 |
| | |||||
* | Renamed Farmer functions and added doxycomments | STRWarrior | 2014-01-28 | 2 | -17/+20 |
| | |||||
* | Villager: NoCountDown and Action function don't check VillagersShouldHarvestCrops anymore because it shoudn't even be activated anywhere. | STRWarrior | 2014-01-28 | 1 | -10/+0 |
| | |||||
* | Villager doesn't check the environment for crops if it doesn't need to. | STRWarrior | 2014-01-27 | 1 | -0/+5 |
| | |||||
* | The world can now be configured wether farmers should be able to harvest crops. | STRWarrior | 2014-01-27 | 1 | -0/+10 |
| | |||||
* | Villager: Few more comments. | STRWarrior | 2014-01-27 | 2 | -4/+9 |
| | |||||
* | Cleanup | STRWarrior | 2014-01-27 | 2 | -31/+65 |
| | | | | Most code in Tick is now split up in different functions. | ||||
* | Villagers: Harvesting is more rare. | STRWarrior | 2014-01-27 | 1 | -1/+1 |
| | |||||
* | Villager: Farmers can't place crops on blocks other then farmland. | STRWarrior | 2014-01-27 | 1 | -1/+7 |
| | |||||
* | Fixed compiler error. | STRWarrior | 2014-01-27 | 1 | -1/+1 |
| | |||||
* | Villager: Farmer: Crops finding is more random. | STRWarrior | 2014-01-27 | 1 | -18/+19 |
| | |||||
* | Added GetCropsPos and DidFindCrops functions. | STRWarrior | 2014-01-27 | 1 | -0/+6 |
| | |||||
* | Villagers: Farmers now replant the crops. | STRWarrior | 2014-01-27 | 2 | -1/+17 |
| | |||||
* | Villagers: Fixed only gettings the crops block when farming. | STRWarrior | 2014-01-27 | 1 | -2/+2 |
| | |||||
* | Villagers don't look for new crops when they already found one. | STRWarrior | 2014-01-27 | 1 | -11/+9 |
| | | | | Slight cleanup. | ||||
* | Villagers: Farmers can also harvest carrots and potatoes. | STRWarrior | 2014-01-27 | 2 | -9/+38 |
| | |||||
* | Makes farmers farm crops. | STRWarrior | 2014-01-27 | 2 | -1/+76 |
| | |||||
* | Merge pull request #590 from mc-server/Wolf_Fix | Mattes D | 2014-01-26 | 1 | -7/+31 |
|\ | | | | | Wolf: Small fix since the new AI and a new small feature. | ||||
| * | Fixed bug where wolfs would teleport while they were sitting. | STRWarrior | 2014-01-26 | 1 | -1/+4 |
| | | |||||
| * | Small fix since the new AI and a new small feature. | STRWarrior | 2014-01-26 | 1 | -6/+27 |
| | | | | | | | | | | You get particles when trying to tame wolfs. They don't walk anymore when they are sitting. | ||||
* | | Fixed segmentation fault on villager damage | Tiger Wang | 2014-01-26 | 1 | -1/+1 |
|/ | | | | It occurred when attack was environmental. | ||||
* | Merge pull request #588 from mc-server/Sheep_Eating | Mattes D | 2014-01-25 | 2 | -1/+41 |
|\ | | | | | Implemented sheeps eating grass. | ||||
| * | Implemented sheeps eating grass. | STRWarrior | 2014-01-25 | 2 | -1/+41 |
| | | |||||
* | | Merge pull request #587 from mc-server/mobimprovements | Mattes D | 2014-01-25 | 14 | -277/+482 |
|\ \ | |/ |/| | Mob improvements & rudimentary artificial intelligence | ||||
| * | Did what xoft recommended | Tiger Wang | 2014-01-25 | 1 | -1/+5 |
| | | |||||
| * | Implemented fall damage for mobs | Tiger Wang | 2014-01-25 | 2 | -6/+33 |
| | | | | | | | | | | | | + Implemented mobile fall damage * Formatting fixes + Defined new Position->Integer macros | ||||
| * | Attack() is no longer always called | Tiger Wang | 2014-01-25 | 1 | -1/+1 |
| | | |||||
| * | Mob bugfixes | Tiger Wang | 2014-01-25 | 2 | -22/+39 |
| | | | | | | | | | | | | | | | | | | | | * Mobs no longer require constant line-of-sight to a player to remain aggravated * Fixed an ASSERT * Fixed mobs jumping * Fixed Idle state not properly using AI + Added FILE_IO_PREFIX to favicon loading + Implemented #563 | ||||
| * | All mobs now drown (fixes #54) | Tiger Wang | 2014-01-25 | 2 | -0/+7 |
| | | | | | | | | | | * Implemented mob drowning * Iron Golems and squids are excluded | ||||
| * | Fixed a generator bug | Tiger Wang | 2014-01-25 | 1 | -0/+3 |
| | | |||||
| * | Zombies and skeletons use AI | Tiger Wang | 2014-01-25 | 2 | -9/+15 |
| | | |||||
| * | Miscellaneous improvements | Tiger Wang | 2014-01-24 | 2 | -18/+13 |
| | | |||||
| * | Changed a condition to IsGameMode | Tiger Wang | 2014-01-24 | 1 | -2/+1 |
| | | |||||
| * | Made wolves compatible with new AI code | Tiger Wang | 2014-01-24 | 2 | -11/+26 |
| | | |||||
| * | Monsters no longer check for direct line of sight | Tiger Wang | 2014-01-24 | 1 | -10/+2 |
| | | |||||
| * | Large reworking of mob code [SEE DESC] | Tiger Wang | 2014-01-24 | 6 | -232/+324 |
| | | | | | | | | | | | | | | + Implemented better pathfinding - Removed lots of unused variables, functions, etc. * Changed some variable types * Other miscellaneous fixes, and also completes the previous PRs | ||||
| * | Implemented creeper abilities | Tiger Wang | 2014-01-24 | 2 | -2/+50 |
| | | | | | | | | | | | | | | | | * Creepers now explode with a sound effect * Creepers drop a music disc on the unlikely event of being killed by a skeleton's arrow Inspired by @maniak89's PR #132. | ||||
* | | Fixed a failure in cSquid. | madmaxoft | 2014-01-24 | 1 | -1/+2 |
|/ | | | | Probably due to rounding errors the squid was querying out-of-chunk coords. | ||||
* | Removed obsoleted functions | Tiger Wang | 2014-01-16 | 1 | -1/+1 |
| | |||||
* | Merge branch 'fixes&features' of git://github.com/tonibm19/MCServer | madmaxoft | 2013-12-25 | 1 | -0/+6 |
|\ | |||||
| * | Some fixes (SEE DESC) | tonibm19 | 2013-12-23 | 1 | -0/+6 |
| | | | | | | | | -Added missing mobs (wither, enderdragon and iron golem) to type to string list. -Wither and iron golem can now spawn | ||||
* | | Preliminary mobile entity saving | Tiger Wang | 2013-12-25 | 1 | -1/+2 |
|/ | | | | | | | * Fixes #252 * Alleviates #380 + Adds mob saving * Fixed some debug !ASSERTs | ||||
* | Fixed bug where snowgolems could replace non-solid blocks to snow blocks. | STRWarrior | 2013-12-22 | 1 | -1/+3 |
| | |||||
* | Snow golems die in hot biomes and leave a snow trail. | STRWarrior | 2013-12-22 | 2 | -0/+18 |
| | |||||
* | EnderDragons and SnowGolems are able to spawn. | STRWarrior | 2013-12-22 | 1 | -0/+2 |
| | |||||
* | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-21 | 5 | -17/+21 |
|\ | |||||
| * | Fixed the rest of constructor reorders. | madmaxoft | 2013-12-20 | 1 | -2/+2 |
| | | |||||
| * | Sorted a few constructors to remove warnings. | madmaxoft | 2013-12-20 | 5 | -17/+21 |
| | | |||||
* | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-20 | 1 | -1/+1 |
|\| | |||||
| * | Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT). | madmaxoft | 2013-12-20 | 1 | -1/+1 |
| | | |||||
* | | moved mobs to globs | Tycho Bickerstaff | 2013-12-11 | 1 | -1/+5 |
| | | |||||
* | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-11 | 1 | -0/+6 |
|\| | |||||
| * | Fixed not getting XP from mobs. | STRWarrior | 2013-12-14 | 1 | -0/+6 |
| | | |||||
* | | more cmake | Tycho Bickerstaff | 2013-12-10 | 1 | -0/+7 |
|/ | |||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-26 | 1 | -0/+55 |
| | | | | | Conflicts: VC2008/MCServer.vcproj | ||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-24 | 1 | -2/+2 |
| | | | | | Conflicts: GNUmakefile | ||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 65 | -0/+3488 |