1
0
Commit Graph

151 Commits

Author SHA1 Message Date
madmaxoft
58224863c0 Fixed vanilla fluid simulator.
Fixes #919.
2014-05-02 22:07:30 +02:00
archshift
e47dab84f3 Cmake generated projects for IDEs include headers in project files. 2014-04-25 09:56:15 -07:00
jfhumann
67344a3782 Merge remote-tracking branch 'origin/master' into fixes
Conflicts:
	src/Authenticator.cpp
	src/ClientHandle.cpp
	src/Entities/Minecart.cpp
	src/Protocol/Protocol17x.cpp
2014-04-18 21:44:58 +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
193dcca1e3 Removed unsupported C++11 features. 2014-04-18 09:36:11 +02:00
Tiger Wang
18c3b18a3f Compile fix? 2014-04-17 13:02:20 +01:00
Tiger Wang
2151ee997c Implemented weighted pressure plates 2014-04-17 12:11:31 +01:00
Tiger Wang
82b3d543e7 Rewrote redstone powering to use power levels 2014-04-15 13:15:56 +01:00
Tiger Wang
c3fcc5b132 cRedstoneSimulator.cpp style improvements 2014-04-08 18:49:53 +01:00
wiseoldman95
6a0c122dfb Uppercased Z
Minor, no code changed.
2014-04-08 17:59:42 +03:00
wiseoldman95
fb90afd651 Comments: Inverted Z axis.
-Comments fix, No code has been changed.
-Inverted the Z axis in the comments and changed all dependent comments accordingly.
-Added NORTH/SOUTH/EAST/WEST in addition to LEFT/RIGHT/UP/DOWN.
2014-04-08 17:55:03 +03:00
wiseoldman95
506f5def04 Added comments regarding latching and orientation
No real code was changed.
2014-04-08 17:14:23 +03:00
Alexander Harkness
4d32f41b8b Fixed the thing properly. 2014-04-08 14:48:24 +01:00
Alexander Harkness
8d251601cf Merge pull request #862 from mc-server/redstonefix
Fixed #859
2014-04-08 07:37:26 +01:00
wiseoldman95
dab01b27c6 Fixed IsOn 2014-04-07 21:04:06 +03:00
wiseoldman95
011123726b Removed stray IsLocked 2014-04-07 20:26:23 +03:00
wiseoldman95
45eb539a17 Removed unneeded spacings 2014-04-07 20:00:38 +03:00
wiseoldman95
4f8f686292 Slight cleanup
It is more efficient and readable if we do nothing unless we're not locked.
2014-04-07 19:55:17 +03:00
Alexander Harkness
57a474ba01 Fixed some more minor issues with the redstone simulator. 2014-04-07 17:37:53 +01:00
Alexander Harkness
5374730753 Improved the speed a little more. 2014-04-07 17:28:16 +01:00
Alexander Harkness
634c4d6770 Fixed the redstone simulator. 2014-04-07 17:12:06 +01:00
Tiger Wang
440b74af6c Fixed #859 2014-04-07 12:02:41 +01:00
Alexander Harkness
4082adbbad Fix some of the comments in the PR tycho just did. 2014-04-07 11:35:37 +01:00
Tycho
f5cb81eb1b Added support for redstone latching
fixes #856
2014-04-06 11:09:33 -07:00
worktycho
5260146f3c Merge pull request #838 from mc-server/lilypads
Lilypads
2014-03-30 15:17:35 +01: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
madmaxoft
1802234b4a Fixed compilation after last PR merge. 2014-03-28 16:44:12 +01:00
Howaner
9c46112486 Change SpreadSource prefix to ss 2014-03-27 23:20:28 +01:00
Howaner
3774b1be64 Add SpreadSource 2014-03-27 23:20:28 +01:00
Howaner
c4a8336e84 Add HOOK_BLOCK_SPREAD 2014-03-27 23:20:28 +01:00
Tiger Wang
b8fe024f9d Merge branch 'master' into awesometnt
Conflicts:
	src/ChunkMap.cpp
2014-03-18 20:49:08 +00:00
madmaxoft
89027cb675 Fixed double to float conversions. 2014-03-16 22:00:28 +01:00
andrew
b4bf13aa4f Unified Vector classes 2014-03-11 16:02:25 +02:00
Tiger Wang
e672988577 Merge remote-tracking branch 'origin/master' into awesometnt
Conflicts:
	src/Items/ItemLighter.h
	src/Simulator/IncrementalRedstoneSimulator.cpp
2014-03-10 18:59:11 +00:00
Alexander Harkness
411c4ddd79 Merge pull request #779 from mc-server/tntburnexplode
TNT explodes when consumed by fire
2014-03-10 18:57:12 +00:00
Tiger Wang
cc2d805238 Merge branch 'master' into awesometnt 2014-03-10 18:36:55 +00:00
Tiger Wang
b2733fad22 Fixed compile 2014-03-10 18:23:12 +00:00
Tiger Wang
0f412a0a02 Removed uneeded meta obtain 2014-03-09 21:48:18 +00:00
Tiger Wang
09c5542123 Merge pull request #768 from Howaner/BlockEntitys
Add TNT load/save
2014-03-09 21:44:32 +00:00
Tiger Wang
ff186f9735 TNT explodes when consumed by fire
Fixed FS#406
2014-03-09 01:23:55 +00:00
Tycho
307fad0f25 Fixed issues with int vs size_t and a few other warnings 2014-03-08 08:33:38 -08:00
Howaner
527f358510 Merge branch 'master' into BlockEntitys 2014-03-08 12:29:45 +01:00
Howaner
b37966fd21 Change TNT Fuse to ticks 2014-03-08 12:24:33 +01:00
andrew
d86fc1af06 Added some comments 2014-03-07 20:49:40 +02:00
andrew
8808523942 Fixed water/lava interaction 2014-03-07 15:42:03 +02:00
madmaxoft
3e80e63665 Merge remote-tracking branch 'xdot/master' 2014-03-06 13:24:28 +01:00
Tiger Wang
53231bebd6 Added extra awesomeness to TNT
+ TNT now has a chance of flinging FallingBlock entities around
* Improved TNT damage
* Improved TNT spawning visuals
* Possible fix for 'SetSwimState failure' messages in debug
2014-03-05 22:12:48 +00:00
andrew
1ea17c0a75 Implemented vanilla-like fluid simulator 2014-03-05 15:54:38 +02:00
Mattes D
71ae689eb7 Merge pull request #746 from Howaner/Slabs
Add Trapdoor Functions to cWorld and fix Trapdoor Redstone Bugs
2014-03-03 20:52:08 +01:00
Mattes D
b17d04737d Merge pull request #738 from xdot/master
Refactored global block property arrays
2014-03-02 16:13:43 +01:00