Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed class capitalization for the cave spider. | archshift | 2014-04-24 | 3 | -6/+6 |
| | |||||
* | Fixed references to renamed files. | archshift | 2014-04-24 | 4 | -7/+7 |
| | |||||
* | Rename mob source files to fit CamelCase. | archshift | 2014-04-24 | 6 | -6/+0 |
| | | | | | | | | | | | | | | Rename Cavespider.cpp to CaveSpider.cpp Rename Cavespider.h to CaveSpider.h Rename Magmacube.cpp to MagmaCube.cpp Rename Magmacube.h to MagmaCube.h Rename Zombiepigman.cpp to ZombiePigman.cpp Rename Zombiepigman.h to ZombiePigman.h | ||||
* | Merge pull request #909 from jfhumann/fixes | Mattes D | 2014-04-22 | 2 | -4/+5 |
|\ | | | | | | | | | Bug fixes and optimizations. We need to visit the API functions and check that they return only those values expected. `cWorld::CreateProjectile()` seems affected, too, by the same issue of ToLua returning extra values. In the cleanest form, these functions will need moving to ManualBindings.cpp | ||||
| * | Merge remote-tracking branch 'origin/master' into fixes | jfhumann | 2014-04-18 | 5 | -18/+32 |
| |\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Authenticator.cpp src/ClientHandle.cpp src/Entities/Minecart.cpp src/Protocol/Protocol17x.cpp | ||||
| * | | Did some static analysis, fixed some bugs and optimized a lot of code | jfhumann | 2014-04-18 | 2 | -4/+5 |
| | | | |||||
* | | | Compilation fix | Tiger Wang | 2014-04-18 | 1 | -1/+1 |
| | | | |||||
* | | | Fixed #906 | Tiger Wang | 2014-04-18 | 1 | -1/+2 |
| | | | |||||
* | | | Fixed #904 | Tiger Wang | 2014-04-18 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge pull request #891 from mc-server/fixes | Mattes D | 2014-04-17 | 3 | -4/+4 |
|\ \ | | | | | | | Fixes to redstone & general | ||||
| * | | Entities handle chunks properly again | Tiger Wang | 2014-04-12 | 3 | -4/+4 |
| |/ | | | | | | | | | * Entities properly handle chunks * Changed EntityStatus enums to be less shouty | ||||
* / | Added new AI rules | Tiger Wang | 2014-04-17 | 2 | -14/+28 |
|/ | | | | | | | + Added new AI rules handling cacti and large heights * Fixed cIniFile not recognising comments in cIniFile::ReadFile() * Fixed users.ini not being properly generated * Changed all instances of (int)floor(GetPosXXX()) to POSXXX_TOINT | ||||
* | Fixed GitHuB WebEdit fail. | Alexander Harkness | 2014-04-10 | 1 | -0/+1 |
| | |||||
* | Update Monster.cpp | Alexander Harkness | 2014-04-10 | 1 | -2/+4 |
| | |||||
* | Merge pull request #849 from mc-server/minorfixes | Mattes D | 2014-04-02 | 1 | -8/+10 |
|\ | | | | | Minor fixes | ||||
| * | Final realisation of suggestions | Tiger Wang | 2014-03-31 | 1 | -5/+7 |
| | | |||||
| * | Fixed a few Y too high/low asserts | Tiger Wang | 2014-03-31 | 1 | -5/+5 |
| | | |||||
* | | Merge branch 'MacFixes' | Tycho | 2014-04-02 | 3 | -6/+2 |
|\ \ | | | | | | | | | | | | | | | | Conflicts: src/DeadlockDetect.cpp src/World.cpp | ||||
| * | | More fixes to get it to compile for me on Mac 10.9. Mostly just newline additions, but some of the unused variables were causing errors, so I wrapped them in #ifndef __APPLE__ calls, since I didn't know if they were going to be used in the future. | Samuel Barney | 2014-03-25 | 3 | -6/+2 |
| |/ | | | | | | | Also had to undefine TOLUA_TEMPLATE_BIND a couple of times. | ||||
* | | Fixed clang compilation | andrew | 2014-03-25 | 1 | -1/+1 |
| | | |||||
* | | Fixed wither summoning | andrew | 2014-03-25 | 2 | -2/+13 |
| | | |||||
* | | Protocol: Wither metadata | andrew | 2014-03-25 | 2 | -0/+19 |
|/ | |||||
* | Minor fixes | andrew | 2014-03-25 | 2 | -4/+3 |
| | |||||
* | Wither invulnerability | andrew | 2014-03-24 | 3 | -1/+66 |
| | |||||
* | Fixed double to float conversions. | madmaxoft | 2014-03-16 | 1 | -5/+5 |
| | |||||
* | Unified Vector classes | andrew | 2014-03-11 | 2 | -2/+2 |
| | |||||
* | Merge branch 'master' into ballisticmissiles | Tiger Wang | 2014-03-09 | 6 | -17/+43 |
|\ | | | | | | | | | Conflicts: src/ClientHandle.cpp | ||||
| * | cBlockInfo now manages the respective cBlockHandler | andrew | 2014-03-02 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #738 from xdot/master | Mattes D | 2014-03-02 | 2 | -6/+6 |
| |\ | | | | | | | Refactored global block property arrays | ||||
| | * | g_BlockXXX => cBlockInfo::XXX | andrew | 2014-03-01 | 2 | -6/+6 |
| | | | |||||
| * | | Creeper fixes | tonibm19 | 2014-03-02 | 2 | -10/+34 |
| |/ | | | | | | | | | - Fixed explosion time (1.5s, according to minecraftwiki) - Creeper explodes if right clicked with flint and steel | ||||
| * | added mooshroom to cow conversion | tonibm19 | 2014-02-27 | 1 | -0/+2 |
| | | |||||
* | | Fixed sheep ASSERTing sometimes | Tiger Wang | 2014-02-27 | 1 | -8/+18 |
|/ | |||||
* | Merge pull request #710 from TheJumper/master | Mattes D | 2014-02-24 | 24 | -38/+319 |
|\ | | | | | Fixed Mob Drops, Add Rare, Uncommon and Gear Drops, Looting inflicts Drops | ||||
| * | Fixed Formatting, added compiler warning suppressing methods, fixed comments | TheJumper | 2014-02-24 | 5 | -3/+6 |
| | | |||||
| * | Fixed Formatting, Added DropChances and CanPickUpLoot attributes to Monsters | TheJumper | 2014-02-23 | 24 | -38/+316 |
| | | |||||
* | | Add Wolf Heal with Food | Howaner | 2014-02-20 | 1 | -10/+34 |
|/ | |||||
* | Merge pull request #690 from tonibm19/master | Alexander Harkness | 2014-02-17 | 1 | -2/+2 |
|\ | | | | | Now mobs can't escape from fences. | ||||
| * | Improved formatting | tonibm19 | 2014-02-17 | 1 | -2/+2 |
| | | |||||
| * | Now mobs can't escape from fences. | tonibm19 | 2014-02-16 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #692 from mc-server/wolfcleanup | Alexander Harkness | 2014-02-17 | 1 | -30/+15 |
|\ \ | | | | | | | Wolf cleanup | ||||
| * | | Fixes to previous commit | Tiger Wang | 2014-02-16 | 1 | -9/+10 |
| | | | |||||
| * | | Slight cleanup of wolf code | Tiger Wang | 2014-02-16 | 1 | -23/+7 |
| |/ | |||||
* / | Fixed TNT fizzing everywhere | Tiger Wang | 2014-02-15 | 1 | -1/+1 |
|/ | |||||
* | Simplified Attack() tracing | Tiger Wang | 2014-02-12 | 1 | -1/+6 |
| | |||||
* | Fixed #627 | Tiger Wang | 2014-02-11 | 4 | -19/+10 |
| | | | | | | | - Attack() is now called from cAggressive instead of cMonster * Monsters can no longer attack through walls * Should fix last remnants of player damage after teleporting (that both STR and bearbin contributed fixes to :P) | ||||
* | Merge remote-tracking branch 'origin/master' into playerimprovements | Tiger Wang | 2014-02-09 | 2 | -6/+6 |
|\ | | | | | | | | | | | | | Conflicts: src/Root.cpp src/Root.h src/World.cpp | ||||
| * | Merge pull request #646 from worktycho/warningfixes | Alexander Harkness | 2014-02-05 | 2 | -6/+6 |
| |\ | | | | | | | Fixed most of the reordering warnings | ||||
| | * | Fixed most of the reordering warnings | Tycho | 2014-02-05 | 2 | -6/+6 |
| | | | |||||
* | | | Merge branch 'master' into playerimprovements | Tiger Wang | 2014-02-09 | 3 | -1/+14 |
|\| | | | | | | | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua | ||||
| * | | Merge pull request #635 from tonibm19/master | Mattes D | 2014-02-04 | 2 | -0/+13 |
| |\ \ | | |/ | |/| | Exported Item:IsEnchantable and Monster:MoveToPosition to Lua API | ||||
| | * | Blank lines and indentation. | tonibm19 | 2014-02-04 | 1 | -0/+4 |
| | | | | | | | | | | | | Also removed GetClosestPlayer documentation | ||||
| | * | Exporded World:FindClosestPlayer, Item:IsEnchantable and Monster:MoveToPosition to Lua API | tonibm19 | 2014-02-03 | 2 | -0/+9 |
| | | | |||||
| * | | Increased Type safety of Biomes | Tycho | 2014-02-03 | 1 | -1/+1 |
| |/ | | | | | | | | | Changed a number of funcictions from using integers to store biomes to using EMCSBiome Note that switching from an int to an Enum is a non-breaking chang to the lua bindings | ||||
* / | Fixed a bunch of MSVS warnings | Tiger Wang | 2014-02-05 | 1 | -1/+1 |
|/ | | | | | * Possibly also fixed some bugs with pathfinding and TNT, though unlikely | ||||
* | Merge branch 'master' into GeneratingBenchmark2 | Tycho | 2014-02-02 | 2 | -1/+2 |
|\ | | | | | | | | | Conflicts: src/Blocks/BlockTorch.h | ||||
| * | Monster's nominal speed was increased. | Kirill Kirilenko | 2014-02-01 | 1 | -1/+1 |
| | | |||||
| * | Fixed teleport to air, if owner is flying. | Kirill Kirilenko | 2014-02-01 | 1 | -0/+1 |
| | | |||||
* | | Changed Signiture of OnUpdate | Tycho | 2014-02-02 | 1 | -1/+4 |
|/ | |||||
* | Did what xoft said | tonibm19 | 2014-01-29 | 4 | -5/+3 |
| | |||||
* | Rewritten code. | tonibm19 | 2014-01-29 | 12 | -152/+25 |
| | | | | | Implemented xoft suggestion. Using MoveToPosition as tigerw suggested. | ||||
* | Fixed sheep | tonibm19 | 2014-01-29 | 1 | -18/+17 |
| | |||||
* | Fixed a copypasta error... | tonibm19 | 2014-01-29 | 4 | -1/+5 |
| | |||||
* | Now mobs follow you when holding their breed item | tonibm19 | 2014-01-29 | 10 | -5/+153 |
| | |||||
* | Renamed Farmer functions and added doxycomments | STRWarrior | 2014-01-28 | 2 | -17/+20 |
| | |||||
* | Villager: NoCountDown and Action function don't check VillagersShouldHarvestCrops anymore because it shoudn't even be activated anywhere. | STRWarrior | 2014-01-28 | 1 | -10/+0 |
| | |||||
* | Villager doesn't check the environment for crops if it doesn't need to. | STRWarrior | 2014-01-27 | 1 | -0/+5 |
| | |||||
* | The world can now be configured wether farmers should be able to harvest crops. | STRWarrior | 2014-01-27 | 1 | -0/+10 |
| | |||||
* | Villager: Few more comments. | STRWarrior | 2014-01-27 | 2 | -4/+9 |
| | |||||
* | Cleanup | STRWarrior | 2014-01-27 | 2 | -31/+65 |
| | | | | Most code in Tick is now split up in different functions. | ||||
* | Villagers: Harvesting is more rare. | STRWarrior | 2014-01-27 | 1 | -1/+1 |
| | |||||
* | Villager: Farmers can't place crops on blocks other then farmland. | STRWarrior | 2014-01-27 | 1 | -1/+7 |
| | |||||
* | Fixed compiler error. | STRWarrior | 2014-01-27 | 1 | -1/+1 |
| | |||||
* | Villager: Farmer: Crops finding is more random. | STRWarrior | 2014-01-27 | 1 | -18/+19 |
| | |||||
* | Added GetCropsPos and DidFindCrops functions. | STRWarrior | 2014-01-27 | 1 | -0/+6 |
| | |||||
* | Villagers: Farmers now replant the crops. | STRWarrior | 2014-01-27 | 2 | -1/+17 |
| | |||||
* | Villagers: Fixed only gettings the crops block when farming. | STRWarrior | 2014-01-27 | 1 | -2/+2 |
| | |||||
* | Villagers don't look for new crops when they already found one. | STRWarrior | 2014-01-27 | 1 | -11/+9 |
| | | | | Slight cleanup. | ||||
* | Villagers: Farmers can also harvest carrots and potatoes. | STRWarrior | 2014-01-27 | 2 | -9/+38 |
| | |||||
* | Makes farmers farm crops. | STRWarrior | 2014-01-27 | 2 | -1/+76 |
| | |||||
* | Merge pull request #590 from mc-server/Wolf_Fix | Mattes D | 2014-01-26 | 1 | -7/+31 |
|\ | | | | | Wolf: Small fix since the new AI and a new small feature. | ||||
| * | Fixed bug where wolfs would teleport while they were sitting. | STRWarrior | 2014-01-26 | 1 | -1/+4 |
| | | |||||
| * | Small fix since the new AI and a new small feature. | STRWarrior | 2014-01-26 | 1 | -6/+27 |
| | | | | | | | | | | You get particles when trying to tame wolfs. They don't walk anymore when they are sitting. | ||||
* | | Fixed segmentation fault on villager damage | Tiger Wang | 2014-01-26 | 1 | -1/+1 |
|/ | | | | It occurred when attack was environmental. | ||||
* | Merge pull request #588 from mc-server/Sheep_Eating | Mattes D | 2014-01-25 | 2 | -1/+41 |
|\ | | | | | Implemented sheeps eating grass. | ||||
| * | Implemented sheeps eating grass. | STRWarrior | 2014-01-25 | 2 | -1/+41 |
| | | |||||
* | | Merge pull request #587 from mc-server/mobimprovements | Mattes D | 2014-01-25 | 14 | -277/+482 |
|\ \ | |/ |/| | Mob improvements & rudimentary artificial intelligence | ||||
| * | Did what xoft recommended | Tiger Wang | 2014-01-25 | 1 | -1/+5 |
| | | |||||
| * | Implemented fall damage for mobs | Tiger Wang | 2014-01-25 | 2 | -6/+33 |
| | | | | | | | | | | | | + Implemented mobile fall damage * Formatting fixes + Defined new Position->Integer macros | ||||
| * | Attack() is no longer always called | Tiger Wang | 2014-01-25 | 1 | -1/+1 |
| | | |||||
| * | Mob bugfixes | Tiger Wang | 2014-01-25 | 2 | -22/+39 |
| | | | | | | | | | | | | | | | | | | | | * Mobs no longer require constant line-of-sight to a player to remain aggravated * Fixed an ASSERT * Fixed mobs jumping * Fixed Idle state not properly using AI + Added FILE_IO_PREFIX to favicon loading + Implemented #563 | ||||
| * | All mobs now drown (fixes #54) | Tiger Wang | 2014-01-25 | 2 | -0/+7 |
| | | | | | | | | | | * Implemented mob drowning * Iron Golems and squids are excluded | ||||
| * | Fixed a generator bug | Tiger Wang | 2014-01-25 | 1 | -0/+3 |
| | | |||||
| * | Zombies and skeletons use AI | Tiger Wang | 2014-01-25 | 2 | -9/+15 |
| | | |||||
| * | Miscellaneous improvements | Tiger Wang | 2014-01-24 | 2 | -18/+13 |
| | | |||||
| * | Changed a condition to IsGameMode | Tiger Wang | 2014-01-24 | 1 | -2/+1 |
| | | |||||
| * | Made wolves compatible with new AI code | Tiger Wang | 2014-01-24 | 2 | -11/+26 |
| | | |||||
| * | Monsters no longer check for direct line of sight | Tiger Wang | 2014-01-24 | 1 | -10/+2 |
| | | |||||
| * | Large reworking of mob code [SEE DESC] | Tiger Wang | 2014-01-24 | 6 | -232/+324 |
| | | | | | | | | | | | | | | + Implemented better pathfinding - Removed lots of unused variables, functions, etc. * Changed some variable types * Other miscellaneous fixes, and also completes the previous PRs | ||||
| * | Implemented creeper abilities | Tiger Wang | 2014-01-24 | 2 | -2/+50 |
| | | | | | | | | | | | | | | | | * Creepers now explode with a sound effect * Creepers drop a music disc on the unlikely event of being killed by a skeleton's arrow Inspired by @maniak89's PR #132. | ||||
* | | Fixed a failure in cSquid. | madmaxoft | 2014-01-24 | 1 | -1/+2 |
|/ | | | | Probably due to rounding errors the squid was querying out-of-chunk coords. | ||||
* | Removed obsoleted functions | Tiger Wang | 2014-01-16 | 1 | -1/+1 |
| | |||||
* | Merge branch 'fixes&features' of git://github.com/tonibm19/MCServer | madmaxoft | 2013-12-25 | 1 | -0/+6 |
|\ | |||||
| * | Some fixes (SEE DESC) | tonibm19 | 2013-12-23 | 1 | -0/+6 |
| | | | | | | | | -Added missing mobs (wither, enderdragon and iron golem) to type to string list. -Wither and iron golem can now spawn | ||||
* | | Preliminary mobile entity saving | Tiger Wang | 2013-12-25 | 1 | -1/+2 |
|/ | | | | | | | * Fixes #252 * Alleviates #380 + Adds mob saving * Fixed some debug !ASSERTs | ||||
* | Fixed bug where snowgolems could replace non-solid blocks to snow blocks. | STRWarrior | 2013-12-22 | 1 | -1/+3 |
| | |||||
* | Snow golems die in hot biomes and leave a snow trail. | STRWarrior | 2013-12-22 | 2 | -0/+18 |
| | |||||
* | EnderDragons and SnowGolems are able to spawn. | STRWarrior | 2013-12-22 | 1 | -0/+2 |
| | |||||
* | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-21 | 5 | -17/+21 |
|\ | |||||
| * | Fixed the rest of constructor reorders. | madmaxoft | 2013-12-20 | 1 | -2/+2 |
| | | |||||
| * | Sorted a few constructors to remove warnings. | madmaxoft | 2013-12-20 | 5 | -17/+21 |
| | | |||||
* | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-20 | 1 | -1/+1 |
|\| | |||||
| * | Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT). | madmaxoft | 2013-12-20 | 1 | -1/+1 |
| | | |||||
* | | moved mobs to globs | Tycho Bickerstaff | 2013-12-11 | 1 | -1/+5 |
| | | |||||
* | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-11 | 1 | -0/+6 |
|\| | |||||
| * | Fixed not getting XP from mobs. | STRWarrior | 2013-12-14 | 1 | -0/+6 |
| | | |||||
* | | more cmake | Tycho Bickerstaff | 2013-12-10 | 1 | -0/+7 |
|/ | |||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-26 | 1 | -0/+55 |
| | | | | | Conflicts: VC2008/MCServer.vcproj | ||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-24 | 1 | -2/+2 |
| | | | | | Conflicts: GNUmakefile | ||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 65 | -0/+3488 |