1
0
Commit Graph

253 Commits

Author SHA1 Message Date
Mattes D
45b1d5ff78 Fixed various warnings. 2015-01-18 18:01:24 +01:00
Mattes D
19ff14752e MobHead: Fixed wither spawning. 2014-12-25 20:41:27 +01:00
Mattes D
eddbce64be MobHeads: fixed regular head placement. 2014-12-25 20:41:12 +01:00
Mattes D
9e478c6f29 Fixed door placement. 2014-12-25 01:00:51 +01:00
Mattes D
1af6210466 Fixed forgotten big flower handler. 2014-12-25 00:51:24 +01:00
Mattes D
f07784b92f Fixed redstone dust placement on upside-down slabs. 2014-12-24 19:44:15 +01:00
Mattes D
ccdf03daaf Refactored all player block placing to go through hooks.
Fixes #1618.
2014-12-24 07:20:17 +01:00
Masy98
6e8e1c6d8d Added Rabbits 2014-12-20 10:31:34 +01:00
Masy98
706b9181e6 Merge branch 'master' into entities 2014-12-18 19:32:48 +01:00
Masy98
c836b52dd1 Added Entity Guardian 2014-12-18 19:30:32 +01:00
Howaner
2a8c234f46 Fixes 2014-12-13 20:31:37 +01:00
Howaner
8e753fa590 Added cocoa pod. 2014-12-01 18:10:37 +01:00
Tiger Wang
a26541a7c3 En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Howaner
f800f3c998 Moved tall grass pickups handle. 2014-10-21 18:06:44 +02:00
Howaner
7631047bb7 Leaves are harvest-able. 2014-10-07 18:24:22 +02:00
Howaner
a5e09155c0 Corrected drops from dead bush, tall grass and cobweb. 2014-10-07 18:21:39 +02:00
Masy98
3591edd47e Fixed sorting 2014-10-01 19:26:36 +02:00
Masy98
0d2a041a69 Fixed Red Sandstone and Prismarine drops 2014-10-01 19:13:59 +02:00
Howaner
425df6b694 Fixed 1.8 dirt types 2014-09-30 20:31:27 +02:00
Mattes D
2c5b0f2378 Merge pull request #1415 from Masy98/blocks
Added 1.8 Blocks and Items
2014-09-26 22:24:45 +02:00
Masy98
9106a8c29b Moved curly brace to seperate line 2014-09-26 19:45:03 +02:00
Tycho
a3f940f47c Removed more unessicary includes 2014-09-26 18:13:19 +01:00
Masy98
2feee3b316 Merge branch 'master' into blocks
Conflicts:
	src/Items/ItemHandler.cpp
	src/Simulator/IncrementalRedstoneSimulator.cpp
2014-09-26 18:32:31 +02:00
Tycho
9c459cbe50 Merge branch 'master' into redstoneTests
Conflicts:
	src/Mobs/Monster.h
2014-09-25 15:22:08 +01:00
Tycho
045d54e0e2 Merge branch 'master' into redstoneTests
Conflicts:
	src/Blocks/ChunkInterface.h
2014-09-17 18:47:33 +01:00
Tycho
6e7c0e33b5 Added first test to show the object can be created 2014-09-17 18:40:10 +01:00
Howaner
92e7e5c615 Merge branch 'master' into 1.8-Protocol 2014-09-14 14:16:17 +02:00
Tiger Wang
fdabfd77e2 Improved cBlockHandler::DropBlock 2014-09-13 22:49:27 +01:00
Mattes D
5b63a7fe98 Merge pull request #1353 from mc-server/Effects
Added speed entity effect.
2014-09-13 17:05:59 +02:00
Howaner
69afc4dbba Merge branch 'master' into 1.8-Protocol
Conflicts:
	src/Items/ItemHoe.h
2014-09-13 01:21:43 +02:00
Howaner
96e03fc3ea Added extra mushroom handler. 2014-09-12 19:34:19 +02:00
Howaner
1223a24d3c Merge branch 'master' into Effects 2014-09-12 19:13:46 +02:00
Howaner
fcf558173e Fixed farmland issues. 2014-09-12 19:07:20 +02:00
Howaner
80b0631c43 Only place farmland if no block is upper than dirt/grass. 2014-09-12 18:21:11 +02:00
Howaner
a40eb93c33 Added hoe interact sound. 2014-09-12 18:15:49 +02:00
Masy98
7f42ba9fc1 Fixed 1.8 Item stacking and block harvesting 2014-09-12 16:48:37 +02:00
Howaner
d07ef85ee3 Spawn exp if you break a mob spawner. 2014-09-12 16:41:23 +02:00
Howaner
3f000deb3b Disabled mobspawner itemdrop. 2014-09-12 15:59:46 +02:00
Howaner
f2c5d8a761 Fixed many right click issues. 2014-09-12 13:19:33 +02:00
Masy98
d4641576c0 Added new doors in ItemDoor.h 2014-09-11 16:33:52 +02:00
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
Masy98
8c3cd18cdd Added 1.8 food to the food list 2014-09-11 15:57:36 +02:00
archshift
19067b27de In 1.8, carrots and potatoes yield one less hunger point. 2014-09-03 16:18:58 -07: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
Howaner
d3b8100a7b Merge branch 'master' into Effects 2014-09-02 20:03:42 +02:00
madmaxoft
9a4e8bf83f Merge remote-tracking branch 'Hircine/Enchantments' 2014-09-01 14:03:39 +02:00
Howaner
0fdb177208 Fixed potion removing in creative mode. 2014-08-30 12:46:26 +02:00
Tiger Wang
431b7ed0b7 Merge branch 'master' of https://github.com/mc-server/MCServer
Conflicts:
	src/Server.cpp
2014-08-29 14:56:40 +01:00