Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make endermen take damage in water | Jonathan Frederick | 2014-09-28 | 2 | -0/+21 |
| | |||||
* | Fixed minor style issues. | madmaxoft | 2014-09-27 | 1 | -1/+1 |
| | |||||
* | Merge pull request #1415 from Masy98/blocks | Mattes D | 2014-09-26 | 1 | -1/+1 |
|\ | | | | | Added 1.8 Blocks and Items | ||||
| * | Merge branch 'master' into blocks | Masy98 | 2014-09-26 | 12 | -112/+208 |
| |\ | | | | | | | | | | | | | | | | Conflicts: src/Items/ItemHandler.cpp src/Simulator/IncrementalRedstoneSimulator.cpp | ||||
| * | | Fixed mutton name in Sheep.cpp | Masy98 | 2014-09-11 | 1 | -1/+1 |
| | | | |||||
* | | | Removed more unessicary includes | Tycho | 2014-09-26 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge pull request #1419 from mc-server/redstoneTests | worktycho | 2014-09-26 | 10 | -107/+117 |
|\ \ | | | | | | | Added test mocking to IncrementalRedstoneSimulator | ||||
| * | | Fixed style | Tycho | 2014-09-25 | 1 | -0/+3 |
| | | | |||||
| * | | Merge branch 'master' into redstoneTests | Tycho | 2014-09-25 | 3 | -2/+81 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: src/Mobs/Monster.h | ||||
| * \ \ | Merge branch 'master' into redstoneTests | Tycho | 2014-09-17 | 2 | -1/+10 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/ChunkInterface.h | ||||
| * | | | | Added first test to show the object can be created | Tycho | 2014-09-17 | 10 | -110/+115 |
| | |_|/ | |/| | | |||||
* | | | | Fixed wrong Surrounding size | Howaner | 2014-09-25 | 1 | -3/+3 |
| |_|/ |/| | | |||||
* | | | Merge branch 'master' into EntityCustomName | Howaner | 2014-09-23 | 3 | -1/+17 |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/ClientHandle.h src/Protocol/Protocol.h src/Protocol/Protocol125.cpp src/Protocol/Protocol125.h src/Protocol/Protocol17x.cpp src/Protocol/Protocol17x.h src/Protocol/ProtocolRecognizer.cpp src/Protocol/ProtocolRecognizer.h src/World.cpp src/World.h | ||||
| * | | Improved cBlockHandler::DropBlock | Tiger Wang | 2014-09-13 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into Effects | Howaner | 2014-09-12 | 1 | -0/+7 |
| |\| | |||||
| | * | Revert "Globals.h: Added Floor and Ciel casting, C++ cast cleanups, etc" | archshift | 2014-09-04 | 1 | -7/+5 |
| | | | | | | | | | | | | | | | | | | This reverts commit 472efa8174626a00ffdf5b39e1a44ac419cd3698. Apparently we don't support some of these features quite yet (darn you C++98!) | ||||
| | * | Globals.h: Added Floor and Ciel casting, C++ cast cleanups, etc | archshift | 2014-09-04 | 1 | -5/+7 |
| | | | | | | | | | | | | Snow Golems must also be above 64Y to spawn snow (as of 1.8). | ||||
| | * | Fixed style and alpha-sorting. | madmaxoft | 2014-09-03 | 1 | -7/+7 |
| | | | |||||
| | * | Added mutton, which sheep now drop when killed | archshift | 2014-09-03 | 1 | -0/+7 |
| | | | |||||
| * | | Renamed SetWalkSpeed() to SetRelativeWalkSpeed() | Howaner | 2014-09-02 | 2 | -5/+5 |
| | | | |||||
| * | | Added SetWalkSpeed() to cMonster. | Howaner | 2014-08-30 | 2 | -0/+9 |
| |/ | |||||
* | | Added CustomName saving. | Howaner | 2014-09-02 | 1 | -2/+8 |
| | | |||||
* | | Added the new functions to APIDump. | Howaner | 2014-09-02 | 1 | -2/+2 |
| | | |||||
* | | Added SetCustomName() to players. | Howaner | 2014-09-02 | 1 | -1/+2 |
| | | |||||
* | | Added name tag | Howaner | 2014-09-01 | 3 | -0/+23 |
| | | |||||
* | | Added CustomName to cMonster. | Howaner | 2014-09-01 | 2 | -1/+48 |
|/ | |||||
* | Fixed mob burning. | reiter | 2014-08-28 | 1 | -1/+1 |
| | | | Fixes #1298 | ||||
* | BasicStyleCheck: Dividers are exactly 80 slashes. | madmaxoft | 2014-08-04 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into Monster | Howaner | 2014-08-04 | 1 | -2/+1 |
|\ | |||||
| * | Refactored case-conversion functions. | madmaxoft | 2014-08-04 | 1 | -2/+1 |
| | | | | | | | | StrToLower() returns a modified copy of the string, InPlaceLowercase() modifies the string in-place. | ||||
* | | Changed /** to /* | Howaner | 2014-08-04 | 1 | -3/+5 |
| | | |||||
* | | Fixed warnings | Howaner | 2014-08-04 | 1 | -3/+3 |
| | | |||||
* | | Attempt to fix knockback and swimming. | Howaner | 2014-08-04 | 1 | -3/+9 |
|/ | |||||
* | Wolf uses UUID for owner. | madmaxoft | 2014-08-03 | 2 | -3/+13 |
| | | | | Fixes #1277. | ||||
* | Trailing whitespace fix. | madmaxoft | 2014-08-03 | 1 | -1/+1 |
| | |||||
* | Improved endermen code a little | Tiger Wang | 2014-08-01 | 3 | -20/+56 |
| | |||||
* | Merge pull request #1047 from mc-server/Enderman | Tiger Wang | 2014-07-31 | 2 | -0/+121 |
|\ | | | | | Enderman attacks a player if he's looking at him | ||||
| * | Comment suggestions | Tiger Wang | 2014-07-31 | 1 | -9/+8 |
| | | |||||
| * | Added lighting code and added comments | STRWarrior | 2014-07-30 | 1 | -0/+17 |
| | | |||||
| * | Removed lighting code in cEnderman::CheckEventSeePlayer | STRWarrior | 2014-07-30 | 1 | -9/+1 |
| | | |||||
| * | Changed comment | worktycho | 2014-06-30 | 1 | -1/+1 |
| | | |||||
| * | Replaced strange algebra with dot product. | worktycho | 2014-06-18 | 1 | -4/+6 |
| | | | | | | | | 10 degrees is a completely arbitary constant I pulled from nowhere. Feel free to adjust this value. | ||||
| * | Improved Enderman code | Tiger Wang | 2014-06-18 | 2 | -14/+34 |
| | | |||||
| * | Swapped m_Player and m_EndermanPos | STRWarrior | 2014-06-18 | 1 | -2/+2 |
| | | |||||
| * | Enderman attacks a player if he's looking at him. | STRWarrior | 2014-06-18 | 2 | -0/+91 |
| | | |||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-07-29 | 31 | -36/+32 |
|\ \ | | | | | | | | | | | | | Conflicts: src/World.h | ||||
| * \ | Merge branch 'master' into Inventory2 | Howaner | 2014-07-26 | 30 | -31/+31 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: src/BlockInfo.cpp | ||||
| | * | | Removed redundant semicolons and re-added warning | archshift | 2014-07-24 | 30 | -31/+31 |
| | | | | |||||
| * | | | Fix item durability. | Howaner | 2014-07-23 | 1 | -5/+1 |
| |/ / | | | | | | | Fixes #1181 | ||||
* | | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-07-22 | 10 | -34/+173 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp | ||||
| * | | Style: Normalized to no spaces before closing parenthesis. | madmaxoft | 2014-07-21 | 1 | -1/+1 |
| | | | |||||
| * | | Style: Normalized spaces after if, for and while. | madmaxoft | 2014-07-21 | 1 | -1/+1 |
| | | | |||||
| * | | Monsters: Made IsUndead overridable by the respective mob classes | archshift | 2014-07-19 | 6 | -13/+11 |
| | | | |||||
| * | | Fixed style: spaces after commas. | madmaxoft | 2014-07-19 | 2 | -2/+2 |
| | | | |||||
| * | | Merge pull request #1214 from mc-server/anti-glob | Mattes D | 2014-07-19 | 1 | -5/+71 |
| |\ \ | | | | | | | | | CMake - Explicitly lists all source files | ||||
| | * | | Subdirs: Only add_library if not using MSVC | archshift | 2014-07-19 | 1 | -1/+3 |
| | | | | |||||
| | * | | Mobs/CMakeLists.txt: Replaced glob with list of files | archshift | 2014-07-19 | 1 | -5/+69 |
| | | | | |||||
| * | | | Fixed clamping issues | archshift | 2014-07-19 | 1 | -5/+1 |
| |/ / | |||||
| * | | Merge branch 'Entities' | madmaxoft | 2014-07-18 | 3 | -7/+86 |
| |\ \ | |||||
| | * | | Fixed slime-related comments. | madmaxoft | 2014-07-18 | 3 | -5/+10 |
| | | | | |||||
| | * | | Slime sizes are 1, 2 or 4 and not 1, 2 or 3. | Howaner | 2014-07-18 | 3 | -4/+4 |
| | | | | |||||
| | * | | Split into more lines. | Howaner | 2014-07-17 | 2 | -6/+10 |
| | | | | |||||
| | * | | Fixed many slime bugs. | Howaner | 2014-07-17 | 2 | -3/+73 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed slime hurt/death sound - Added slime spawning on death. - Fixed the max health. - Fixed the attack damage. - Little slimes should not attack players. | ||||
* | | | | Merge branch 'master' into portals | Tiger Wang | 2014-07-18 | 23 | -111/+238 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/WorldInterface.h src/ClientHandle.cpp src/ClientHandle.h src/Entities/Player.cpp src/Entities/Player.h src/Generating/FinishGen.cpp src/Protocol/Protocol.h src/Protocol/Protocol125.cpp src/Protocol/Protocol125.h src/Protocol/Protocol16x.cpp src/Protocol/Protocol16x.h src/Protocol/Protocol17x.cpp src/Protocol/Protocol17x.h src/Protocol/ProtocolRecognizer.cpp src/Protocol/ProtocolRecognizer.h src/Root.h src/World.cpp | ||||
| * | | | Monster fixes | Tiger Wang | 2014-07-18 | 6 | -31/+5 |
| | | | | | | | | | | | | | | | | | | | | * Fixes #1203 * Fixes #627 | ||||
| * | | | Fixed spaces before commas. | madmaxoft | 2014-07-18 | 1 | -3/+3 |
| | | | | |||||
| * | | | Skeletons should spawn with a bow in the hand. | Howaner | 2014-07-18 | 2 | -0/+17 |
| | | | | | | | | | | | | Fixes #1184 | ||||
| * | | | Fixed tabs used for alignment. | madmaxoft | 2014-07-17 | 1 | -1/+1 |
| | | | | |||||
| * | | | More trailing whitespace fixes. | madmaxoft | 2014-07-17 | 2 | -2/+2 |
| | | | | |||||
| * | | | Basic style fixes. | madmaxoft | 2014-07-17 | 4 | -9/+9 |
| | | | | |||||
| * | | | Normalized comments. | madmaxoft | 2014-07-17 | 7 | -31/+30 |
| |/ / | | | | | | | | | | | | | This was mostly done automatically and then visually inspected for obvious errors. All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign. | ||||
| * | | Merge branch 'master' into potions | madmaxoft | 2014-07-17 | 7 | -12/+12 |
| |\ \ | |||||
| | * \ | Merge pull request #1193 from mc-server/deathmessages | Mattes D | 2014-07-17 | 7 | -12/+12 |
| | |\ \ | | | | | | | | | | | Death messages | ||||
| | | * | | Resolved backwards compatibility issues | Tiger Wang | 2014-07-16 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Tailored death messages | Tiger Wang | 2014-07-04 | 6 | -11/+11 |
| | | | | | |||||
| * | | | | Merge branch 'master' into potions | madmaxoft | 2014-07-15 | 4 | -10/+68 |
| |\| | | | |||||
| | * | | | Update. | Howaner | 2014-07-13 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge branch 'master' into Sounds | Howaner | 2014-07-13 | 3 | -6/+64 |
| | |\ \ \ | |||||
| | | * | | | Changed comments. | Howaner | 2014-07-13 | 1 | -3/+5 |
| | | | | | | |||||
| | | * | | | Merge branch 'master' into Sheep | Howaner | 2014-07-13 | 4 | -9/+25 |
| | | |\ \ \ | |||||
| | | * | | | | Add doxy-comments. | Howaner | 2014-07-01 | 1 | -1/+4 |
| | | | | | | | |||||
| | | * | | | | Moved the random code to a function (cSheep::GenerateNaturalRandomColor()) | Howaner | 2014-06-30 | 2 | -36/+47 |
| | | | | | | | |||||
| | | * | | | | Save IsSheared from Sheep. | Howaner | 2014-06-28 | 1 | -0/+3 |
| | | | | | | | |||||
| | | * | | | | Fix sheep color's, add shear sound. | Howaner | 2014-06-28 | 3 | -3/+42 |
| | | | |/ / | | | |/| | | |||||
| | * | | | | Changed BroadcastSoundEffect function to take floating pos. | Howaner | 2014-07-13 | 2 | -4/+4 |
| | | |/ / | | |/| | | |||||
| * | | | | For now, removed creator member from Entity Effect for pointer safety | archshift | 2014-07-12 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'origin/master' into potions | archshift | 2014-07-10 | 8 | -9/+49 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Entities/Player.cpp src/Entities/ProjectileEntity.cpp | ||||
| | * | | | Merge pull request #1135 from mc-server/fixes | Tiger Wang | 2014-07-09 | 3 | -8/+24 |
| | |\ \ \ | | | | | | | | | | | | | Fixes to projectiles and the undead | ||||
| | | * | | | Changed everything to callbacks | Tiger Wang | 2014-07-05 | 1 | -2/+20 |
| | | | | | | |||||
| | | * | | | Bettered zombie and skeleton AI | Tiger Wang | 2014-06-22 | 2 | -6/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Fixed potential issues with skylight detection | ||||
| | * | | | | Fixed slime handling in cMonster::StringToMobType(). | madmaxoft | 2014-07-06 | 1 | -1/+1 |
| | | |/ / | | |/| | | |||||
| | * | | | Merged branch 'tonibm19/master'. | Mattes D | 2014-06-26 | 2 | -0/+21 |
| | |\ \ \ | | | |/ / | | |/| | | |||||
| | | * | | Added pig riding. | tonibm19 | 2014-06-20 | 2 | -0/+14 |
| | |/ / | | | | | | | | | | | | | Now you can ride a pig using a carrot on a stick. | ||||
| * | | | EntityEffects.x -> EntityEffect.x, Object-Oriented effects | archshift | 2014-06-19 | 2 | -47/+0 |
| | | | | | | | | | | | | | | | | Changed effect map to take a pointer of the effect as a result. | ||||
| * | | | Entity effects: changed User to Creator, removed pawn pass-by-value | archshift | 2014-06-17 | 1 | -1/+1 |
| | | | | |||||
| * | | | Entity Effects: Clarified user, added it to AddEntityEffect | archshift | 2014-06-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Added second AddEntityEffect with a pass-by-value of the class. | ||||
| * | | | Changed the AddEntityEffect() params for easier calls. | madmaxoft | 2014-06-17 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fixed MSVC compilation. | madmaxoft | 2014-06-17 | 1 | -3/+3 |
| | | | | |||||
| * | | | Pawn: renamed HandleEntityEffects to HandleEntityEffect | archshift | 2014-06-17 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | Exported entity effect functions for ToLua and documented them in APIDesc.lua | ||||
| * | | | Cave spider now poisons its victim, added IsPawn function to Entity | archshift | 2014-06-17 | 3 | -4/+22 |
| | | | | |||||
| * | | | Monster: added IsUndead(), undead-specific entity effects | archshift | 2014-06-17 | 2 | -0/+71 |
| | |/ | |/| | |||||
* | | | Merge branch 'master' into portals | Tiger Wang | 2014-06-21 | 3 | -0/+3 |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h | ||||
| * | | Nullify deleted pointers. | archshift | 2014-06-19 | 3 | -0/+3 |
| |/ | |||||
* | | More suggestions | Tiger Wang | 2014-06-21 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-06-10 | 7 | -10/+7 |
|\| | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/Player.cpp src/Entities/Player.h src/Protocol/Protocol125.cpp src/Protocol/Protocol17x.cpp | ||||
| * | Fixed deadlock when moving players to other worlds. | Mattes D | 2014-06-08 | 5 | -5/+5 |
| | | | | | | | | Fixes #1039, fixes #851 | ||||
| * | Fixed mob hitbox sizes, removed TODOs | archshift | 2014-06-07 | 3 | -5/+2 |
| | | | | | | | | | | Measured bat and blaze in vanilla, updated values. Cavespiders are, in fact, passive in the day. | ||||
* | | Fixed decision failure | Tiger Wang | 2014-06-05 | 1 | -1/+1 |
| | | |||||
* | | Added checks for no downfall biomes | Tiger Wang | 2014-06-04 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-06-04 | 2 | -6/+22 |
|\| | |||||
| * | Exploded creepers drop nothing, part of #1058 | Tiger Wang | 2014-06-04 | 1 | -2/+8 |
| | | |||||
| * | Small tweak for mobs | STRWarrior | 2014-06-02 | 1 | -4/+14 |
| | | | | | | | | Mobs move a bit smoother and aren't able to move allot when in air. | ||||
* | | Very minor code changes | Tiger Wang | 2014-05-29 | 1 | -1/+1 |
|/ | |||||
* | Fixed cWither::KilledBy | andrew | 2014-05-21 | 1 | -1/+2 |
| | |||||
* | Cleaned up cPlayer::UpdateMovementStats; Wither achievements | andrew | 2014-05-20 | 2 | -0/+34 |
| | |||||
* | Merge pull request #998 from mc-server/StatManager | Mattes D | 2014-05-18 | 1 | -1/+3 |
|\ | | | | | Statistic Manager | ||||
| * | Fixes | andrew | 2014-05-13 | 1 | -1/+1 |
| | | |||||
| * | Movement Statistics | andrew | 2014-05-12 | 1 | -1/+3 |
| | | |||||
* | | Fixed a few more switch warnings. | archshift | 2014-05-12 | 1 | -0/+2 |
|/ | |||||
* | Merge branch 'master' into redstoneimprovements | Tiger Wang | 2014-05-04 | 17 | -32/+65 |
|\ | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/FallingBlock.cpp src/Mobs/AggressiveMonster.cpp src/Simulator/IncrementalRedstoneSimulator.cpp | ||||
| * | Fixed MagmaCube spawning. | madmaxoft | 2014-05-02 | 1 | -0/+4 |
| | | | | | | | | Fixes #928. | ||||
| * | Merge pull request #940 from Howaner/GlobalFixes | Mattes D | 2014-04-28 | 14 | -32/+58 |
| |\ | | | | | | | Add entity invulnerable | ||||
| | * | Revert "Withers now use the new invulnerable." | Howaner | 2014-04-28 | 2 | -10/+26 |
| | | | | | | | | | This reverts commit 619592b5a0ab651e714d55932bc7909e4204cee9. | ||||
| | * | Revert "Changed the old invulnerable methods from the wither to the new." | Howaner | 2014-04-28 | 1 | -3/+0 |
| | | | | | | | | | This reverts commit d50f8f6f11f69e7e1e56be92fb2d72a5014a3e34. | ||||
| | * | Changed the old invulnerable methods from the wither to the new. | Howaner | 2014-04-26 | 1 | -0/+3 |
| | | | |||||
| | * | Withers now use the new invulnerable. | Howaner | 2014-04-26 | 2 | -26/+10 |
| | | | |||||
| | * | Fixes | Howaner | 2014-04-26 | 2 | -8/+8 |
| | | | |||||
| | * | Add entity invulnerable | Howaner | 2014-04-26 | 14 | -24/+50 |
| | | | |||||
| * | | Merge pull request #954 from mc-server/projectiles-split | Mattes D | 2014-04-28 | 3 | -0/+3 |
| |\ \ | | | | | | | | | Totally refactored ProjectileEntity.h, splitting up into several files. | ||||
| | * | | Fixed projectile source filenames, indentations | archshift | 2014-04-28 | 3 | -3/+3 |
| | | | | |||||
| | * | | Moved cGhastFireballEntity out of ProjectileEntity.h | archshift | 2014-04-27 | 1 | -0/+1 |
| | | | | |||||
| | * | | Moved cFireChargeEntity out of ProjectileEntity.h | archshift | 2014-04-27 | 1 | -0/+1 |
| | | | | |||||
| | * | | Moved cArrowEntity out of ProjectileEntity.h | archshift | 2014-04-27 | 1 | -0/+1 |
| | | | | |||||
| * | | | Fixed warnings. | madmaxoft | 2014-04-27 | 1 | -2/+2 |
| | | | | |||||
| * | | | Added static const, initialized fields. | archshift | 2014-04-27 | 1 | -1/+1 |
| |/ / | |||||
* / / | Redstone simulator now directly accesses cChunk | Tiger Wang | 2014-04-27 | 1 | -3/+2 |
|/ / | | | | | | | | | | | * Redstone simulator performance improvements * Added return values to some functions * Minor fixes | ||||
* | | Further refactored, Reverted Minecart change | archshift | 2014-04-26 | 2 | -3/+3 |
| | | | | | | | | Other small changes. | ||||
* | | Fixed mobs that don't naturally spawn. | archshift | 2014-04-26 | 2 | -2/+6 |
| | | |||||
* | | Moved huge conditional out of InStateChasing(), improving readability | archshift | 2014-04-26 | 2 | -1/+20 |
| | | | | | | | | Squashed a warning. | ||||
* | | Merge remote-tracking branch 'upstream/master' | archshift | 2014-04-25 | 1 | -0/+1 |
|\| | |||||
| * | Cmake generated projects for IDEs include headers in project files. | archshift | 2014-04-25 | 1 | -0/+1 |
| | | |||||
* | | Giants! | archshift | 2014-04-25 | 2 | -7/+12 |
|/ | | | | Changed mfMaxplusone to mfUnhandled for readability, and fixed a default case warning. | ||||
* | Fixed class capitalization for the cave spider. | archshift | 2014-04-24 | 3 | -6/+6 |
| | |||||
* | Fixed references to renamed files. | archshift | 2014-04-24 | 4 | -7/+7 |
| | |||||
* | Rename mob source files to fit CamelCase. | archshift | 2014-04-24 | 6 | -6/+0 |
| | | | | | | | | | | | | | | Rename Cavespider.cpp to CaveSpider.cpp Rename Cavespider.h to CaveSpider.h Rename Magmacube.cpp to MagmaCube.cpp Rename Magmacube.h to MagmaCube.h Rename Zombiepigman.cpp to ZombiePigman.cpp Rename Zombiepigman.h to ZombiePigman.h | ||||
* | Merge pull request #909 from jfhumann/fixes | Mattes D | 2014-04-22 | 2 | -4/+5 |
|\ | | | | | | | | | Bug fixes and optimizations. We need to visit the API functions and check that they return only those values expected. `cWorld::CreateProjectile()` seems affected, too, by the same issue of ToLua returning extra values. In the cleanest form, these functions will need moving to ManualBindings.cpp | ||||
| * | Merge remote-tracking branch 'origin/master' into fixes | jfhumann | 2014-04-18 | 5 | -18/+32 |
| |\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Authenticator.cpp src/ClientHandle.cpp src/Entities/Minecart.cpp src/Protocol/Protocol17x.cpp | ||||
| * | | Did some static analysis, fixed some bugs and optimized a lot of code | jfhumann | 2014-04-18 | 2 | -4/+5 |
| | | | |||||
* | | | Compilation fix | Tiger Wang | 2014-04-18 | 1 | -1/+1 |
| | | | |||||
* | | | Fixed #906 | Tiger Wang | 2014-04-18 | 1 | -1/+2 |
| | | | |||||
* | | | Fixed #904 | Tiger Wang | 2014-04-18 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge pull request #891 from mc-server/fixes | Mattes D | 2014-04-17 | 3 | -4/+4 |
|\ \ | | | | | | | Fixes to redstone & general | ||||
| * | | Entities handle chunks properly again | Tiger Wang | 2014-04-12 | 3 | -4/+4 |
| |/ | | | | | | | | | * Entities properly handle chunks * Changed EntityStatus enums to be less shouty | ||||
* / | Added new AI rules | Tiger Wang | 2014-04-17 | 2 | -14/+28 |
|/ | | | | | | | + Added new AI rules handling cacti and large heights * Fixed cIniFile not recognising comments in cIniFile::ReadFile() * Fixed users.ini not being properly generated * Changed all instances of (int)floor(GetPosXXX()) to POSXXX_TOINT | ||||
* | Fixed GitHuB WebEdit fail. | Alexander Harkness | 2014-04-10 | 1 | -0/+1 |
| | |||||
* | Update Monster.cpp | Alexander Harkness | 2014-04-10 | 1 | -2/+4 |
| | |||||
* | Merge pull request #849 from mc-server/minorfixes | Mattes D | 2014-04-02 | 1 | -8/+10 |
|\ | | | | | Minor fixes | ||||
| * | Final realisation of suggestions | Tiger Wang | 2014-03-31 | 1 | -5/+7 |
| | | |||||
| * | Fixed a few Y too high/low asserts | Tiger Wang | 2014-03-31 | 1 | -5/+5 |
| | | |||||
* | | Merge branch 'MacFixes' | Tycho | 2014-04-02 | 3 | -6/+2 |
|\ \ | | | | | | | | | | | | | | | | Conflicts: src/DeadlockDetect.cpp src/World.cpp | ||||
| * | | More fixes to get it to compile for me on Mac 10.9. Mostly just newline additions, but some of the unused variables were causing errors, so I wrapped them in #ifndef __APPLE__ calls, since I didn't know if they were going to be used in the future. | Samuel Barney | 2014-03-25 | 3 | -6/+2 |
| |/ | | | | | | | Also had to undefine TOLUA_TEMPLATE_BIND a couple of times. | ||||
* | | Fixed clang compilation | andrew | 2014-03-25 | 1 | -1/+1 |
| | | |||||
* | | Fixed wither summoning | andrew | 2014-03-25 | 2 | -2/+13 |
| | | |||||
* | | Protocol: Wither metadata | andrew | 2014-03-25 | 2 | -0/+19 |
|/ | |||||
* | Minor fixes | andrew | 2014-03-25 | 2 | -4/+3 |
| | |||||
* | Wither invulnerability | andrew | 2014-03-24 | 3 | -1/+66 |
| | |||||
* | Fixed double to float conversions. | madmaxoft | 2014-03-16 | 1 | -5/+5 |
| | |||||
* | Unified Vector classes | andrew | 2014-03-11 | 2 | -2/+2 |
| | |||||
* | Merge branch 'master' into ballisticmissiles | Tiger Wang | 2014-03-09 | 6 | -17/+43 |
|\ | | | | | | | | | Conflicts: src/ClientHandle.cpp | ||||
| * | cBlockInfo now manages the respective cBlockHandler | andrew | 2014-03-02 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #738 from xdot/master | Mattes D | 2014-03-02 | 2 | -6/+6 |
| |\ | | | | | | | Refactored global block property arrays | ||||
| | * | g_BlockXXX => cBlockInfo::XXX | andrew | 2014-03-01 | 2 | -6/+6 |
| | | | |||||
| * | | Creeper fixes | tonibm19 | 2014-03-02 | 2 | -10/+34 |
| |/ | | | | | | | | | - Fixed explosion time (1.5s, according to minecraftwiki) - Creeper explodes if right clicked with flint and steel | ||||
| * | added mooshroom to cow conversion | tonibm19 | 2014-02-27 | 1 | -0/+2 |
| | | |||||
* | | Fixed sheep ASSERTing sometimes | Tiger Wang | 2014-02-27 | 1 | -8/+18 |
|/ | |||||
* | Merge pull request #710 from TheJumper/master | Mattes D | 2014-02-24 | 24 | -38/+319 |
|\ | | | | | Fixed Mob Drops, Add Rare, Uncommon and Gear Drops, Looting inflicts Drops | ||||
| * | Fixed Formatting, added compiler warning suppressing methods, fixed comments | TheJumper | 2014-02-24 | 5 | -3/+6 |
| | | |||||
| * | Fixed Formatting, Added DropChances and CanPickUpLoot attributes to Monsters | TheJumper | 2014-02-23 | 24 | -38/+316 |
| | | |||||
* | | Add Wolf Heal with Food | Howaner | 2014-02-20 | 1 | -10/+34 |
|/ | |||||
* | Merge pull request #690 from tonibm19/master | Alexander Harkness | 2014-02-17 | 1 | -2/+2 |
|\ | | | | | Now mobs can't escape from fences. | ||||
| * | Improved formatting | tonibm19 | 2014-02-17 | 1 | -2/+2 |
| | | |||||
| * | Now mobs can't escape from fences. | tonibm19 | 2014-02-16 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #692 from mc-server/wolfcleanup | Alexander Harkness | 2014-02-17 | 1 | -30/+15 |
|\ \ | | | | | | | Wolf cleanup | ||||
| * | | Fixes to previous commit | Tiger Wang | 2014-02-16 | 1 | -9/+10 |
| | | | |||||
| * | | Slight cleanup of wolf code | Tiger Wang | 2014-02-16 | 1 | -23/+7 |
| |/ | |||||
* / | Fixed TNT fizzing everywhere | Tiger Wang | 2014-02-15 | 1 | -1/+1 |
|/ | |||||
* | Simplified Attack() tracing | Tiger Wang | 2014-02-12 | 1 | -1/+6 |
| | |||||
* | Fixed #627 | Tiger Wang | 2014-02-11 | 4 | -19/+10 |
| | | | | | | | - Attack() is now called from cAggressive instead of cMonster * Monsters can no longer attack through walls * Should fix last remnants of player damage after teleporting (that both STR and bearbin contributed fixes to :P) | ||||
* | Merge remote-tracking branch 'origin/master' into playerimprovements | Tiger Wang | 2014-02-09 | 2 | -6/+6 |
|\ | | | | | | | | | | | | | Conflicts: src/Root.cpp src/Root.h src/World.cpp | ||||
| * | Merge pull request #646 from worktycho/warningfixes | Alexander Harkness | 2014-02-05 | 2 | -6/+6 |
| |\ | | | | | | | Fixed most of the reordering warnings | ||||
| | * | Fixed most of the reordering warnings | Tycho | 2014-02-05 | 2 | -6/+6 |
| | | | |||||
* | | | Merge branch 'master' into playerimprovements | Tiger Wang | 2014-02-09 | 3 | -1/+14 |
|\| | | | | | | | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua | ||||
| * | | Merge pull request #635 from tonibm19/master | Mattes D | 2014-02-04 | 2 | -0/+13 |
| |\ \ | | |/ | |/| | Exported Item:IsEnchantable and Monster:MoveToPosition to Lua API | ||||
| | * | Blank lines and indentation. | tonibm19 | 2014-02-04 | 1 | -0/+4 |
| | | | | | | | | | | | | Also removed GetClosestPlayer documentation | ||||
| | * | Exporded World:FindClosestPlayer, Item:IsEnchantable and Monster:MoveToPosition to Lua API | tonibm19 | 2014-02-03 | 2 | -0/+9 |
| | | | |||||
| * | | Increased Type safety of Biomes | Tycho | 2014-02-03 | 1 | -1/+1 |
| |/ | | | | | | | | | Changed a number of funcictions from using integers to store biomes to using EMCSBiome Note that switching from an int to an Enum is a non-breaking chang to the lua bindings | ||||
* / | Fixed a bunch of MSVS warnings | Tiger Wang | 2014-02-05 | 1 | -1/+1 |
|/ | | | | | * Possibly also fixed some bugs with pathfinding and TNT, though unlikely | ||||
* | Merge branch 'master' into GeneratingBenchmark2 | Tycho | 2014-02-02 | 2 | -1/+2 |
|\ | | | | | | | | | Conflicts: src/Blocks/BlockTorch.h | ||||
| * | Monster's nominal speed was increased. | Kirill Kirilenko | 2014-02-01 | 1 | -1/+1 |
| | | |||||
| * | Fixed teleport to air, if owner is flying. | Kirill Kirilenko | 2014-02-01 | 1 | -0/+1 |
| | | |||||
* | | Changed Signiture of OnUpdate | Tycho | 2014-02-02 | 1 | -1/+4 |
|/ | |||||
* | Did what xoft said | tonibm19 | 2014-01-29 | 4 | -5/+3 |
| | |||||
* | Rewritten code. | tonibm19 | 2014-01-29 | 12 | -152/+25 |
| | | | | | Implemented xoft suggestion. Using MoveToPosition as tigerw suggested. | ||||
* | Fixed sheep | tonibm19 | 2014-01-29 | 1 | -18/+17 |
| | |||||
* | Fixed a copypasta error... | tonibm19 | 2014-01-29 | 4 | -1/+5 |
| | |||||
* | Now mobs follow you when holding their breed item | tonibm19 | 2014-01-29 | 10 | -5/+153 |
| | |||||
* | Renamed Farmer functions and added doxycomments | STRWarrior | 2014-01-28 | 2 | -17/+20 |
| | |||||
* | Villager: NoCountDown and Action function don't check VillagersShouldHarvestCrops anymore because it shoudn't even be activated anywhere. | STRWarrior | 2014-01-28 | 1 | -10/+0 |
| | |||||
* | Villager doesn't check the environment for crops if it doesn't need to. | STRWarrior | 2014-01-27 | 1 | -0/+5 |
| | |||||
* | The world can now be configured wether farmers should be able to harvest crops. | STRWarrior | 2014-01-27 | 1 | -0/+10 |
| | |||||
* | Villager: Few more comments. | STRWarrior | 2014-01-27 | 2 | -4/+9 |
| | |||||
* | Cleanup | STRWarrior | 2014-01-27 | 2 | -31/+65 |
| | | | | Most code in Tick is now split up in different functions. | ||||
* | Villagers: Harvesting is more rare. | STRWarrior | 2014-01-27 | 1 | -1/+1 |
| | |||||
* | Villager: Farmers can't place crops on blocks other then farmland. | STRWarrior | 2014-01-27 | 1 | -1/+7 |
| | |||||
* | Fixed compiler error. | STRWarrior | 2014-01-27 | 1 | -1/+1 |
| | |||||
* | Villager: Farmer: Crops finding is more random. | STRWarrior | 2014-01-27 | 1 | -18/+19 |
| | |||||
* | Added GetCropsPos and DidFindCrops functions. | STRWarrior | 2014-01-27 | 1 | -0/+6 |
| | |||||
* | Villagers: Farmers now replant the crops. | STRWarrior | 2014-01-27 | 2 | -1/+17 |
| | |||||
* | Villagers: Fixed only gettings the crops block when farming. | STRWarrior | 2014-01-27 | 1 | -2/+2 |
| | |||||
* | Villagers don't look for new crops when they already found one. | STRWarrior | 2014-01-27 | 1 | -11/+9 |
| | | | | Slight cleanup. | ||||
* | Villagers: Farmers can also harvest carrots and potatoes. | STRWarrior | 2014-01-27 | 2 | -9/+38 |
| | |||||
* | Makes farmers farm crops. | STRWarrior | 2014-01-27 | 2 | -1/+76 |
| | |||||
* | Merge pull request #590 from mc-server/Wolf_Fix | Mattes D | 2014-01-26 | 1 | -7/+31 |
|\ | | | | | Wolf: Small fix since the new AI and a new small feature. | ||||
| * | Fixed bug where wolfs would teleport while they were sitting. | STRWarrior | 2014-01-26 | 1 | -1/+4 |
| | | |||||
| * | Small fix since the new AI and a new small feature. | STRWarrior | 2014-01-26 | 1 | -6/+27 |
| | | | | | | | | | | You get particles when trying to tame wolfs. They don't walk anymore when they are sitting. | ||||
* | | Fixed segmentation fault on villager damage | Tiger Wang | 2014-01-26 | 1 | -1/+1 |
|/ | | | | It occurred when attack was environmental. | ||||
* | Merge pull request #588 from mc-server/Sheep_Eating | Mattes D | 2014-01-25 | 2 | -1/+41 |
|\ | | | | | Implemented sheeps eating grass. | ||||
| * | Implemented sheeps eating grass. | STRWarrior | 2014-01-25 | 2 | -1/+41 |
| | | |||||
* | | Merge pull request #587 from mc-server/mobimprovements | Mattes D | 2014-01-25 | 14 | -277/+482 |
|\ \ | |/ |/| | Mob improvements & rudimentary artificial intelligence | ||||
| * | Did what xoft recommended | Tiger Wang | 2014-01-25 | 1 | -1/+5 |
| | | |||||
| * | Implemented fall damage for mobs | Tiger Wang | 2014-01-25 | 2 | -6/+33 |
| | | | | | | | | | | | | + Implemented mobile fall damage * Formatting fixes + Defined new Position->Integer macros | ||||
| * | Attack() is no longer always called | Tiger Wang | 2014-01-25 | 1 | -1/+1 |
| | | |||||
| * | Mob bugfixes | Tiger Wang | 2014-01-25 | 2 | -22/+39 |
| | | | | | | | | | | | | | | | | | | | | * Mobs no longer require constant line-of-sight to a player to remain aggravated * Fixed an ASSERT * Fixed mobs jumping * Fixed Idle state not properly using AI + Added FILE_IO_PREFIX to favicon loading + Implemented #563 | ||||
| * | All mobs now drown (fixes #54) | Tiger Wang | 2014-01-25 | 2 | -0/+7 |
| | | | | | | | | | | * Implemented mob drowning * Iron Golems and squids are excluded | ||||
| * | Fixed a generator bug | Tiger Wang | 2014-01-25 | 1 | -0/+3 |
| | | |||||
| * | Zombies and skeletons use AI | Tiger Wang | 2014-01-25 | 2 | -9/+15 |
| | | |||||
| * | Miscellaneous improvements | Tiger Wang | 2014-01-24 | 2 | -18/+13 |
| | | |||||
| * | Changed a condition to IsGameMode | Tiger Wang | 2014-01-24 | 1 | -2/+1 |
| | | |||||
| * | Made wolves compatible with new AI code | Tiger Wang | 2014-01-24 | 2 | -11/+26 |
| | | |||||
| * | Monsters no longer check for direct line of sight | Tiger Wang | 2014-01-24 | 1 | -10/+2 |
| | | |||||
| * | Large reworking of mob code [SEE DESC] | Tiger Wang | 2014-01-24 | 6 | -232/+324 |
| | | | | | | | | | | | | | | + Implemented better pathfinding - Removed lots of unused variables, functions, etc. * Changed some variable types * Other miscellaneous fixes, and also completes the previous PRs | ||||
| * | Implemented creeper abilities | Tiger Wang | 2014-01-24 | 2 | -2/+50 |
| | | | | | | | | | | | | | | | | * Creepers now explode with a sound effect * Creepers drop a music disc on the unlikely event of being killed by a skeleton's arrow Inspired by @maniak89's PR #132. | ||||
* | | Fixed a failure in cSquid. | madmaxoft | 2014-01-24 | 1 | -1/+2 |
|/ | | | | Probably due to rounding errors the squid was querying out-of-chunk coords. | ||||
* | Removed obsoleted functions | Tiger Wang | 2014-01-16 | 1 | -1/+1 |
| | |||||
* | Merge branch 'fixes&features' of git://github.com/tonibm19/MCServer | madmaxoft | 2013-12-25 | 1 | -0/+6 |
|\ | |||||
| * | Some fixes (SEE DESC) | tonibm19 | 2013-12-23 | 1 | -0/+6 |
| | | | | | | | | -Added missing mobs (wither, enderdragon and iron golem) to type to string list. -Wither and iron golem can now spawn | ||||
* | | Preliminary mobile entity saving | Tiger Wang | 2013-12-25 | 1 | -1/+2 |
|/ | | | | | | | * Fixes #252 * Alleviates #380 + Adds mob saving * Fixed some debug !ASSERTs | ||||
* | Fixed bug where snowgolems could replace non-solid blocks to snow blocks. | STRWarrior | 2013-12-22 | 1 | -1/+3 |
| | |||||
* | Snow golems die in hot biomes and leave a snow trail. | STRWarrior | 2013-12-22 | 2 | -0/+18 |
| | |||||
* | EnderDragons and SnowGolems are able to spawn. | STRWarrior | 2013-12-22 | 1 | -0/+2 |
| | |||||
* | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-21 | 5 | -17/+21 |
|\ | |||||
| * | Fixed the rest of constructor reorders. | madmaxoft | 2013-12-20 | 1 | -2/+2 |
| | | |||||
| * | Sorted a few constructors to remove warnings. | madmaxoft | 2013-12-20 | 5 | -17/+21 |
| | | |||||
* | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-20 | 1 | -1/+1 |
|\| | |||||
| * | Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT). | madmaxoft | 2013-12-20 | 1 | -1/+1 |
| | | |||||
* | | moved mobs to globs | Tycho Bickerstaff | 2013-12-11 | 1 | -1/+5 |
| | | |||||
* | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-11 | 1 | -0/+6 |
|\| | |||||
| * | Fixed not getting XP from mobs. | STRWarrior | 2013-12-14 | 1 | -0/+6 |
| | | |||||
* | | more cmake | Tycho Bickerstaff | 2013-12-10 | 1 | -0/+7 |
|/ | |||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-26 | 1 | -0/+55 |
| | | | | | Conflicts: VC2008/MCServer.vcproj | ||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-24 | 1 | -2/+2 |
| | | | | | Conflicts: GNUmakefile | ||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 65 | -0/+3488 |