1
0
Commit Graph

410 Commits

Author SHA1 Message Date
Howaner
42120e2ea5 Merge branch 'master' into MobSpawner
Conflicts:
	MCServer/Plugins/Core
2014-11-18 14:56:32 +01:00
Alexander Harkness
57f822cd0e Signs can be placed on wallsigns.
Fixes #1438
2014-10-23 08:07:20 +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
283eda3c4e Merge branch 'master' into BlockFixes 2014-10-21 17:37:03 +02:00
Julian Laubstein
403f8581cf Added mechanics placeable on halfslabs 2014-10-19 15:01:01 +02:00
Mattes D
eeb580a74e Functions in cPluginManager get references instead of pointers. 2014-10-15 19:09:09 +02:00
Alexander Harkness
6af9d5ba01 Fixed compilation. 2014-10-11 18:39:46 +01:00
Howaner
a5e09155c0 Corrected drops from dead bush, tall grass and cobweb. 2014-10-07 18:21:39 +02:00
Howaner
e8e428a806 Corrected IsBlockAttachable() in BlockVine.h 2014-10-07 16:48:37 +02:00
Howaner
fec509935d Removed BlockHaybale.h from CMakeLists.txt 2014-10-07 15:39:24 +02:00
Howaner
e3a69a527d Removed unused cBlockHayBaleHandler. 2014-10-07 15:02:51 +02:00
Mattes D
db98820aa9 Merge pull request #1489 from mc-server/fixes
Improved torch handler
2014-10-04 10:02:10 +02:00
Tiger Wang
79e9de8d67 Comment suggestions 2014-10-03 21:38:23 +01:00
Masy98
1d875d0bc8 Added Daylight Sensors to the "can't push" list 2014-10-01 18:08:31 +02:00
Masy98
cc9e598803 Added missing 1.8 blocks, E_METAs and sounds 2014-10-01 17:57:53 +02:00
Tiger Wang
48c99dcd2e Improved torch handler 2014-09-30 22:00:33 +01:00
Howaner
7d3016c7ad Code improvements 2014-09-30 20:59:59 +02:00
Howaner
425df6b694 Fixed 1.8 dirt types 2014-09-30 20:31:27 +02:00
Howaner
83973520c8 Fixed iron trapdoors 2014-09-30 20:04:49 +02:00
Howaner
5111628ba5 Fixed 1.8 doors. 2014-09-30 19:49:42 +02:00
Julian Laubstein
b77480b4ef Indentation 2014-09-30 14:05:23 +02:00
Julian Laubstein
b2cf4004f8 Set right indentation 2014-09-30 12:45:44 +02:00
Julian Laubstein
d731ad37b1 actual solving of the halfslap+torch problem 2014-09-30 12:43:48 +02:00
madmaxoft
aae90c2cf0 Style fixes. 2014-09-29 21:38:11 +02:00
Alexander Harkness
bdb8d916c0 Fixed codestyle again. 2014-09-29 19:45:12 +01:00
w00tc0d3
9628733df2 BlockStone.h: fix the codestyle 2014-09-29 19:19:17 +02:00
netchip
6127c21af9 BlockStone: drop the right cobblestone on onBreak().
Signed-off-by: netchip <w00tc0d3@outlook.com>
2014-09-29 17:18:20 +02:00
Julian Laubstein
f014d8764b Update BlockTorch.h 2014-09-29 13:17:24 +02:00
Julian Laubstein
0b438b5fe8 Added torches placeable on upside-down-halfslaps 2014-09-29 13:12:50 +02:00
madmaxoft
e7de548c89 Fixed minor style issues. 2014-09-27 21:37:36 +02:00
Masy98
6dd47e783a Added default value to switch and spruce gate to fence gate handler 2014-09-27 15:11:35 +02:00
Masy98
485bac2818 Fixed convertToPickups for fence gates 2014-09-27 14:23:58 +02:00
Masy98
30f9a4d3ab Fixed convertToPickups for doors 2014-09-27 14:19:45 +02:00
Howaner
033d16babb Merge branch 'master' into MobSpawner
Conflicts:
	src/MobSpawner.h
	src/Mobs/Monster.h
2014-09-26 23:56:20 +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
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
799c96661d Fixed style 2014-09-25 15:45:39 +01:00
Tycho
9c459cbe50 Merge branch 'master' into redstoneTests
Conflicts:
	src/Mobs/Monster.h
2014-09-25 15:22:08 +01:00
Howaner
718eb227ab Implemented mob spawner. 2014-09-19 23:00:54 +02:00
madmaxoft
95af3eb526 Fixed minor style issues. 2014-09-17 23:32:14 +02: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
Tiger Wang
fdabfd77e2 Improved cBlockHandler::DropBlock 2014-09-13 22:49:27 +01:00
Howaner
d5306f265b Only drop flint or gravel, not both. 2014-09-12 19:38:00 +02:00
Howaner
fcf558173e Fixed farmland issues. 2014-09-12 19:07:20 +02:00
Masy98
5cf114da39 Added Sea Lantern drops 2014-09-12 17:01:03 +02:00
Howaner
d07ef85ee3 Spawn exp if you break a mob spawner. 2014-09-12 16:41:23 +02:00
Howaner
abcae75992 Fixed iron ore drop. 2014-09-12 14:08:56 +02:00