summaryrefslogtreecommitdiffstats
path: root/src/Mobs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Documentationmobs2LogicParrot2017-09-0821-21/+177
|
* dLogicParrot2017-09-023-4/+9
|
* Implemented Blaze triple shotsLogicParrot2017-09-022-7/+4
|
* dLogicParrot2017-09-027-41/+93
|
* Working spiders and cave spiders using behaviorsLogicParrot2017-09-025-5/+38
|
* dLogicParrot2017-09-021-1/+2
|
* Many mobs reimplementedLogicParrot2017-09-0232-49/+153
|
* Reimplemented creepers using BehaviorsLogicParrot2017-09-027-26/+38
|
* Implemented creepers using BehaviorsLogicParrot2017-09-0210-38/+52
|
* squsshmeLogicParrot2017-09-028-49/+37
|
* Initial creeper behaviorsLogicParrot2017-09-024-59/+77
|
* creeper initial behaviorsLogicParrot2017-09-023-27/+59
|
* Reimplemented skeletons using BehaviorsLogicParrot2017-09-022-14/+31
|
* Lambda revert fixLogicParrot2017-09-021-46/+170
|
* dLogicParrot2017-09-021-4/+7
|
* lambdaLogicParrot2017-09-026-59/+103
|\
| * Revert "Replace ItemCallbacks with lambdas (#3948)"LogicParrot2017-09-026-75/+131
| | | | | | | | This reverts commit 496c337cdfa593654018c171f6a74c28272265b5.
* | SkeletonsLogicParrot2017-09-0215-81/+124
| |
* | Lambda merge fixLogicParrot2017-09-011-53/+39
| |
* | Sunlight fixes, config fixesLogicParrot2017-09-0143-435/+145
| |
* | mergeLogicParrot2017-09-018-91/+326
|\|
| * SetSwimState now takes into account head heightAlexander Harkness2017-09-011-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 burningAlexander Harkness2017-09-011-5/+0
| |
| * Replace ItemCallbacks with lambdas (#3948)peterbell102017-09-016-131/+75
| |
* | dLogicParrot2017-09-012-0/+5
| |
* | Pathfinder DontCare now a member variableLogicParrot2017-08-311-1/+1
| |
* | Pathfinder DontCare now a member variableLogicParrot2017-08-318-17/+83
| |
* | Removed BehaviorStriker, and some docLogicParrot2017-08-315-25/+3
| |
* | Initial zombiesLogicParrot2017-08-3065-482/+340
| |
* | removed agressiveMonsterLogicParrot2017-08-307-62/+10
| |
* | BehaviorAttackerLogicParrot2017-08-307-39/+138
| |
* | Attacker updatesLogicParrot2017-08-3011-85/+85
| |
* | targetStrikeRangeLogicParrot2017-08-304-18/+14
| |
* | dLogicParrot2017-08-301-2/+2
| |
* | dLogicParrot2017-08-301-0/+2
| |
* | Added BehaviorBrave, chaser > attackerLogicParrot2017-08-305-6/+45
| |
* | Added BehaviorBrave, chaser > attackerLogicParrot2017-08-309-31/+31
| |
* | Much safer raw pointers to entitiesLogicParrot2017-08-296-48/+135
| |
* | Agressives wander and don't crashLogicParrot2017-08-298-8/+60
| |
* | HorseLogicParrot2017-08-293-21/+33
| |
* | Implemented sheep, mooshroom, rabbit, chicken, pig, villagerLogicParrot2017-08-2925-499/+527
| |
* | Implemented chickensLogicParrot2017-08-294-62/+96
| |
* | Fixed some headers, incorprated some code from the conflictsLogicParrot2017-08-274-11/+9
| |
* | conflict fixLogicParrot2017-08-275-69/+84
|\|
| * Fix mobs not burning in daylight when on snow (#3961)Alexander Harkness2017-08-251-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-0092017-08-252-15/+28
| | | | | | | | * Guardians don't take damage on land * Squids suffocate on land
| * Add cUUID class (#3871)peterbell102017-08-253-11/+13
| |
* | dLogicParrot2017-08-2515-69/+90
| |
* | Coward mobs run twice as fastLogicParrot2017-08-251-5/+2
| |
* | Cow crash fixLogicParrot2017-08-257-7/+29
| |
* | Fully working cowsLogicParrot2017-08-2419-112/+119
| |
* | Merge branch 'master' into mobs2LogicParrot2017-08-243-8/+8
|\|
| * Use ref instead of pointerLukas Pioch2017-08-242-7/+7
| |
| * Minor changes (#3909)mathiascode2017-08-241-1/+1
| |
* | whitespace cleanupLogicParrot2017-08-241-26/+26
| |
* | Behaviors now attachable to MonstersLogicParrot2017-08-2420-62/+214
| |
* | Merge branch 'master' into mobs2LogicParrot2017-08-241-2/+1
|\|
| * Removed outdated pathfinder comment (#3955)Safwat Halaby2017-08-231-2/+1
| |
* | pass a_Dt and a_Chunk to PostTick,PreTick,Tick,IsControlDesiredLogicParrot2017-08-249-22/+42
| |
* | Initial Monster Behavior vector logicLogicParrot2017-08-2413-33/+139
| |
* | Everything now inherits Behavior.hLogicParrot2017-08-2315-477/+517
| |
* | removed some attack code from MonsterLogicParrot2017-08-232-11/+2
| |
* | dLogicParrot2017-08-231-106/+109
| |
* | dLogicParrot2017-08-236-24/+21
| |
* | dLogicParrot2017-08-2330-1953/+1870
| |
* | dLogicParrot2017-08-222-92/+0
| |
* | dLogicParrot2017-08-227-106/+43
| |
* | dLogicParrot2017-08-2212-407/+380
| |
* | dLogicParrot2017-08-223-2/+11
| |
* | dLogicParrot2017-08-224-3/+6
| |
* | dLogicParrot2017-08-223-4/+7
| |
* | dLogicParrot2017-08-222-1/+34
| |
* | dLogicParrot2017-08-2210-11/+11
| |
* | dLogicParrot2017-08-2227-908/+897
| |
* | dLogicParrot2017-08-225-140/+141
| |
* | dLogicParrot2017-08-223-40/+40
| |
* | dLogicParrot2017-08-223-34/+39
| |
* | move passiveLogicParrot2017-08-222-259/+99
| |
* | move agressive monsterLogicParrot2017-08-222-107/+38
| |
* | copy some codeLogicParrot2017-08-223-1241/+1317
| |
* | Initial copy of old filesLogicParrot2017-08-2219-0/+1003
|/
* Fully implemented leashes (#3798)Pablo Beltrán2017-08-215-14/+239
|
* Changed type of FastRandom in monster drop calculation. (#3920)Lane Kolbly2017-08-181-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/EntityOwnershipTiger Wang2017-08-188-84/+63
|\ | | | | * Changed entity ownership model to use smart pointers
| * Changed entity ownership model to use smart pointersTiger Wang2017-08-078-84/+63
| |
* | Sitting cats block enderchests from opening (#3906)Bond-0092017-08-172-0/+31
| |
* | Replaced includes with forward declarationsLukas Pioch2017-08-132-2/+2
|/
* Removed unneeded includes (#3902)Lukas Pioch2017-08-062-3/+0
|
* Remove double includes part 2 (#3890)peterbell102017-08-036-7/+0
|
* Removed unused forward declarations (#3888)Lukas Pioch2017-08-031-1/+1
|
* Consolidated food effects into EatItem, added all fish type FoodInfos. (#3875)Lane Kolbly2017-07-301-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-0092017-07-221-1/+1
| | | Fixed an issue where creepers didn't explode when they were burned with flint and steel
* Added basic ocelot behavior (#3829)Bond-0092017-07-124-5/+252
|
* Sound effect horse rejects player when tamingPablo Beltrán2017-07-101-0/+1
|
* Fix horse taming (#3820)Bond-0092017-07-021-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 babyBond_0092017-07-021-2/+20
|
* Endermen take damage from rainBond-0092017-06-302-3/+29
|
* Spider should attack only when the light level is lower than 11 (#3815)Bond-0092017-06-301-1/+4
|
* FastRandom rewrite (#3754)peterbell102017-06-1313-62/+60
|
* Fixed tracer usage in Entity physics handling. (#3720)Mattes D2017-05-282-10/+11
|
* Spawn eggs works againLukas Pioch2017-05-222-31/+63
|
* Clang 5.0 fixesLukas Pioch2017-05-213-4/+4
| | | | | - Added override keyword - Removed inherited member variables
* Don't destroy monster when last target type is a player (#3721)Pablo Beltrán2017-05-212-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 D2017-05-112-19/+18
| | | | | | * Replaced cTracer usage with cLineBlockTracer. * Exported new cLineBlockTracer utility functions to Lua API.
* Fixed cactus detection and zombie pigman sword (#3584)Bond-0092017-02-252-0/+12
| | | | Fixes for issues #902 and #2917
* Updated sounds and effect IDs (#3422)mathiascode2017-02-1531-47/+41
|
* Added some blocks and items (#3503)mathiascode2017-02-141-0/+1
|
* Fixed bindings for cBlockArea:Read and Write. (#3568)Mattes D2017-02-051-1/+1
| | | The original bindings accepted nil as the World param, causing a crash.
* cWolf: Fixed targetting a nullptr.Mattes D2016-11-221-3/+3
|
* Spectators added (#2852)bibo382016-10-129-25/+38
|
* APIDump: Reformatted the docs to include type information.Mattes D2016-09-121-1/+1
| | | | Also fixed a bit of documentation in the CPP source.
* Entities now bail out of ticks if destroyed (#3363)LogicParrot2016-09-0314-0/+71
|
* Fixed type-casting-related warnings.Mattes D2016-08-242-2/+1
|
* Fixed implicit rounding warnings.Mattes D2016-08-191-1/+1
|
* CMake: Remove needless minimum version specifications.Mattes D2016-07-181-2/+0
|
* 1.9 / 1.9.2 / 1.9.3 / 1.9.4 protocol support (#3135)Pokechu222016-05-141-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 blocksLogicParrot2016-04-231-1/+1
|
* Fix issues below y = 0LogicParrot2016-04-182-5/+15
|
* Manual mob burn codeLogicParrot2016-04-061-7/+34
|
* Fix passive mob destruction crashesLogicParrot2016-03-281-0/+1
|
* fixed horse bugtonibm192016-03-011-1/+4
| | | | horse could be "controlled" without a saddle or being tamed
* Merge pull request #3026 from iam10K/masterworktycho2016-02-191-4/+12
|\ | | | | Stop Tamed Wolf from following player when he is flying
| * Stop Wolf from following player when he is flyingTyler Encke2016-02-191-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 chunksLogicParrot2016-02-193-7/+17
|/
* Merge pull request #2974 from LogicParrot/perlJulian Laubstein2016-02-0627-41/+41
|\ | | | | Bulk clearing of whitespace
| * Bulk clearing of whitespaceLogicParrot2016-02-0527-41/+41
| |
* | Merge pull request #2958 from LogicParrot/fenceLogicParrot2016-02-061-11/+15
|\ \ | |/ |/| Pathfinder now properly treats nonsolids above fence
| * Pathfinder now properly treats nonsolids above fenceLogicParrot2016-02-041-11/+15
| |
* | Correct typo in documentation.Alexander Harkness2016-02-051-1/+1
| |
* | Prevent interspecies breedingLogicParrot2016-02-041-11/+25
|/
* cMonster::m_Target safety across worldsLogicParrot2016-02-0311-64/+145
|
* Updated old forum linksMathias2016-01-311-1/+1
|
* Improved tamed wolf pack cooperation and projectile reactionsLogicParrot2016-01-222-36/+109
|
* Spiders now friendly at daylight, new cChunk functionsLogicParrot2016-01-2110-33/+38
|
* Merge pull request #2887 from LogicParrot/waterLogicParrot2016-01-171-1/+1
|\ | | | | Use IsBlockWater in cPath
| * Use IsBlockWater in cPathLogicParrot2016-01-171-1/+1
| |
* | No second spawn broadcast necessaryWinfieldSteve2016-01-173-3/+0
|/
* Fix crash when tamed wolf is hit by arrowsLogicParrot2016-01-162-2/+6
|
* Fixed creeper calling TargetIsInRange with null m_TargetLogicParrot2016-01-121-2/+2
|
* Merge pull request #2859 from LogicParrot/attack2LogicParrot2016-01-127-24/+28
|\ | | | | Fix mob attack interval
| * Fix mob attack intervalLogicParrot2016-01-127-24/+28
| |
* | Friendly wolf attack safety checksLogicParrot2016-01-121-1/+14
|/
* Tamed wolf assists owner (attack / defence)LogicParrot2016-01-123-32/+100
|
* Renamed leftover strings to Cuberite / Server, as needed.Mattes D2016-01-011-1/+1
| | | | Also upgraded the user setting file for MSVC to 2013.
* Fixed the monster burn code.Mattes D2015-12-301-3/+15
| | | | The old code failed when the monster was out of Y range.
* Deleted cPath::BlockTypeIsFenceLogicParrot2015-12-272-30/+2
|
* Update fences and gates listSafwat Halaby2015-12-251-2/+9
| | | | Update fences and gates list
* PF - "Special blocks" handlingSafwat Halaby2015-12-2410-215/+396
|
* Chicken egg code early bailoutSafwat Halaby2015-12-231-19/+21
|
* Baby chickens don't lay eggsGargaj2015-12-231-16/+19
|
* PF - Improved mob jumpingSafwat Halaby2015-12-213-81/+151
|
* Revert "Changed cPath to have a reset method".Safwat Halaby2015-12-214-103/+38
|
* Merge pull request #2753 from cuberite/pathFixSafwat Halaby2015-12-164-37/+109
|\ | | | | Path fix
| * Changed cPath to have a reset method.tycho2015-12-164-38/+103
| | | | | | | | | | | | Also reverts "Changed raw cPath to an unique_ptr, fixes memory leak" This reverts commit 1515d37684b469f212bb9858cca6128d74e591b6.
| * Delete copy and move constructors from cPathtycho2015-12-151-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)Gargaj2015-12-152-1/+24
|/
* Changed raw cPath to an unique_ptr, fixes memory leakLukas Pioch2015-12-152-9/+9
|
* blockheight mechanismGargaj2015-12-132-18/+4
|
* snow golems are "neutral"Gargaj2015-12-131-5/+5
|
* sheep color inheritanceGargaj2015-12-134-1/+64
|
* Remove stray "return"Safwat Halaby2015-12-131-1/+0
|
* Fixed mobs attacking Creative Mode playersSafwat Halaby2015-12-132-11/+15
|
* Decoupled cMonster and path recalc logic, re-implemented recalcSafwat Halaby2015-12-138-335/+486
|
* Stop pathfinding over cobble wallsGargaj2015-12-131-0/+1
| | | Also 1.5 blocks high, shouldn't pathfind over it.
* stop creepers from exploding even if they just diedGargaj2015-12-081-1/+1
|
* fix wolf collarsGargaj2015-12-031-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 codeSafwat Halaby2015-11-302-5/+25
|
* implement breedingGargaj2015-11-299-14/+186
|
* Add enum for Sound and Particle EffectsDave Tucker2015-11-243-6/+9
| | | | | | Fixes #2603 Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
* change from single followable item to multipleGargaj2015-11-238-12/+33
|
* changed mob age from char to intJulian Laubstein2015-11-161-3/+3
|
* Blocks outside the world are never solidworktycho2015-11-131-0/+4
| | | Fixes #2539
* Add comment to Attack() return valuesGargaj2015-11-091-0/+4
|
* neutral mobs shouldn't chase the player unless aggro'dGargaj2015-11-083-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-attackworktycho2015-11-0816-27/+48
|\ | | | | Fix cavespider poisoning even if attack is in cooldown
| * fix cavespider poisoning even if attack is in cooldownGargaj2015-11-0816-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 flyingGargaj2015-11-081-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 changeGargaj2015-11-071-3/+6
| | | Otherwise this keeps spamming the metadata packet for all the creepers on the server.
* don't attack if deadGargaj2015-11-071-1/+1
|
* chickens don't take fall damageGargaj2015-11-062-0/+6
|
* Fixed failed assertationbibo382015-11-031-20/+23
| | | | | This was caused by a monster with a negative Y-axis. Fixes #2336
* StyleCheck: Check spaces around ==, <=, >=Mattes D2015-10-081-3/+3
|
* Partial revert of #2446Safwat Halaby2015-09-282-7/+53
|
* Disabled squids and Guardians pathfinding, #2460Safwat Halaby2015-09-272-2/+2
|
* Namechange to CuberiteMattes D2015-09-252-2/+2
|
* Merge pull request #2446 from cuberite/asyncpathfinderTiger Wang2015-08-274-101/+25
|\ | | | | Fixed a position bug in the pathfinder
| * Fixed a position bug in the pathfinderTiger Wang2015-08-224-101/+25
| |
* | Removed unused functionTiger Wang2015-08-222-23/+0
|/ | | | * Fixes #2444
* Unified the doxy-comment format.Mattes D2015-07-318-27/+44
|
* Silenced and fixed many warning messages across multiple files.Samuel Barney2015-07-294-28/+26
|
* Added Rabbit Metadata values.bibo382015-07-172-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-aiTiger Wang2015-07-162-1/+43
|\ | | | | Improved spider AI
| * Improved spider AIscribblemaniac2015-07-162-1/+43
| | | | | | | | Fixes #2335
* | Spawn baby mobshallucino2015-07-164-3/+5
|/
* Merge pull request #2349 from cuberite/mapsTiger Wang2015-07-151-1/+1
|\ | | | | Improved maps
| * Improved mapsTiger Wang2015-07-141-1/+1
| |
* | Support ageable mobsHallucino2015-07-142-1/+8
|/ | | | Move ageable stuff in Monster directly
* Now Horses spawn with correct data values.bibo382015-06-261-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 classTiger Wang2015-06-071-1/+1
|
* Changed appropriate containers to unordered_mapTiger Wang2015-06-061-16/+1
| | | | | | Thanks to @worktycho for guidance! * Potential speed improvements
* Fixed wrong indent.Alexander Harkness2015-05-301-1/+1
|
* Merge pull request #2171 from SafwatHalaby/fenceAlexander Harkness2015-05-301-1/+7
|\ | | | | PF - Handle all fencetypes
| * PF - Handle all fencetypesSafwatHalaby2015-05-301-1/+7
| |
* | Merge pull request #2167 from SafwatHalaby/diagsworktycho2015-05-301-5/+12
|\ \ | | | | | | PF - Fixed diagonal cutting
| * | PF - Fixed diagonal cuttingSafwatHalaby2015-05-301-5/+12
| |/
* | Merge pull request #2166 from SafwatHalaby/squidSafwat Halaby2015-05-302-2/+4
|\ \ | | | | | | Disabled squid and Guardian Pathfinding
| * | Disabled squid and Guardian PathfindingSafwatHalaby2015-05-302-2/+4
| |/
* / Fixed creeper explosionsSafwatHalaby2015-05-301-1/+1
|/
* Merge branch 'master' into PreventNewWarningstycho2015-05-294-9/+21
|\ | | | | | | | | Conflicts: src/Entities/ArrowEntity.cpp
| * AI - Sane SkeletonSafwatHalaby2015-05-284-9/+21
| |
* | Fix commentstycho2015-05-284-19/+19
| |
* | Merge branch 'master' into PreventNewWarningstycho2015-05-282-3/+13
|\| | | | | | | | | Conflicts: src/Inventory.cpp
| * AI - Tweaked wolf speed and teleport thresholdSafwatHalaby2015-05-281-1/+2
| |
| * AI - Saner LivestockSafwatHalaby2015-05-271-2/+11
| |
* | Fix warnings in cPathtycho2015-05-241-9/+9
| |
* | Merge branch 'master' into PreventNewWarningstycho2015-05-243-26/+114
|\|
| * Merge pull request #2122 from SafwatHalaby/boundingworktycho2015-05-243-26/+114
| |\ | | | | | | Pathfinder - Bounding boxes and some tweaks
| | * Pathfinder - Bounding boxes and some tweaksSafwatHalaby2015-05-233-26/+114
| | |
* | | Made -Weverything an error.tycho2015-05-2412-27/+29
| | |
* | | Merge branch 'master' into PreventNewWarningstycho2015-05-232-3/+3
|\| |
| * | Fixed missing overrides and added a ignore flag for reserved macro for clang version 3.6 and higher.Lukas Pioch2015-05-232-3/+3
| | |
* | | Merge branch 'master' into PreventNewWarningstycho2015-05-234-31/+47
|\| |
| * | Fixed creeper not exploding when 1 block higher than playerSafwatHalaby2015-05-231-2/+4
| |/
| * Path recalculation improvementsSafwatHalaby2015-05-203-10/+17
| |
| * Merge pull request #2074 from SafwatHalaby/rmUniqueworktycho2015-05-202-19/+26
| |\ | | | | | | Removed UniquePTR from PathFinder
| | * newlinesSafwatHalaby2015-05-191-0/+9
| | |
| | * Removed UniquePTR from PathFinderSafwatHalaby2015-05-192-19/+17
| | |
* | | Make -Werror disabling file onlytycho2015-05-1924-30/+34
|/ / | | | | | | Ad fix a load of warnings
* / Manual merge of #2066Alexander Harkness2015-05-191-1/+1
|/
* Pathfinder - approximated paths when original destination unreachableSafwatHalaby2015-05-175-55/+193
|
* PathFinder uses UniquePtr for cell map.SafwatHalaby2015-05-162-8/+3
|
* Revert "PathFinder - smart pointers"worktycho2015-05-152-3/+8
|
* uniquePTRSafwatHalaby2015-05-152-8/+3
|
* Merge remote-tracking branch 'origin/master' into warningsTiger Wang2015-05-108-11/+27
|\ | | | | | | | | | | Conflicts: src/Mobs/Monster.cpp src/Vector3.h
| * PF - Less calcs per tickwiseoldman952015-05-101-1/+1
| |
| * More style checking.Mattes D2015-05-092-2/+2
| | | | | | | | Spaces around some operators are checked.
| * Merge pull request #1956 from Tri125/masterMattes D2015-05-095-6/+20
| |\ | | | | | | Fixed Magma cube sound and spawn size
| | * GetSizeName of cSlime and cMagmaCube is now staticTristan2015-05-094-4/+4
| | |
| | * Big Magma Cube can now spawnTri1252015-05-072-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 MagmaCubeTri1252015-05-072-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 checksworktycho2015-05-091-2/+4
| | |
* | | Fixed some warnings and logic errors in Monster.cppTiger Wang2015-05-101-5/+7
| | |
* | | Fixed some Visual Studio warningsTiger Wang2015-05-091-5/+5
|/ /
* | Spaces in cPathwiseoldman952015-05-082-0/+2
| |
* | Merge pull request #1949 from SafwatHalaby/burnworktycho2015-05-073-35/+93
|\ \ | | | | | | AI - Better shade cover
| * | AI - Safer WouldBurnAt()wiseoldman952015-05-061-3/+8
| | |
| * | AI - Better shade coverwiseoldman952015-05-061-1/+9
| | |
| * | (duplicate) AI - Livestock escape fixed, water jumping fixedwiseoldman952015-05-063-34/+79
| | |
* | | Merge pull request #1951 from mc-server/BroadcastRefactorMattes D2015-05-071-2/+3
|\ \ \ | |_|/ |/| | Added support for sending additional data in the ParticleEffect packet
| * | Added support for additional data in the ParticleEffect Packettycho2015-05-071-2/+3
| |/ | | | | | | Also started refactoring how broadcasts are handled
* / Actually empty the open listworktycho2015-05-061-1/+1
|/
* PF - Swimming bugfixwiseoldman952015-05-061-3/+3
|
* PF - Fixed mobs not reaching leaning playerwiseoldman952015-05-062-3/+10
|
* AI - More conservative use of ResetPathFinding, fixed minor swimming / jumping bugwiseoldman952015-05-052-26/+47
|
* Entity improvementsTiger Wang2015-05-045-262/+222
| | | | | | | | •Pathfinder improvements •Fixes #1217 •Fixes #1933 Merge remote-tracking branch 'SafwatHalaby/water2' into fixes
* Merge pull request #1930 from SafwatHalaby/AI_JumpTiger Wang2015-05-032-5/+16
|\ | | | | AI - Improved Mob Jumping
| * AI - Improved Mob Jumpingwiseoldman952015-05-032-5/+16
| |
* | PathFinder - Crash fix, chunks in parameters are now referenceswiseoldman952015-05-033-10/+8
|/
* Merge pull request #1925 from SafwatHalaby/PathFinder_OptimzeTiger Wang2015-05-024-66/+38
|\ | | | | Pathfinder optimization
| * PathFinding - Chunk querying optimization and improve cPath::IsSolidwiseoldman952015-05-024-66/+38
| |
* | AI - Better daylight handlingwiseoldman952015-05-026-63/+22
|/
* A* Pathfinding and better monster AIwiseoldman952015-05-0111-156/+716
|
* Update IronGolem.cppmathias-gh2015-04-171-1/+1
|
* Added MobTypeName for Giantmathias-gh2015-04-171-0/+1
|
* Changed air drag units to 'interpolated ticks' per secondDevToaster2015-03-312-1/+3
|
* Modified physics for more vanilla-like behaviorDevToaster2015-03-311-0/+2
|
* Merge pull request #1826 from mc-server/UnifyPacketizerMattes D2015-03-241-11/+10
|\ | | | | Unify packetizer
| * Creeper: Fixed skeleton check.Mattes D2015-03-211-11/+10
| |
* | Correct world height validations.Tommy Santerre2015-03-202-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.tumultenrx2015-03-134-7/+5
| | | | Monsters will now attack. Additional checks have been added when generating spawn.
* Converted Monster to std::chronoTycho2015-01-164-18/+18
|
* Initial convertion of a_Dt to std::chronoTycho2015-01-1140-58/+56
| | | | also refactored cWorld::m_WorldAge and cWorld::m_TimeOfDay
* Fixed basic style.Mattes D2014-12-252-2/+2
|
* Fixed damn empty line with no useMasy982014-12-202-5/+1
|
* Added Rabbit.h and Rabbit.cpp to the CMakeListMasy982014-12-201-0/+2
|
* Fixed Rabbit sizeMasy982014-12-201-1/+1
|
* Added RabbitsMasy982014-12-205-0/+68
|
* Fixed Guardians size and healthMasy982014-12-191-1/+1
|
* Guardian can now spawn if wanted!?Masy982014-12-181-1/+1
|
* Merge branch 'master' into entitiesMasy982014-12-181-0/+1
|\
| * derpHowaner2014-12-171-1/+1
| |
| * Added comment.Howaner2014-12-171-1/+1
| |
| * Fixed eMonsterType lua bugs.Howaner2014-12-171-0/+1
| |
* | Added Entity GuardianMasy982014-12-187-1/+105
|/
* Merge remote-tracking branch 'origin/master' into c++11Tiger Wang2014-12-066-9/+28
|\ | | | | | | | | Conflicts: src/OSSupport/Thread.cpp
| * BasicStyle: Added missing braces to control statements.Mattes D2014-12-052-5/+24
| |
| * Fixed reported parentheses around comparisons.Mattes D2014-12-054-4/+4
| |
* | Merged branch 'origin/master' into c++11.Mattes D2014-12-044-80/+75
|\|
| * clearing CheckBasicStyle.lua messagesp-mcgowan2014-12-031-4/+4
| |
| * MobSpawner fixes.Howaner2014-12-012-1/+2
| |
| * Merge branch 'master' into MobSpawnerHowaner2014-12-012-19/+1
| |\ | | | | | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua
| | * Removed old StringToMobType() function from Monster.cppHowaner2014-11-301-10/+0
| | |
| | * Mark StringToMobType() as deprecated. Use cMonster:StringToMobType() insteadHowaner2014-11-291-9/+1
| | |
| * | Many api fixes, add vanilla names to mob type -> string functions and mob spawner fixes.Howaner2014-11-292-56/+68
| | |
| * | Merge branch 'master' into MobSpawnerHowaner2014-11-295-5/+37
| |\|
| | * Merge remote-tracking branch 'origin/master' into GeneratorShapeRefactorMattes D2014-11-233-0/+30
| | |\
| | * | Mobs: Fixed crash with terrain too high.Mattes D2014-11-152-5/+7
| | | |
| * | | Merge branch 'master' into MobSpawnerHowaner2014-11-1851-120/+158
| |\| | | | | | | | | | | | | | | | | | Conflicts: MCServer/Plugins/Core
| * | | Merge branch 'master' into MobSpawnerHowaner2014-09-2613-113/+200
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/MobSpawner.h src/Mobs/Monster.h
| * | | | Implemented mob spawner.Howaner2014-09-191-1/+1
| | | | |
* | | | | Merge remote-tracking branch 'origin-master' into c++11Tiger Wang2014-11-262-5/+7
| | | | |
* | | | | Merge remote-tracking branch 'origin/master' into c++11Tiger Wang2014-11-233-0/+30
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Conflicts: src/Noise/Noise.h src/World.h
| * | | | formatting - newline at EOF inserted: Pig.cppp-mcgowan2014-11-231-1/+5
| | | | |
| * | | | pigs turn into pigmen on lightningp-mcgowan2014-11-232-0/+19
| | | | |
| * | | | formatter errorp-mcgowan2014-11-221-3/+3
| | | | |
| * | | | villagers turn into witches on lightningp-mcgowan2014-11-221-2/+4
| | | | |
| * | | | villagers turn into witches when struck by lightningp-mcgowan2014-11-221-0/+5
| | |_|/ | |/| |
* | | | Merged branch 'master' into c++11.Mattes D2014-10-231-32/+28
|\| | |
| * | | En masse NULL -> nullptr replaceTiger Wang2014-10-2348-86/+86
| | | |
| * | | convert old style casts to fix warningsSteven Riehl2014-10-121-32/+28
| | | |
* | | | En masse NULL -> nullptr replaceTiger Wang2014-10-2048-86/+86
| | | |
* | | | Migrated random generators to std::randomTiger Wang2014-10-193-2/+1
|/ / /
* | | Fixed a missed value.madmaxoft2014-10-051-1/+1
| | |
* | | Removed obsolete cMonster::eType.madmaxoft2014-10-051-3/+0
| | | | | | | | | | | | Has been replaced with global eMonsterType.
* | | Fixed eMonsterType Lua API mismatch.madmaxoft2014-10-053-0/+24
| | |
* | | DerpJonathan Frederick2014-09-291-1/+1
| | |
* | | Fix commentsJonathan Frederick2014-09-291-2/+2
| | |
* | | Make endermen take damage in waterJonathan Frederick2014-09-282-0/+21
| | |
* | | Fixed minor style issues.madmaxoft2014-09-271-1/+1
| |/ |/|
* | Merge pull request #1415 from Masy98/blocksMattes D2014-09-261-1/+1
|\ \ | | | | | | Added 1.8 Blocks and Items
| * \ Merge branch 'master' into blocksMasy982014-09-2612-112/+208
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/Items/ItemHandler.cpp src/Simulator/IncrementalRedstoneSimulator.cpp
| * | | Fixed mutton name in Sheep.cppMasy982014-09-111-1/+1
| | | |
* | | | Removed more unessicary includesTycho2014-09-261-1/+1
| |/ / |/| |
* | | Merge pull request #1419 from mc-server/redstoneTestsworktycho2014-09-2610-107/+117
|\ \ \ | | | | | | | | Added test mocking to IncrementalRedstoneSimulator
| * | | Fixed styleTycho2014-09-251-0/+3
| | | |
| * | | Merge branch 'master' into redstoneTestsTycho2014-09-253-2/+81
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/Mobs/Monster.h
| * \ \ \ Merge branch 'master' into redstoneTestsTycho2014-09-172-1/+10
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | Conflicts: src/Blocks/ChunkInterface.h
| * | | | Added first test to show the object can be createdTycho2014-09-1710-110/+115
| | |_|/ | |/| |
* | | | Fixed wrong Surrounding sizeHowaner2014-09-251-3/+3
| |_|/ |/| |
* | | Merge branch 'master' into EntityCustomNameHowaner2014-09-233-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::DropBlockTiger Wang2014-09-131-1/+1
| | |
| * | Merge branch 'master' into EffectsHowaner2014-09-121-0/+7
| |\|
| | * Revert "Globals.h: Added Floor and Ciel casting, C++ cast cleanups, etc"archshift2014-09-041-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, etcarchshift2014-09-041-5/+7
| | | | | | | | | | | | Snow Golems must also be above 64Y to spawn snow (as of 1.8).
| | * Fixed style and alpha-sorting.madmaxoft2014-09-031-7/+7
| | |
| | * Added mutton, which sheep now drop when killedarchshift2014-09-031-0/+7
| | |
| * | Renamed SetWalkSpeed() to SetRelativeWalkSpeed()Howaner2014-09-022-5/+5
| | |
| * | Added SetWalkSpeed() to cMonster.Howaner2014-08-302-0/+9
| |/
* | Added CustomName saving.Howaner2014-09-021-2/+8
| |
* | Added the new functions to APIDump.Howaner2014-09-021-2/+2
| |
* | Added SetCustomName() to players.Howaner2014-09-021-1/+2
| |
* | Added name tagHowaner2014-09-013-0/+23
| |
* | Added CustomName to cMonster.Howaner2014-09-012-1/+48
|/
* Fixed mob burning.reiter2014-08-281-1/+1
| | | Fixes #1298
* BasicStyleCheck: Dividers are exactly 80 slashes.madmaxoft2014-08-041-1/+1
|
* Merge branch 'master' into MonsterHowaner2014-08-041-2/+1
|\
| * Refactored case-conversion functions.madmaxoft2014-08-041-2/+1
| | | | | | | | StrToLower() returns a modified copy of the string, InPlaceLowercase() modifies the string in-place.
* | Changed /** to /*Howaner2014-08-041-3/+5
| |
* | Fixed warningsHowaner2014-08-041-3/+3
| |
* | Attempt to fix knockback and swimming.Howaner2014-08-041-3/+9
|/
* Wolf uses UUID for owner.madmaxoft2014-08-032-3/+13
| | | | Fixes #1277.
* Trailing whitespace fix.madmaxoft2014-08-031-1/+1
|
* Improved endermen code a littleTiger Wang2014-08-013-20/+56
|
* Merge pull request #1047 from mc-server/EndermanTiger Wang2014-07-312-0/+121
|\ | | | | Enderman attacks a player if he's looking at him
| * Comment suggestionsTiger Wang2014-07-311-9/+8
| |
| * Added lighting code and added commentsSTRWarrior2014-07-301-0/+17
| |
| * Removed lighting code in cEnderman::CheckEventSeePlayerSTRWarrior2014-07-301-9/+1
| |
| * Changed commentworktycho2014-06-301-1/+1
| |
| * Replaced strange algebra with dot product.worktycho2014-06-181-4/+6
| | | | | | | | 10 degrees is a completely arbitary constant I pulled from nowhere. Feel free to adjust this value.
| * Improved Enderman codeTiger Wang2014-06-182-14/+34
| |
| * Swapped m_Player and m_EndermanPosSTRWarrior2014-06-181-2/+2
| |
| * Enderman attacks a player if he's looking at him.STRWarrior2014-06-182-0/+91
| |
* | Merge branch 'master' into portalsTiger Wang2014-07-2931-36/+32
|\ \ | | | | | | | | | | | | Conflicts: src/World.h
| * \ Merge branch 'master' into Inventory2Howaner2014-07-2630-31/+31
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/BlockInfo.cpp
| | * | Removed redundant semicolons and re-added warningarchshift2014-07-2430-31/+31
| | | |
| * | | Fix item durability.Howaner2014-07-231-5/+1
| |/ / | | | | | | Fixes #1181
* | | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-07-2210-34/+173
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp
| * | Style: Normalized to no spaces before closing parenthesis.madmaxoft2014-07-211-1/+1
| | |
| * | Style: Normalized spaces after if, for and while.madmaxoft2014-07-211-1/+1
| | |
| * | Monsters: Made IsUndead overridable by the respective mob classesarchshift2014-07-196-13/+11
| | |
| * | Fixed style: spaces after commas.madmaxoft2014-07-192-2/+2
| | |
| * | Merge pull request #1214 from mc-server/anti-globMattes D2014-07-191-5/+71
| |\ \ | | | | | | | | CMake - Explicitly lists all source files
| | * | Subdirs: Only add_library if not using MSVCarchshift2014-07-191-1/+3
| | | |
| | * | Mobs/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-191-5/+69
| | | |
| * | | Fixed clamping issuesarchshift2014-07-191-5/+1
| |/ /
| * | Merge branch 'Entities'madmaxoft2014-07-183-7/+86
| |\ \
| | * | Fixed slime-related comments.madmaxoft2014-07-183-5/+10
| | | |
| | * | Slime sizes are 1, 2 or 4 and not 1, 2 or 3.Howaner2014-07-183-4/+4
| | | |
| | * | Split into more lines.Howaner2014-07-172-6/+10
| | | |
| | * | Fixed many slime bugs.Howaner2014-07-172-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 portalsTiger Wang2014-07-1823-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 fixesTiger Wang2014-07-186-31/+5
| | | | | | | | | | | | | | | | | | | | * Fixes #1203 * Fixes #627
| * | | Fixed spaces before commas.madmaxoft2014-07-181-3/+3
| | | |
| * | | Skeletons should spawn with a bow in the hand.Howaner2014-07-182-0/+17
| | | | | | | | | | | | Fixes #1184
| * | | Fixed tabs used for alignment.madmaxoft2014-07-171-1/+1
| | | |
| * | | More trailing whitespace fixes.madmaxoft2014-07-172-2/+2
| | | |
| * | | Basic style fixes.madmaxoft2014-07-174-9/+9
| | | |
| * | | Normalized comments.madmaxoft2014-07-177-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 potionsmadmaxoft2014-07-177-12/+12
| |\ \
| | * \ Merge pull request #1193 from mc-server/deathmessagesMattes D2014-07-177-12/+12
| | |\ \ | | | | | | | | | | Death messages
| | | * | Resolved backwards compatibility issuesTiger Wang2014-07-161-1/+1
| | | | |
| | | * | Tailored death messagesTiger Wang2014-07-046-11/+11
| | | | |
| * | | | Merge branch 'master' into potionsmadmaxoft2014-07-154-10/+68
| |\| | |
| | * | | Update.Howaner2014-07-131-1/+1
| | | | |
| | * | | Merge branch 'master' into SoundsHowaner2014-07-133-6/+64
| | |\ \ \
| | | * | | Changed comments.Howaner2014-07-131-3/+5
| | | | | |
| | | * | | Merge branch 'master' into SheepHowaner2014-07-134-9/+25
| | | |\ \ \
| | | * | | | Add doxy-comments.Howaner2014-07-011-1/+4
| | | | | | |
| | | * | | | Moved the random code to a function (cSheep::GenerateNaturalRandomColor())Howaner2014-06-302-36/+47
| | | | | | |
| | | * | | | Save IsSheared from Sheep.Howaner2014-06-281-0/+3
| | | | | | |
| | | * | | | Fix sheep color's, add shear sound.Howaner2014-06-283-3/+42
| | | | |/ / | | | |/| |
| | * | | | Changed BroadcastSoundEffect function to take floating pos.Howaner2014-07-132-4/+4
| | | |/ / | | |/| |
| * | | | For now, removed creator member from Entity Effect for pointer safetyarchshift2014-07-121-1/+1
| | | | |
| * | | | Merge remote-tracking branch 'origin/master' into potionsarchshift2014-07-108-9/+49
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Entities/Player.cpp src/Entities/ProjectileEntity.cpp
| | * | | Merge pull request #1135 from mc-server/fixesTiger Wang2014-07-093-8/+24
| | |\ \ \ | | | | | | | | | | | | Fixes to projectiles and the undead
| | | * | | Changed everything to callbacksTiger Wang2014-07-051-2/+20
| | | | | |
| | | * | | Bettered zombie and skeleton AITiger Wang2014-06-222-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | * Fixed potential issues with skylight detection
| | * | | | Fixed slime handling in cMonster::StringToMobType().madmaxoft2014-07-061-1/+1
| | | |/ / | | |/| |
| | * | | Merged branch 'tonibm19/master'.Mattes D2014-06-262-0/+21
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Added pig riding.tonibm192014-06-202-0/+14
| | |/ / | | | | | | | | | | | | Now you can ride a pig using a carrot on a stick.
| * | | EntityEffects.x -> EntityEffect.x, Object-Oriented effectsarchshift2014-06-192-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-valuearchshift2014-06-171-1/+1
| | | |
| * | | Entity Effects: Clarified user, added it to AddEntityEffectarchshift2014-06-171-1/+1
| | | | | | | | | | | | | | | | Added second AddEntityEffect with a pass-by-value of the class.
| * | | Changed the AddEntityEffect() params for easier calls.madmaxoft2014-06-171-1/+1
| | | |
| * | | Fixed MSVC compilation.madmaxoft2014-06-171-3/+3
| | | |
| * | | Pawn: renamed HandleEntityEffects to HandleEntityEffectarchshift2014-06-172-3/+3
| | | | | | | | | | | | | | | | Exported entity effect functions for ToLua and documented them in APIDesc.lua
| * | | Cave spider now poisons its victim, added IsPawn function to Entityarchshift2014-06-173-4/+22
| | | |
| * | | Monster: added IsUndead(), undead-specific entity effectsarchshift2014-06-172-0/+71
| | |/ | |/|
* | | Merge branch 'master' into portalsTiger Wang2014-06-213-0/+3
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h
| * | Nullify deleted pointers.archshift2014-06-193-0/+3
| |/
* | More suggestionsTiger Wang2014-06-211-1/+1
| |
* | Merge branch 'master' into portalsTiger Wang2014-06-107-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 D2014-06-085-5/+5
| | | | | | | | Fixes #1039, fixes #851
| * Fixed mob hitbox sizes, removed TODOsarchshift2014-06-073-5/+2
| | | | | | | | | | Measured bat and blaze in vanilla, updated values. Cavespiders are, in fact, passive in the day.
* | Fixed decision failureTiger Wang2014-06-051-1/+1
| |
* | Added checks for no downfall biomesTiger Wang2014-06-041-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-06-042-6/+22
|\|
| * Exploded creepers drop nothing, part of #1058Tiger Wang2014-06-041-2/+8
| |
| * Small tweak for mobsSTRWarrior2014-06-021-4/+14
| | | | | | | | Mobs move a bit smoother and aren't able to move allot when in air.
* | Very minor code changesTiger Wang2014-05-291-1/+1
|/
* Fixed cWither::KilledByandrew2014-05-211-1/+2
|
* Cleaned up cPlayer::UpdateMovementStats; Wither achievementsandrew2014-05-202-0/+34
|
* Merge pull request #998 from mc-server/StatManagerMattes D2014-05-181-1/+3
|\ | | | | Statistic Manager
| * Fixesandrew2014-05-131-1/+1
| |
| * Movement Statisticsandrew2014-05-121-1/+3
| |
* | Fixed a few more switch warnings.archshift2014-05-121-0/+2
|/
* Merge branch 'master' into redstoneimprovementsTiger Wang2014-05-0417-32/+65
|\ | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/FallingBlock.cpp src/Mobs/AggressiveMonster.cpp src/Simulator/IncrementalRedstoneSimulator.cpp
| * Fixed MagmaCube spawning.madmaxoft2014-05-021-0/+4
| | | | | | | | Fixes #928.
| * Merge pull request #940 from Howaner/GlobalFixesMattes D2014-04-2814-32/+58
| |\ | | | | | | Add entity invulnerable
| | * Revert "Withers now use the new invulnerable."Howaner2014-04-282-10/+26
| | | | | | | | | This reverts commit 619592b5a0ab651e714d55932bc7909e4204cee9.
| | * Revert "Changed the old invulnerable methods from the wither to the new."Howaner2014-04-281-3/+0
| | | | | | | | | This reverts commit d50f8f6f11f69e7e1e56be92fb2d72a5014a3e34.
| | * Changed the old invulnerable methods from the wither to the new.Howaner2014-04-261-0/+3
| | |
| | * Withers now use the new invulnerable.Howaner2014-04-262-26/+10
| | |
| | * FixesHowaner2014-04-262-8/+8
| | |
| | * Add entity invulnerableHowaner2014-04-2614-24/+50
| | |
| * | Merge pull request #954 from mc-server/projectiles-splitMattes D2014-04-283-0/+3
| |\ \ | | | | | | | | Totally refactored ProjectileEntity.h, splitting up into several files.
| | * | Fixed projectile source filenames, indentationsarchshift2014-04-283-3/+3
| | | |
| | * | Moved cGhastFireballEntity out of ProjectileEntity.harchshift2014-04-271-0/+1
| | | |
| | * | Moved cFireChargeEntity out of ProjectileEntity.harchshift2014-04-271-0/+1
| | | |
| | * | Moved cArrowEntity out of ProjectileEntity.harchshift2014-04-271-0/+1
| | | |
| * | | Fixed warnings.madmaxoft2014-04-271-2/+2
| | | |
| * | | Added static const, initialized fields.archshift2014-04-271-1/+1
| |/ /
* / / Redstone simulator now directly accesses cChunkTiger Wang2014-04-271-3/+2
|/ / | | | | | | | | | | * Redstone simulator performance improvements * Added return values to some functions * Minor fixes
* | Further refactored, Reverted Minecart changearchshift2014-04-262-3/+3
| | | | | | | | Other small changes.
* | Fixed mobs that don't naturally spawn.archshift2014-04-262-2/+6
| |
* | Moved huge conditional out of InStateChasing(), improving readabilityarchshift2014-04-262-1/+20
| | | | | | | | Squashed a warning.
* | Merge remote-tracking branch 'upstream/master'archshift2014-04-251-0/+1
|\|
| * Cmake generated projects for IDEs include headers in project files.archshift2014-04-251-0/+1
| |
* | Giants!archshift2014-04-252-7/+12
|/ | | | Changed mfMaxplusone to mfUnhandled for readability, and fixed a default case warning.
* Fixed class capitalization for the cave spider.archshift2014-04-243-6/+6
|
* Fixed references to renamed files.archshift2014-04-244-7/+7
|
* Rename mob source files to fit CamelCase.archshift2014-04-246-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/fixesMattes D2014-04-222-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 fixesjfhumann2014-04-185-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 codejfhumann2014-04-182-4/+5
| | |
* | | Compilation fixTiger Wang2014-04-181-1/+1
| | |
* | | Fixed #906Tiger Wang2014-04-181-1/+2
| | |
* | | Fixed #904Tiger Wang2014-04-181-1/+1
| |/ |/|
* | Merge pull request #891 from mc-server/fixesMattes D2014-04-173-4/+4
|\ \ | | | | | | Fixes to redstone & general
| * | Entities handle chunks properly againTiger Wang2014-04-123-4/+4
| |/ | | | | | | | | * Entities properly handle chunks * Changed EntityStatus enums to be less shouty
* / Added new AI rulesTiger Wang2014-04-172-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 Harkness2014-04-101-0/+1
|
* Update Monster.cppAlexander Harkness2014-04-101-2/+4
|
* Merge pull request #849 from mc-server/minorfixesMattes D2014-04-021-8/+10
|\ | | | | Minor fixes
| * Final realisation of suggestionsTiger Wang2014-03-311-5/+7
| |
| * Fixed a few Y too high/low assertsTiger Wang2014-03-311-5/+5
| |
* | Merge branch 'MacFixes'Tycho2014-04-023-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 Barney2014-03-253-6/+2
| |/ | | | | | | Also had to undefine TOLUA_TEMPLATE_BIND a couple of times.
* | Fixed clang compilationandrew2014-03-251-1/+1
| |
* | Fixed wither summoningandrew2014-03-252-2/+13
| |
* | Protocol: Wither metadataandrew2014-03-252-0/+19
|/
* Minor fixesandrew2014-03-252-4/+3
|
* Wither invulnerabilityandrew2014-03-243-1/+66
|
* Fixed double to float conversions.madmaxoft2014-03-161-5/+5
|
* Unified Vector classesandrew2014-03-112-2/+2
|
* Merge branch 'master' into ballisticmissilesTiger Wang2014-03-096-17/+43
|\ | | | | | | | | Conflicts: src/ClientHandle.cpp
| * cBlockInfo now manages the respective cBlockHandlerandrew2014-03-021-1/+1
| |
| * Merge pull request #738 from xdot/masterMattes D2014-03-022-6/+6
| |\ | | | | | | Refactored global block property arrays
| | * g_BlockXXX => cBlockInfo::XXXandrew2014-03-012-6/+6
| | |
| * | Creeper fixestonibm192014-03-022-10/+34
| |/ | | | | | | | | - Fixed explosion time (1.5s, according to minecraftwiki) - Creeper explodes if right clicked with flint and steel
| * added mooshroom to cow conversiontonibm192014-02-271-0/+2
| |
* | Fixed sheep ASSERTing sometimesTiger Wang2014-02-271-8/+18
|/
* Merge pull request #710 from TheJumper/masterMattes D2014-02-2424-38/+319
|\ | | | | Fixed Mob Drops, Add Rare, Uncommon and Gear Drops, Looting inflicts Drops
| * Fixed Formatting, added compiler warning suppressing methods, fixed commentsTheJumper2014-02-245-3/+6
| |
| * Fixed Formatting, Added DropChances and CanPickUpLoot attributes to MonstersTheJumper2014-02-2324-38/+316
| |
* | Add Wolf Heal with FoodHowaner2014-02-201-10/+34
|/
* Merge pull request #690 from tonibm19/masterAlexander Harkness2014-02-171-2/+2
|\ | | | | Now mobs can't escape from fences.
| * Improved formattingtonibm192014-02-171-2/+2
| |
| * Now mobs can't escape from fences.tonibm192014-02-161-2/+2
| |
* | Merge pull request #692 from mc-server/wolfcleanupAlexander Harkness2014-02-171-30/+15
|\ \ | | | | | | Wolf cleanup
| * | Fixes to previous commitTiger Wang2014-02-161-9/+10
| | |
| * | Slight cleanup of wolf codeTiger Wang2014-02-161-23/+7
| |/
* / Fixed TNT fizzing everywhereTiger Wang2014-02-151-1/+1
|/
* Simplified Attack() tracingTiger Wang2014-02-121-1/+6
|
* Fixed #627Tiger Wang2014-02-114-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 playerimprovementsTiger Wang2014-02-092-6/+6
|\ | | | | | | | | | | | | Conflicts: src/Root.cpp src/Root.h src/World.cpp
| * Merge pull request #646 from worktycho/warningfixesAlexander Harkness2014-02-052-6/+6
| |\ | | | | | | Fixed most of the reordering warnings
| | * Fixed most of the reordering warningsTycho2014-02-052-6/+6
| | |
* | | Merge branch 'master' into playerimprovementsTiger Wang2014-02-093-1/+14
|\| | | | | | | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua
| * | Merge pull request #635 from tonibm19/masterMattes D2014-02-042-0/+13
| |\ \ | | |/ | |/| Exported Item:IsEnchantable and Monster:MoveToPosition to Lua API
| | * Blank lines and indentation.tonibm192014-02-041-0/+4
| | | | | | | | | | | | Also removed GetClosestPlayer documentation
| | * Exporded World:FindClosestPlayer, Item:IsEnchantable and Monster:MoveToPosition to Lua APItonibm192014-02-032-0/+9
| | |
| * | Increased Type safety of BiomesTycho2014-02-031-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 warningsTiger Wang2014-02-051-1/+1
|/ | | | | * Possibly also fixed some bugs with pathfinding and TNT, though unlikely
* Merge branch 'master' into GeneratingBenchmark2Tycho2014-02-022-1/+2
|\ | | | | | | | | Conflicts: src/Blocks/BlockTorch.h
| * Monster's nominal speed was increased.Kirill Kirilenko2014-02-011-1/+1
| |
| * Fixed teleport to air, if owner is flying.Kirill Kirilenko2014-02-011-0/+1
| |
* | Changed Signiture of OnUpdateTycho2014-02-021-1/+4
|/
* Did what xoft saidtonibm192014-01-294-5/+3
|
* Rewritten code.tonibm192014-01-2912-152/+25
| | | | | Implemented xoft suggestion. Using MoveToPosition as tigerw suggested.
* Fixed sheeptonibm192014-01-291-18/+17
|
* Fixed a copypasta error...tonibm192014-01-294-1/+5
|
* Now mobs follow you when holding their breed itemtonibm192014-01-2910-5/+153
|
* Renamed Farmer functions and added doxycommentsSTRWarrior2014-01-282-17/+20
|
* Villager: NoCountDown and Action function don't check VillagersShouldHarvestCrops anymore because it shoudn't even be activated anywhere.STRWarrior2014-01-281-10/+0
|
* Villager doesn't check the environment for crops if it doesn't need to.STRWarrior2014-01-271-0/+5
|
* The world can now be configured wether farmers should be able to harvest crops.STRWarrior2014-01-271-0/+10
|
* Villager: Few more comments.STRWarrior2014-01-272-4/+9
|
* CleanupSTRWarrior2014-01-272-31/+65
| | | | Most code in Tick is now split up in different functions.
* Villagers: Harvesting is more rare.STRWarrior2014-01-271-1/+1
|
* Villager: Farmers can't place crops on blocks other then farmland.STRWarrior2014-01-271-1/+7
|
* Fixed compiler error.STRWarrior2014-01-271-1/+1
|
* Villager: Farmer: Crops finding is more random.STRWarrior2014-01-271-18/+19
|
* Added GetCropsPos and DidFindCrops functions.STRWarrior2014-01-271-0/+6
|
* Villagers: Farmers now replant the crops.STRWarrior2014-01-272-1/+17
|
* Villagers: Fixed only gettings the crops block when farming.STRWarrior2014-01-271-2/+2
|
* Villagers don't look for new crops when they already found one.STRWarrior2014-01-271-11/+9
| | | | Slight cleanup.
* Villagers: Farmers can also harvest carrots and potatoes.STRWarrior2014-01-272-9/+38
|
* Makes farmers farm crops.STRWarrior2014-01-272-1/+76
|
* Merge pull request #590 from mc-server/Wolf_FixMattes D2014-01-261-7/+31
|\ | | | | Wolf: Small fix since the new AI and a new small feature.
| * Fixed bug where wolfs would teleport while they were sitting.STRWarrior2014-01-261-1/+4
| |
| * Small fix since the new AI and a new small feature.STRWarrior2014-01-261-6/+27
| | | | | | | | | | You get particles when trying to tame wolfs. They don't walk anymore when they are sitting.
* | Fixed segmentation fault on villager damageTiger Wang2014-01-261-1/+1
|/ | | | It occurred when attack was environmental.
* Merge pull request #588 from mc-server/Sheep_EatingMattes D2014-01-252-1/+41
|\ | | | | Implemented sheeps eating grass.
| * Implemented sheeps eating grass.STRWarrior2014-01-252-1/+41
| |
* | Merge pull request #587 from mc-server/mobimprovementsMattes D2014-01-2514-277/+482
|\ \ | |/ |/| Mob improvements & rudimentary artificial intelligence
| * Did what xoft recommendedTiger Wang2014-01-251-1/+5
| |
| * Implemented fall damage for mobsTiger Wang2014-01-252-6/+33
| | | | | | | | | | | | + Implemented mobile fall damage * Formatting fixes + Defined new Position->Integer macros
| * Attack() is no longer always calledTiger Wang2014-01-251-1/+1
| |
| * Mob bugfixesTiger Wang2014-01-252-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 Wang2014-01-252-0/+7
| | | | | | | | | | * Implemented mob drowning * Iron Golems and squids are excluded
| * Fixed a generator bugTiger Wang2014-01-251-0/+3
| |
| * Zombies and skeletons use AITiger Wang2014-01-252-9/+15
| |
| * Miscellaneous improvementsTiger Wang2014-01-242-18/+13
| |
| * Changed a condition to IsGameModeTiger Wang2014-01-241-2/+1
| |
| * Made wolves compatible with new AI codeTiger Wang2014-01-242-11/+26
| |
| * Monsters no longer check for direct line of sightTiger Wang2014-01-241-10/+2
| |
| * Large reworking of mob code [SEE DESC]Tiger Wang2014-01-246-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 abilitiesTiger Wang2014-01-242-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.madmaxoft2014-01-241-1/+2
|/ | | | Probably due to rounding errors the squid was querying out-of-chunk coords.
* Removed obsoleted functionsTiger Wang2014-01-161-1/+1
|
* Merge branch 'fixes&features' of git://github.com/tonibm19/MCServermadmaxoft2013-12-251-0/+6
|\
| * Some fixes (SEE DESC)tonibm192013-12-231-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 savingTiger Wang2013-12-251-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.STRWarrior2013-12-221-1/+3
|
* Snow golems die in hot biomes and leave a snow trail.STRWarrior2013-12-222-0/+18
|
* EnderDragons and SnowGolems are able to spawn.STRWarrior2013-12-221-0/+2
|
* Merge branch 'master' into cmakeTycho Bickerstaff2013-12-215-17/+21
|\
| * Fixed the rest of constructor reorders.madmaxoft2013-12-201-2/+2
| |
| * Sorted a few constructors to remove warnings.madmaxoft2013-12-205-17/+21
| |
* | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-201-1/+1
|\|
| * Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT).madmaxoft2013-12-201-1/+1
| |
* | moved mobs to globsTycho Bickerstaff2013-12-111-1/+5
| |
* | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-111-0/+6
|\|
| * Fixed not getting XP from mobs.STRWarrior2013-12-141-0/+6
| |
* | more cmakeTycho Bickerstaff2013-12-101-0/+7
|/
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-261-0/+55
| | | | | Conflicts: VC2008/MCServer.vcproj
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-241-2/+2
| | | | | Conflicts: GNUmakefile
* Moved source to srcAlexander Harkness2013-11-2465-0/+3488
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 19:06:35 +0100