Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed hunger bugs, Implemented golden apple, added jump statistic, added correct food effects. | Howaner | 2014-07-31 | 1 | -11/+22 |
| | |||||
* | Hotfixed compilation problems. | madmaxoft | 2014-07-27 | 1 | -1/+1 |
| | |||||
* | Rename function. | Howaner | 2014-07-26 | 1 | -3/+3 |
| | |||||
* | Merge branch 'master' into Inventory2 | Howaner | 2014-07-26 | 1 | -9/+47 |
|\ | | | | | | | | | Conflicts: src/BlockInfo.cpp | ||||
| * | Fixed block drops | Tiger Wang | 2014-07-24 | 1 | -4/+43 |
| | | | | | | | | * Fixes #1242 (the issue addressed within) | ||||
| * | Merge remote-tracking branch 'origin/master' into saplingsandleaves | Tiger Wang | 2014-07-22 | 1 | -2/+2 |
| |\ | | | | | | | | | | | | | Conflicts: src/Defines.h | ||||
| * \ | Merge branch 'master' into saplingsandleaves | Tiger Wang | 2014-07-20 | 1 | -12/+12 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Bindings/DeprecatedBindings.cpp src/Blocks/BlockSapling.h | ||||
| * | | | Fixed issues relating to saplings and leaves | Tiger Wang | 2014-07-17 | 1 | -6/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | - Removed cBlockInfo::RequiresSpecialTool * Fixes #1195 * Fixes #1201 | ||||
* | | | | Fix item durability. | Howaner | 2014-07-23 | 1 | -2/+30 |
| |_|/ |/| | | | | | Fixes #1181 | ||||
* | | | 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 |
| |/ |/| | |||||
* | | Fixed tabs used for alignment. | madmaxoft | 2014-07-17 | 1 | -7/+7 |
| | | |||||
* | | Basic style fixes. | madmaxoft | 2014-07-17 | 1 | -3/+3 |
| | | |||||
* | | Normalized comments. | madmaxoft | 2014-07-17 | 1 | -2/+2 |
|/ | | | | | 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. | ||||
* | ItemHandler.cpp: removed redundant food and drink checks | archshift | 2014-07-14 | 1 | -33/+0 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into potions | archshift | 2014-07-10 | 1 | -1/+4 |
|\ | | | | | | | | | | | Conflicts: src/Entities/Player.cpp src/Entities/ProjectileEntity.cpp | ||||
| * | Only fixes the server crash. | Howaner | 2014-07-01 | 1 | -1/+1 |
| | | |||||
| * | Fix server-crash with non-existing items. | Howaner | 2014-07-01 | 1 | -1/+1 |
| | | |||||
| * | Implemented tripwire(s) (hooks) | Tiger Wang | 2014-06-28 | 1 | -0/+2 |
| | | | | | | | | * Fixes #944 | ||||
| * | Nullify deleted pointers. | archshift | 2014-06-19 | 1 | -0/+1 |
| | | |||||
* | | ItemHandler: changed IsDrinkable() to take a short argument | archshift | 2014-06-17 | 1 | -2/+2 |
| | | |||||
* | | Implemented drinkable potions, noeffect entity effect, | archshift | 2014-06-17 | 1 | -1/+5 |
| | | | | | | | | Clears entity effects on death | ||||
* | | Implemented milk, added documentation to Pawn.h | archshift | 2014-06-17 | 1 | -1/+18 |
| | | |||||
* | | Player: Removed food-poisoning-specific code, set duration to 30 seconds | archshift | 2014-06-17 | 1 | -1/+1 |
|/ | | | | http://minecraft.gamepedia.com/Hunger#Behavior | ||||
* | Add repair cost to cItem, add custom name to NBTChunkSerializer and fix anvil bugs. | Howaner | 2014-05-07 | 1 | -9/+0 |
| | |||||
* | Rename CanRepairWithItem to CanRepairWithRawMaterial and rename Size() to Count() | Howaner | 2014-05-06 | 1 | -1/+1 |
| | |||||
* | Add anvil window and slot area. | Howaner | 2014-05-05 | 1 | -0/+19 |
| | |||||
* | Add armor to switch() in ItemHandler.cpp | Howaner | 2014-04-24 | 1 | -6/+25 |
| | |||||
* | Fix armor in survival mode. | Howaner | 2014-04-24 | 1 | -0/+7 |
| | |||||
* | Did some static analysis, fixed some bugs and optimized a lot of code | jfhumann | 2014-04-18 | 1 | -1/+0 |
| | |||||
* | Fixed Clang warnings in itemhandlers. | madmaxoft | 2014-04-04 | 1 | -3/+3 |
| | |||||
* | Some fixes to lilypads | Tiger Wang | 2014-03-28 | 1 | -0/+2 |
| | | | | | | | | * Fixed placement on lava * Fixed placement on side of blocks * Fixed placement through blocks + Added washing-away of pads + Added ice as a block that fully occupies its voxel | ||||
* | Merge pull request #809 from Howaner/BlockEntitys | Mattes D | 2014-03-16 | 1 | -0/+1 |
|\ | | | | | More entity saving. | ||||
| * | Add fireball interact | Howaner | 2014-03-14 | 1 | -0/+1 |
| | | |||||
* | | Add new leaves to all classes. | Howaner | 2014-03-16 | 1 | -0/+1 |
| | | |||||
* | | Add cake | Howaner | 2014-03-16 | 1 | -0/+3 |
|/ | |||||
* | cBlockInfo now manages the respective cBlockHandler | andrew | 2014-03-02 | 1 | -1/+1 |
| | |||||
* | Fixed multiple gcc warnings about unused params. | madmaxoft | 2014-02-28 | 1 | -1/+25 |
| | |||||
* | Manual merge (Fixed conflicts) | andrew | 2014-02-20 | 1 | -2/+9 |
|\ | |||||
| * | Merge pull request #697 from Howaner/Skull | Mattes D | 2014-02-19 | 1 | -0/+2 |
| |\ | | | | | | | Add Skulls/Heads to MCServer | ||||
| | * | Rename SkullEntity to MobHeadEntity | Howaner | 2014-02-19 | 1 | -2/+2 |
| | | | |||||
| | * | Add Skulls/Heads | Howaner | 2014-02-17 | 1 | -0/+2 |
| | | | |||||
| * | | Merge branch 'master' into itemframes | Tiger Wang | 2014-02-18 | 1 | -2/+4 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Entities/Entity.h src/WorldStorage/NBTChunkSerializer.cpp | ||||
| | * | | Implemented paintings, fixes #689 | Tiger Wang | 2014-02-18 | 1 | -2/+4 |
| | |/ | | | | | | | | | | + Implemented paintings | ||||
| * / | Implemented item frames, a part of #689 | Tiger Wang | 2014-02-18 | 1 | -0/+3 |
| |/ | | | | | | | | | + Implemented Item Frames * Fixed Pitch and Yaw being wrongly flipped in the protocol (XOFT!) | ||||
* | | Map item handler; Fixed several bugs | andrew | 2014-02-17 | 1 | -0/+2 |
| | | |||||
* | | EmptyMap item handler | andrew | 2014-02-14 | 1 | -0/+2 |
|/ | |||||
* | Merge branch 'master' into playerimprovements | Tiger Wang | 2014-02-09 | 1 | -3/+3 |
|\ | | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua | ||||
| * | Improved Type safety of eBlockFace | Tycho | 2014-02-04 | 1 | -3/+3 |
| | | | | | | | | May Fix #640 | ||||
* | | Fixed #626 | Tiger Wang | 2014-02-03 | 1 | -10/+15 |
|/ | | | | * Fixed consumption of carrots and potatoes | ||||
* | Changed Signiture of OnUpdate | Tycho | 2014-02-02 | 1 | -1/+4 |
| | |||||
* | Changed pointers to references | Tycho | 2014-02-01 | 1 | -1/+1 |
| | |||||
* | Refactored GetPlacementBlockTypeMeta | Tycho | 2014-01-26 | 1 | -1/+2 |
| | |||||
* | Implented cItemFishingRodHandler. | STRWarrior | 2013-12-19 | 1 | -0/+2 |
| | |||||
* | Implented Nether Wart. | STRWarrior | 2013-12-18 | 1 | -0/+2 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-24 | 1 | -0/+2 |
| | | | | | Conflicts: GNUmakefile | ||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 1 | -0/+509 |