1
0
Commit Graph

3606 Commits

Author SHA1 Message Date
STRWarrior
12bd5082b8 Added a HOOK_WORLD_STARTED hook and a cRoot::CreateAndInitializeWorld function for plugins. 2013-12-11 12:39:13 +01:00
Mattes D
858b03deb4 Merge pull request #416 from mc-server/repeaterfix
Provides a possible fix for repeater timings
2013-12-10 22:36:31 -08:00
Tycho Bickerstaff
5155aa4096 added zlib 2013-12-10 23:27:35 +00:00
Tycho Bickerstaff
d59e4e6a45 moved generating to globs 2013-12-10 23:22:34 +00:00
Tycho Bickerstaff
0925ead688 added UI folder 2013-12-10 23:20:39 +00:00
Tycho Bickerstaff
d5866a0978 moved Worldstorage to globs 2013-12-10 23:18:26 +00: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
822a92a9b6 moved entities to globs 2013-12-10 23:09:16 +00:00
Tycho Bickerstaff
ec5af4cffe moved mobs to globs 2013-12-10 23:07:30 +00:00
Tycho Bickerstaff
948fb78fa1 moved simulor to globs 2013-12-10 23:06:15 +00:00
Tycho Bickerstaff
40defa9d2d removed leakfinder form build 2013-12-10 23:04:38 +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
Tycho Bickerstaff
712f7d5a23 added tolua++ command and removed stackwalker from build 2013-12-10 22:59:53 +00:00
Tycho Bickerstaff
daccfd9c6e more cmake changes 2013-12-10 22:43:21 +00:00
Tycho Bickerstaff
572d48be52 removed more accedentailly commited object files 2013-12-10 21:47:23 +00:00
Tycho Bickerstaff
4300d0866d removed accedentailly commited object files 2013-12-10 21:44:11 +00:00
Tycho Bickerstaff
6cdc990884 more cmake 2013-12-10 21:39:20 +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
Mattes D
60ca21b598 Merge pull request #414 from worktycho/abortondeadlock
add abort call to deadlock detection code
2013-12-10 12:55:57 -08: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
Tycho Bickerstaff
c217ab5168 fixed comparison of thread handle to Null point rather than null handle 2013-12-10 18:43:54 +00:00
Tycho Bickerstaff
b91cfb8765 started work on cmake 2013-12-10 18:41:43 +00:00
Tycho Bickerstaff
bdb17a7e65 added cmake ignores to gitignore 2013-12-10 18:40:22 +00:00
Tycho Bickerstaff
7135bdf591 added abort to DeadlockDetector to generate core dumps on failure 2013-12-10 16:59:45 +00:00
Tycho Bickerstaff
5d2311bcff Merge remote-tracking branch 'upstream/master' 2013-12-10 16:53:46 +00:00
Mattes D
9cfd8f6910 Merge pull request #412 from mc-server/fixes
Main feature: repeater delays!
2013-12-10 06:19:38 -08:00
Alexander Harkness
4fcc806fb9 update d the contrib file. 2013-12-10 14:17:24 +00:00
Tiger Wang
e2e8c9624c Readded initial line 2013-12-10 10:31:42 +00:00
Tiger Wang
b6e0234985 Fixed compile (alas, no more goto) 2013-12-10 10:29:36 +00:00
Tiger Wang
bc8d926398 Reverted APIDump changes
They were wrong!
2013-12-10 00:33:48 +00:00
Tiger Wang
0905369fc7 Fixed Floody lava to stone fizzle 2013-12-10 00:29:59 +00:00
Tiger Wang
1dec73be0b Added repeater delays
They DO sometimes get stuck though :P
2013-12-10 00:21:24 +00:00
Tiger Wang
ebad87d870 Slight redstone wire performance improvement 2013-12-09 23:48:06 +00:00
Tiger Wang
aecdfebf36 Changed more FastSetBlocks to SetBlocks
Fixes duplication bugs.
2013-12-09 23:43:26 +00:00
Tiger Wang
97a1147aca Improved pickups spawning speed again 2013-12-09 23:43:06 +00:00
Mattes D
567354b3ca Merge pull request #410 from worktycho/master
Micelanious fixes for various warnings
2013-12-09 12:16:57 -08:00
Tiger Wang
303e086e73 Fixed VS013 compile 2013-12-09 17:58:44 +00:00
madmaxoft
3712ee7b11 Fixed angle normalization typo. 2013-12-08 18:54:04 +01:00
madmaxoft
4608beb3c6 Fixed tolua++ compilation.
Duplicate files, wrong includes, const-incorrect code...
2013-12-08 18:24:56 +01:00
madmaxoft
fd68095acc Fixed VS2008 compilation after those huge changes. 2013-12-08 18:13:30 +01:00
Mattes D
ac6b4cda7c Merge pull request #408 from mc-server/SpawnPoint_Fix
Now spawn points will not be in deep oceans or rivers etc.
2013-12-08 09:07:49 -08:00
Mattes D
6f23d2ec94 Merge pull request #404 from mc-server/fixesnfeatures
Fixes n' features
2013-12-08 09:07:34 -08:00
madmaxoft
906fd50343 Removed unused ToLua files.
Those were used to compile the tolua executable and were getting in the way - Unix makefile tried to compile them into MCS.
2013-12-08 18:05:49 +01:00
STRWarrior
d85ea4f654 Now spawn points will not be in deep oceans or rivers etc. 2013-12-08 17:05:51 +01:00
Tiger Wang
166f07029d Fixed binding generation and VS2013 compile 2013-12-08 14:45:24 +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
Tiger Wang
f64dd786aa Fixed tabcompletion packet, fixes #356 2013-12-08 13:37:10 +00:00