summaryrefslogtreecommitdiffstats
path: root/src/Items/ItemHandler.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Hotfixed compilation problems.madmaxoft2014-07-271-1/+1
|
* Rename function.Howaner2014-07-261-3/+3
|
* Merge branch 'master' into Inventory2Howaner2014-07-261-9/+47
|\ | | | | | | | | Conflicts: src/BlockInfo.cpp
| * Fixed block dropsTiger Wang2014-07-241-4/+43
| | | | | | | | * Fixes #1242 (the issue addressed within)
| * Merge remote-tracking branch 'origin/master' into saplingsandleavesTiger Wang2014-07-221-2/+2
| |\ | | | | | | | | | | | | Conflicts: src/Defines.h
| * \ Merge branch 'master' into saplingsandleavesTiger Wang2014-07-201-12/+12
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/Bindings/DeprecatedBindings.cpp src/Blocks/BlockSapling.h
| * | | Fixed issues relating to saplings and leavesTiger Wang2014-07-171-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | - Removed cBlockInfo::RequiresSpecialTool * Fixes #1195 * Fixes #1201
* | | | Fix item durability.Howaner2014-07-231-2/+30
| |_|/ |/| | | | | Fixes #1181
* | | 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
| |/ |/|
* | Fixed tabs used for alignment.madmaxoft2014-07-171-7/+7
| |
* | Basic style fixes.madmaxoft2014-07-171-3/+3
| |
* | Normalized comments.madmaxoft2014-07-171-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 checksarchshift2014-07-141-33/+0
|
* Merge remote-tracking branch 'origin/master' into potionsarchshift2014-07-101-1/+4
|\ | | | | | | | | | | Conflicts: src/Entities/Player.cpp src/Entities/ProjectileEntity.cpp
| * Only fixes the server crash.Howaner2014-07-011-1/+1
| |
| * Fix server-crash with non-existing items.Howaner2014-07-011-1/+1
| |
| * Implemented tripwire(s) (hooks)Tiger Wang2014-06-281-0/+2
| | | | | | | | * Fixes #944
| * Nullify deleted pointers.archshift2014-06-191-0/+1
| |
* | ItemHandler: changed IsDrinkable() to take a short argumentarchshift2014-06-171-2/+2
| |
* | Implemented drinkable potions, noeffect entity effect,archshift2014-06-171-1/+5
| | | | | | | | Clears entity effects on death
* | Implemented milk, added documentation to Pawn.harchshift2014-06-171-1/+18
| |
* | Player: Removed food-poisoning-specific code, set duration to 30 secondsarchshift2014-06-171-1/+1
|/ | | | http://minecraft.gamepedia.com/Hunger#Behavior
* Add repair cost to cItem, add custom name to NBTChunkSerializer and fix anvil bugs.Howaner2014-05-071-9/+0
|
* Rename CanRepairWithItem to CanRepairWithRawMaterial and rename Size() to Count()Howaner2014-05-061-1/+1
|
* Add anvil window and slot area.Howaner2014-05-051-0/+19
|
* Add armor to switch() in ItemHandler.cppHowaner2014-04-241-6/+25
|
* Fix armor in survival mode.Howaner2014-04-241-0/+7
|
* Did some static analysis, fixed some bugs and optimized a lot of codejfhumann2014-04-181-1/+0
|
* Fixed Clang warnings in itemhandlers.madmaxoft2014-04-041-3/+3
|
* Some fixes to lilypadsTiger Wang2014-03-281-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/BlockEntitysMattes D2014-03-161-0/+1
|\ | | | | More entity saving.
| * Add fireball interactHowaner2014-03-141-0/+1
| |
* | Add new leaves to all classes.Howaner2014-03-161-0/+1
| |
* | Add cakeHowaner2014-03-161-0/+3
|/
* cBlockInfo now manages the respective cBlockHandlerandrew2014-03-021-1/+1
|
* Fixed multiple gcc warnings about unused params.madmaxoft2014-02-281-1/+25
|
* Manual merge (Fixed conflicts)andrew2014-02-201-2/+9
|\
| * Merge pull request #697 from Howaner/SkullMattes D2014-02-191-0/+2
| |\ | | | | | | Add Skulls/Heads to MCServer
| | * Rename SkullEntity to MobHeadEntityHowaner2014-02-191-2/+2
| | |
| | * Add Skulls/HeadsHowaner2014-02-171-0/+2
| | |
| * | Merge branch 'master' into itemframesTiger Wang2014-02-181-2/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/Entities/Entity.h src/WorldStorage/NBTChunkSerializer.cpp
| | * | Implemented paintings, fixes #689Tiger Wang2014-02-181-2/+4
| | |/ | | | | | | | | | + Implemented paintings
| * / Implemented item frames, a part of #689Tiger Wang2014-02-181-0/+3
| |/ | | | | | | | | + Implemented Item Frames * Fixed Pitch and Yaw being wrongly flipped in the protocol (XOFT!)
* | Map item handler; Fixed several bugsandrew2014-02-171-0/+2
| |
* | EmptyMap item handlerandrew2014-02-141-0/+2
|/
* Merge branch 'master' into playerimprovementsTiger Wang2014-02-091-3/+3
|\ | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua
| * Improved Type safety of eBlockFaceTycho2014-02-041-3/+3
| | | | | | | | May Fix #640
* | Fixed #626Tiger Wang2014-02-031-10/+15
|/ | | | * Fixed consumption of carrots and potatoes
* Changed Signiture of OnUpdateTycho2014-02-021-1/+4
|
* Changed pointers to referencesTycho2014-02-011-1/+1
|
* Refactored GetPlacementBlockTypeMetaTycho2014-01-261-1/+2
|
* Implented cItemFishingRodHandler.STRWarrior2013-12-191-0/+2
|
* Implented Nether Wart.STRWarrior2013-12-181-0/+2
|
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-241-0/+2
| | | | | Conflicts: GNUmakefile
* Moved source to srcAlexander Harkness2013-11-241-0/+509
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 13:45:13 +0100