summaryrefslogtreecommitdiffstats
path: root/src/Mobs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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 16:30:34 +0100