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

..

CMakeLists.txt

moved simulor to globs

2013-12-10 23:06:15 +00:00

DelayedFluidSimulator.cpp

Fixed issues with int vs size_t and a few other warnings

2014-03-08 08:33:38 -08:00

DelayedFluidSimulator.h

Moved source to src

2013-11-24 14:19:41 +00:00

FireSimulator.cpp

Merge pull request #738 from xdot/master

2014-03-02 16:13:43 +01:00

FireSimulator.h

converted commneted paramater names to the unused macro

2013-12-22 13:46:55 +00:00

FloodyFluidSimulator.cpp

Added some comments

2014-03-07 20:49:40 +02:00

FloodyFluidSimulator.h

Added some comments

2014-03-07 20:49:40 +02:00

FluidSimulator.cpp

Removed unused lookups

2014-02-03 12:31:18 -08:00

FluidSimulator.h

Moved source to src

2013-11-24 14:19:41 +00:00

IncrementalRedstoneSimulator.cpp

Merge remote-tracking branch 'origin/master' into awesometnt

2014-03-10 18:59:11 +00:00

IncrementalRedstoneSimulator.h

g_BlockXXX => cBlockInfo::XXX

2014-03-01 21:34:19 +02:00

NoopFluidSimulator.h

fixed warnings in World.cpp

2013-12-31 09:16:42 +01:00

NoopRedstoneSimulator.h

Renamed cRedstoneManager to cRedstoneSimulator and renamed cRedstoneSimulator to cIncrementalRedstoneSimulator (Might change later).

2014-02-07 22:59:08 +01:00

RedstoneSimulator.cpp

Renamed cRedstoneManager to cRedstoneSimulator and renamed cRedstoneSimulator to cIncrementalRedstoneSimulator (Might change later).

2014-02-07 22:59:08 +01:00

RedstoneSimulator.h

Renamed cRedstoneManager to cRedstoneSimulator and renamed cRedstoneSimulator to cIncrementalRedstoneSimulator (Might change later).

2014-02-07 22:59:08 +01:00

SandSimulator.cpp

Add Light weighted pressure plates

2014-02-20 19:07:32 +01:00

SandSimulator.h

converted commneted paramater names to the unused macro

2013-12-22 13:46:55 +00:00

Simulator.cpp

Moved source to src

2013-11-24 14:19:41 +00:00

Simulator.h

converted commneted paramater names to the unused macro

2013-12-22 13:46:55 +00:00

SimulatorManager.cpp

Moved source to src

2013-11-24 14:19:41 +00:00

SimulatorManager.h

Moved source to src

2013-11-24 14:19:41 +00:00

VanillaFluidSimulator.cpp

Fixed water/lava interaction

2014-03-07 15:42:03 +02:00

VanillaFluidSimulator.h

Implemented vanilla-like fluid simulator

2014-03-05 15:54:38 +02:00

VaporizeFluidSimulator.cpp

Moved source to src

2013-11-24 14:19:41 +00:00

VaporizeFluidSimulator.h

Moved source to src

2013-11-24 14:19:41 +00:00