1
0
Fork 0
Commit Graph

738 Commits

Author SHA1 Message Date
Tycho Bickerstaff fbb47cd2ae Merge branch 'master' into cmake 2013-12-19 17:14:52 +00:00
Tycho Bickerstaff 0e6107bfdd Merge branch 'master' into cmake 2013-12-19 16:16:35 +00:00
Tiger Wang 53ff372624 Fixed dust from being placed on nonsolids 2013-12-19 15:57:35 +00:00
Tycho Bickerstaff 3585f93fc9 added blocks and blockentities 2013-12-19 00:06:24 +00:00
Tycho Bickerstaff e627f2f98c Merge branch 'master' into cmake 2013-12-18 19:06:11 +00:00
STRWarrior ffca4f94c1 Implented Nether Wart. 2013-12-18 18:33:18 +01:00
Tycho Bickerstaff 77303b77c7 Merge branch 'master' of github.com:mc-server/MCServer into cmake 2013-12-10 23:10:50 +00:00
Tycho Bickerstaff dd633d5a94 Merge branch 'master' into cmake 2013-12-10 23:01:35 +00:00
Tycho Bickerstaff d9a429ec64 Merge branch 'master' into quickfixs 2013-12-10 23:01:24 +00:00
Tiger Wang 9987611792 Provides a possible fix for repeater timings
Not completely reliable, but at least some types of clock work.
2013-12-10 21:24:02 +00:00
Tycho Bickerstaff 973999f524 fixed unused expression warnings in blockFire 2013-12-10 19:35:05 +00:00
Tycho Bickerstaff d9ecf51f5b more cmake stuff 2013-12-10 19:30:12 +00:00
Tiger Wang 97a1147aca Improved pickups spawning speed again 2013-12-09 23:43:06 +00:00
Tiger Wang 9c1b7c8b6e Readded redstone lamp handler 2013-12-08 14:07:32 +00:00
Tiger Wang 1d554677b4 Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeatures
Conflicts:
	src/Bindings/Bindings.cpp
	src/Bindings/Bindings.h
	src/Blocks/BlockHandler.cpp
2013-12-08 14:02:45 +00:00
madmaxoft 044fd237b6 Moved bindings-related to a Bindings subfolder.
Ref.: #407
2013-12-08 12:17:54 +01:00
madmaxoft 62adb2b965 Fixed stationary water starting fires and flowing lava not. 2013-12-08 11:47:40 +01:00
Tiger Wang 405f67dac8 Fixed water starting fires 2013-12-07 22:35:01 +00:00
Tiger Wang 5bed85aba0 Fixed some new 1.7 client crash bugs
Some technical blocks were removed; trying to render them as items
caused a crash.
2013-12-07 18:03:56 +00:00
Tiger Wang 347e80bdd8 Added basic ender chests
Note that they just mirror chests now, so no per player inventory.
2013-12-07 00:18:58 +00:00
Tiger Wang b028731726 Fixed duplication glitch with QueueSetBlock
If a coordinate was queued, and then the block there was broken, it
would reappear: double items!

Also now just sets meta if previous and current blocktypes matched.
2013-12-06 22:29:15 +00:00
Tiger Wang b115f3d636 Added trapdoor cursor Y detection 2013-12-06 21:31:55 +00:00
Tiger Wang 008c515b4b Fixed trapdoors not overriding OnUse 2013-12-06 20:01:52 +00:00
Tiger Wang 77a7bfb3e5 Cleaned up torch code and added comments 2013-12-06 19:35:10 +00:00
Tiger Wang 73dd2e9bed Removed another export and inline'd stuff 2013-12-06 19:24:45 +00:00
Tiger Wang 0376b847d7 Removed exporting of a torch function 2013-12-06 19:23:27 +00:00
madmaxoft e48168aa13 Lava can spawn fire.
Settable in world.ini, lava can spawn fire to fuel blocks near it. Fix #65.
2013-12-04 19:48:42 +01:00
Mattes D 2bbe5046e9 Merge pull request #387 from mc-server/trapdoors
Trapdoors, redstone fixes, and snow
2013-11-30 07:20:27 -08:00
madmaxoft c70c2fa42f Changed cBlockHandler->OnUpdate() to use cChunk directly. 2013-11-30 15:58:27 +01:00
madmaxoft 463de118a0 Grass doesn't spread to podzol or grassless dirt blocks. 2013-11-30 13:48:22 +01:00
Tiger Wang ab382ef6b4 Fixed thin snow CanBeAt checking
Now takes into account the possibility that thin snow can be on top of
full thin snow.
2013-11-30 11:45:23 +00:00
Tiger Wang 0e0baa940a Properly fixed snow height, fixes #98 and #264 2013-11-30 00:31:21 +00:00
Tiger Wang 4741e5e794 Stairs reset meta when dropped, fixes #269
Additionally, they now have walking sounds.
2013-11-29 22:28:59 +00:00
Tiger Wang 1d69c80ad3 Implemented trapdoors, fixes #43 and #105
Also updated redstone simulator to support it
2013-11-29 22:27:08 +00:00
Tiger Wang cee5160be8 Removed unneeded CPP files
Also removed unneeded #include in BlockStems
2013-11-29 22:25:07 +00:00
Tiger Wang a6630d3239 Merged master into redstonefixes 2013-11-27 21:35:13 +00:00
Alexander Harkness c3cd436ec3 Merge remote-tracking branch 'origin/master' into foldermove2
Conflicts:
	GNUmakefile
2013-11-24 14:37:03 +00:00
Alexander Harkness 675b4aa878 Moved source to src 2013-11-24 14:19:41 +00:00