Masy98
a01994389d
Fixed mutton name in Sheep.cpp
2014-09-11 16:24:16 +02:00
Masy98
b185e7f4e6
Fixed mutton name in ItemHandler
2014-09-11 16:11:03 +02:00
madmaxoft
1cc65b6264
Fixed style and alpha-sorting.
2014-09-03 10:29:10 +02:00
archshift
34d6f0713e
Added mutton, which sheep now drop when killed
2014-09-02 23:21:08 -07:00
archshift
d2d0ffee21
Fixed unsigned long comparison to size_t
2014-08-04 19:43:33 -07:00
Mattes D
d2744713bb
Merge pull request #1272 from Howaner/Food
...
Fixed hunger bugs, Implemented golden apple, added jump statistic, added...
2014-08-01 17:43:18 +02:00
Howaner
84462ba8b2
Fixed hunger bugs, Implemented golden apple, added jump statistic, added correct food effects.
2014-07-31 23:04:00 +02:00
Howaner
bffad50436
Fixed water from ice and removed packed ice drop.
2014-07-31 18:41:48 +02:00
madmaxoft
fd4ee20b2a
Hotfixed compilation problems.
2014-07-27 23:15:51 +02:00
Howaner
4de8f5ca29
Rename function.
2014-07-26 13:26:14 +02:00
Howaner
ba36e79bc5
Merge branch 'master' into Inventory2
...
Conflicts:
src/BlockInfo.cpp
2014-07-26 13:23:11 +02:00
Tiger Wang
3a6002de5b
Fixed block drops
...
* Fixes #1242 (the issue addressed within)
2014-07-24 21:38:25 +01:00
Howaner
396739cc0f
Fix item durability.
...
Fixes #1181
2014-07-23 16:32:09 +02:00
Tiger Wang
18a0b60c12
Merge remote-tracking branch 'origin/master' into saplingsandleaves
...
Conflicts:
src/Defines.h
2014-07-22 18:30:31 +01:00
madmaxoft
93d29555e5
Style: Normalized to no spaces before closing parenthesis.
2014-07-21 17:40:43 +02:00
madmaxoft
6be79575fd
Style: Normalized spaces after if, for and while.
2014-07-21 17:38:50 +02:00
Tiger Wang
d0e7b2f18b
Merge branch 'master' into saplingsandleaves
...
Conflicts:
src/Bindings/DeprecatedBindings.cpp
src/Blocks/BlockSapling.h
2014-07-20 12:02:23 +01:00
Tiger Wang
0f8c24e04d
Fixed issues relating to saplings and leaves
...
- Removed cBlockInfo::RequiresSpecialTool
* Fixes #1195
* Fixes #1201
2014-07-17 22:26:53 +01:00
madmaxoft
c03161f75d
Fixed tabs used for alignment.
2014-07-17 23:16:55 +02:00
madmaxoft
5e198c6730
Basic style fixes.
2014-07-17 22:50:58 +02:00
madmaxoft
2423fbf2ef
Normalized comments.
...
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.
2014-07-17 22:15:34 +02:00
archshift
40bb98510a
ItemHandler.cpp: removed redundant food and drink checks
2014-07-14 13:46:43 -07:00
archshift
e824cd09b3
Merge remote-tracking branch 'origin/master' into potions
...
Conflicts:
src/Entities/Player.cpp
src/Entities/ProjectileEntity.cpp
2014-07-09 23:28:27 -07:00
Howaner
64e6667435
Only fixes the server crash.
2014-07-01 20:34:50 +02:00
Howaner
64f6ddf1e2
Fix server-crash with non-existing items.
2014-07-01 14:47:49 +02:00
Tiger Wang
61cb08b546
Implemented tripwire(s) (hooks)
...
* Fixes #944
2014-06-28 20:44:34 +01:00
archshift
e8143de01b
Nullify deleted pointers.
2014-06-19 01:49:56 -07:00
archshift
3766ac96d7
ItemHandler: changed IsDrinkable() to take a short argument
2014-06-17 11:39:20 -07:00
archshift
2185c72c2c
Implemented drinkable potions, noeffect entity effect,
...
Clears entity effects on death
2014-06-17 11:39:20 -07:00
archshift
1eb04a48ee
Implemented milk, added documentation to Pawn.h
2014-06-17 11:39:19 -07:00
archshift
2123173202
Player: Removed food-poisoning-specific code, set duration to 30 seconds
...
http://minecraft.gamepedia.com/Hunger#Behavior
2014-06-17 11:39:19 -07:00
Howaner
d6cb6e0423
Add repair cost to cItem, add custom name to NBTChunkSerializer and fix anvil bugs.
2014-05-07 12:30:30 +02:00
Howaner
954b59d6f4
Rename CanRepairWithItem to CanRepairWithRawMaterial and rename Size() to Count()
2014-05-06 19:38:09 +02:00
Howaner
3c102870f6
Add anvil window and slot area.
2014-05-05 17:34:17 +02:00
Howaner
376dc880b3
Add armor to switch() in ItemHandler.cpp
2014-04-24 23:03:04 +02:00
Howaner
9cbb3a339f
Fix armor in survival mode.
2014-04-24 20:41:25 +02:00
jfhumann
013da806ec
Did some static analysis, fixed some bugs and optimized a lot of code
2014-04-18 21:09:44 +02:00
madmaxoft
402d85d896
Fixed Clang warnings in itemhandlers.
2014-04-04 09:56:57 +02:00
Tiger Wang
283a66bcae
Some fixes to lilypads
...
* 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
2014-03-28 22:51:30 +00:00
Mattes D
dc77cbfdc4
Merge pull request #809 from Howaner/BlockEntitys
...
More entity saving.
2014-03-16 21:43:33 +01:00
Howaner
b9fce71bf6
Add new leaves to all classes.
2014-03-16 21:38:57 +01:00
Howaner
4ec5a95a7a
Add cake
2014-03-16 20:26:13 +01:00
Howaner
ccc29c7c6c
Add fireball interact
2014-03-14 23:52:51 +01:00
andrew
070d483236
cBlockInfo now manages the respective cBlockHandler
2014-03-02 21:25:05 +02:00
madmaxoft
1826461884
Fixed multiple gcc warnings about unused params.
2014-02-28 16:26:23 +01:00
andrew
83d3a2eedf
Manual merge (Fixed conflicts)
2014-02-20 15:37:15 +02:00
Mattes D
87db4b6a90
Merge pull request #697 from Howaner/Skull
...
Add Skulls/Heads to MCServer
2014-02-19 22:12:38 +01:00
Howaner
d63ce62f3b
Rename SkullEntity to MobHeadEntity
2014-02-19 14:45:09 +01:00
Tiger Wang
a686656253
Merge branch 'master' into itemframes
...
Conflicts:
src/Entities/Entity.h
src/WorldStorage/NBTChunkSerializer.cpp
2014-02-18 22:13:44 +00:00
Tiger Wang
320cc74f0a
Implemented paintings, fixes #689
...
+ Implemented paintings
2014-02-18 00:16:03 +00:00
