1
0
Commit Graph

268 Commits

Author SHA1 Message Date
Mattes D
83ed6a2c1b Fixed type conversion warnings. 2015-01-18 11:25:16 +01:00
Tycho
2a9664d6ca Initial convertion of a_Dt to std::chrono
also refactored cWorld::m_WorldAge and cWorld::m_TimeOfDay
2015-01-11 21:12:26 +00:00
Mattes D
3da6e4374e Fixed basic style. 2014-12-25 00:44:09 +01:00
Tiger Wang
dd1df3b6f7 Fix repeater unpowering 2014-12-18 00:22:46 +00:00
Mattes D
a7e115ee3e Merge pull request #1674 from gushromp/master
Fix for water spreading on bottom of the world
2014-12-17 14:53:41 +01:00
Ivan Đorđević
99055f644b Removed unneeded newlines 2014-12-17 11:25:59 +01:00
Tiger Wang
8d9049603b NULL -> nullptr 2014-12-16 23:18:59 +00:00
gushromp
c2d32ce31b Merge branch 'master' of https://github.com/gushromp/MCServer
Conflicts:
	src/Simulator/FloodyFluidSimulator.cpp
2014-12-16 22:58:23 +01:00
gushromp
fd325e3990 Fixed water from spreading on bottom of world 2014-12-16 22:54:39 +01:00
gushromp
6cf3aa70f1 Fixed water from spreading on bottom of world 2014-12-16 22:38:57 +01:00
Tiger Wang
4b20a61519 Merge branch 'master' into redstone 2014-12-13 12:11:01 +00:00
Mattes D
e2a04f580a BasicStyle: Added missing braces to control statements. 2014-12-05 16:59:11 +01:00
Mattes D
44644ae025 Fixed reported parentheses around comparisons. 2014-12-05 12:58:47 +01:00
Tiger Wang
de46c2bcec Improved redstone simulator
* Fixed style inconsistencies
* Used more C++11 features
* Improved speed perhaps
2014-10-29 16:02:59 +00:00
Tiger Wang
85c298d73e Cleaned up simulators 2014-10-25 21:54:00 +01:00
Mattes D
190d34e2f7 Merge pull request #1565 from mc-server/MergedIniFile
Merged ini file
2014-10-24 09:13:39 +02:00
Mattes D
449d08cb3d Merged IniFile into main MCS sources. 2014-10-23 15:15:10 +02:00
Mattes D
07bbfd5894 Fixed a crash in redstone simulator. 2014-10-23 12:51:59 +02:00
Tiger Wang
a26541a7c3 En masse NULL -> nullptr replace 2014-10-22 20:12:49 -07:00
Mattes D
eeb580a74e Functions in cPluginManager get references instead of pointers. 2014-10-15 19:09:09 +02:00
Howaner
83973520c8 Fixed iron trapdoors 2014-09-30 20:04:49 +02:00
Tycho
f6979642e6 Use factory method to construct redstone simulator data 2014-09-28 15:36:00 +01:00
madmaxoft
03791b1e63 Fixed another redstone crash. 2014-09-27 22:25:07 +02:00
madmaxoft
d1a72eb6de Wrapped clang-specific pragma into an #ifdef block.
MSVC was complaining about an unknown pragma.
2014-09-27 21:33:50 +02:00
worktycho
cc73b70211 Update IncrementalRedstoneSimulator.inc 2014-09-27 15:24:01 +01:00
worktycho
88a07bd184 Update IncrementalRedstoneSimulator.inc 2014-09-27 15:19:32 +01:00
worktycho
20101fab99 Correct method name. 2014-09-27 15:04:08 +01:00
worktycho
94a0d04d58 Set chunk data 2014-09-27 14:49:03 +01: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
4105be0bec Re-added 1.8 blocks to the redstone simulator 2014-09-26 19:44:06 +02:00
Tycho
0e141923bb Merge branch 'master' of https://github.com/mc-server/MCServer 2014-09-26 18:14:22 +01: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
ad5d0eda9c Fixed issue with casting 2014-09-26 17:00:34 +01:00
Tycho
b2f5ab9678 Merge branch 'master' into redstoneTests
Conflicts:
	src/Simulator/IncrementalRedstoneSimulator.cpp
2014-09-25 17:58:12 +01:00
madmaxoft
c6f78d516b Redstone: Fixed a crash with repeaters on a chunk border. 2014-09-25 18:36:11 +02:00
Tycho
6e7c0e33b5 Added first test to show the object can be created 2014-09-17 18:40:10 +01:00
Tycho
26a4845a99 IncrementalRedstoneSimulator now has no dependencies on cChunk 2014-09-16 20:29:31 +01:00
Tycho
b87585977f Don't include IncrementalRedsonteSimulator.inc when in SELF_TEST mode 2014-09-11 17:57:34 +01:00
Tycho
0b044e1c83 Possibly decoupled IncrementalRedstoneSimulator from the rest of the server
THis wil hopefully allow for unit testing
2014-09-11 17:48:21 +01:00
Masy98
5f2e850b0f Added blocks to the fire simulator 2014-09-11 15:48:26 +02:00
Masy98
074dcbf950 Added iron trapdoor, fence gates and doors to the redstone simulator 2014-09-10 21:07:37 +02:00
Mattes D
d0551e2e0a VanillaFluidSimulator: Fixed an invalid Y-coord query.
This was causing a spam of console messages, along with possible server crash, when liquids passed below the world: http://forum.mc-server.org/showthread.php?tid=1508&pid=15632#pid15632
2014-08-29 14:58:41 +03:00
Tycho
9272bd627c Removed dependecy of redstone simulator on NoteBlock 2014-08-05 22:54:36 +01:00
Tycho
06942871dd Refactored Redstone simulator not to depend on TNTEntity or DropSpenserENtity Directly 2014-08-05 21:48:23 +01:00
madmaxoft
7bfb0b05d0 CheckBasicStyle: multi-level indent change. 2014-08-04 13:20:29 +02:00
Howaner
bfe11024ac Added missing HOOK_BLOCK_SPREAD call. 2014-08-01 19:37:08 +02:00
archshift
4191be7ddb Removed redundant semicolons and re-added warning 2014-07-24 11:21:37 -07:00
madmaxoft
93d29555e5 Style: Normalized to no spaces before closing parenthesis. 2014-07-21 17:40:43 +02:00
madmaxoft
6be79575fd Style: Normalized spaces after if, for and while. 2014-07-21 17:38:50 +02:00