flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
4,227 Commits 1 Branch 0 Tags
2acf218700a6ae6d5cb441d1e4138b98519f6dfe
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
worktycho 7ad4a86c49 Added additional parenthasies 2014-02-10 18:06:49 +00:00
worktycho 23f69bc093 Fixed stupid mistax in conditional 
boats can't be placed if the face is not block_face_none and not block_face_YM, not if it is only not one.
 2014-02-10 17:59:17 +00:00
worktycho 374fecf61f Change Output to stderr 2014-02-05 20:13:37 +00:00
worktycho 8e19ea4744 Updated GETTING-STARTED.md to remove completed issues 2014-01-14 14:02:26 +00:00
Tycho Bickerstaff 6f3c5b806e implement xsofts recommendations 2014-01-03 11:22:01 +00:00
Tycho Bickerstaff ea6f94f6cb Merge branch 'master' into threadsafequeue 2014-01-02 17:49:55 +00:00
Tycho Bickerstaff d522619ce2 added documentation 2014-01-02 17:43:57 +00:00
Tycho Bickerstaff bbdb34252e fixed a few remaining issues with worldstorage 2014-01-02 17:37:34 +00:00
Tycho Bickerstaff 7076f8e73a fixed compiler warnings not being enabled in clang 2014-01-02 17:11:40 +00:00
Tycho Bickerstaff 042b72bc17 rewrote queue not to use promises for waits 2014-01-02 12:32:55 +00:00
Tycho Bickerstaff 7694a0788c Merge branch 'master' into threadsafequeue 
Conflicts:
	src/OSSupport/Queue.h
 2013-12-31 16:32:08 +00:00
Tycho Bickerstaff c52a46a5e3 merged changes from upstream 2013-12-31 16:24:53 +00:00
Tycho Bickerstaff 098ed91a48 fogot to add promise classes 2013-12-31 16:13:13 +00:00
Tycho Bickerstaff 512d1b9ebe clean up code for patching 2013-12-31 15:58:21 +00:00
Tycho Bickerstaff 18fb814c34 Merge branch 'master' into threadsafequeue 2013-12-31 15:53:17 +00:00
Tycho Bickerstaff 173ed0e653 Merge branch 'master' into cmake-fixes 2013-12-31 15:52:51 +00:00
Tycho Bickerstaff f3736b1eb7 refactored chunk Queue to seperate class 2013-12-31 15:48:57 +00:00
Tycho Bickerstaff c3e34ee81a removed unneccisary cast 2013-12-31 09:16:44 +01:00
Tycho Bickerstaff 1957f982bc fixed warnings in LineBlockTracer.cpp 2013-12-31 09:16:44 +01:00
Tycho Bickerstaff 8e7e990cfe fixed warnings in LightingThread.cpp 2013-12-31 09:16:43 +01:00
Tycho Bickerstaff 3da41de553 take Z axis into account when calculating neighboors in LightingThread::ChunkReady 2013-12-31 09:16:43 +01:00
Tycho Bickerstaff 2e1588820d fixed warnings in World.cpp 2013-12-31 09:16:42 +01:00
Tycho Bickerstaff 2e113c63f9 fixxed warnings in Server.cpp 2013-12-31 09:16:42 +01:00
Tycho Bickerstaff 3152c72959 fixed warnings in Inventory.cpp 2013-12-31 09:16:42 +01:00
Tycho Bickerstaff c83dfdb66e fixed warnings in bytebuffer.cpp 2013-12-31 09:16:41 +01:00
Tycho Bickerstaff e41dec458c fixed ClientHandle warnings 2013-12-31 09:16:41 +01:00
Tycho Bickerstaff 9ebc623a0a fixed warnings in webadmin.cpp 2013-12-31 09:16:41 +01:00
Tycho Bickerstaff 25d42c44d5 fixed warnings in BlockArea.cpp 2013-12-31 09:16:40 +01:00
Tycho Bickerstaff d0cd9a2b36 added link dependency between WorldStorage and OSSupport 2013-12-22 22:52:21 +00:00
Tycho Bickerstaff 75abce905d fixed bad merge 2013-12-22 16:33:40 +00:00
Tycho Bickerstaff 1f938b721b added mergetool files to gitignore 2013-12-22 16:27:20 +00:00
Tycho Bickerstaff 10e5540f98 merged in more warning fixes 2013-12-22 16:25:02 +00:00
Tycho Bickerstaff a295e0c342 merged in changes 2013-12-22 16:22:25 +00:00
Tycho Bickerstaff 09b9661fff Merge branch 'master' into threadsafequeue 2013-12-22 16:14:34 +00:00
Tycho Bickerstaff 15a980a616 merged in warnings changes 2013-12-22 16:11:34 +00:00
Tycho Bickerstaff d2ed9d9fc4 removed lua makefile 2013-12-22 15:57:56 +00:00
Tycho Bickerstaff a7a4b2886d fixed accedental commit 2013-12-22 15:55:57 +00:00
Tycho Bickerstaff a71299c46b fixed rdynamic as its not acctually needed a cmake handles it, looks like the problem was caused by the linux linker accepting the option twice and the os x linker not 2013-12-22 15:41:01 +00:00
Tycho Bickerstaff 1a9d93665f Merge remote-tracking branch 'upstream/master' into threadsafequeue 2013-12-22 15:21:34 +00:00
Tycho Bickerstaff 6d7b6ae9ca fixes for mac os x 2013-12-22 15:17:36 +00:00
Tycho Bickerstaff d724241407 converted commneted paramater names to the unused macro 2013-12-22 13:46:55 +00:00
Tycho Bickerstaff 94ca07cfbf Merge branch 'master' of github.com:mc-server/MCServer 2013-12-22 13:19:27 +00:00
worktycho d8b4bf8a70 Update COMPILING 
fixed acouple of issues
 2013-12-21 16:00:47 +00:00
Tycho Bickerstaff b3046a09e5 Chunk is now warnings clean 2013-12-21 15:58:21 +00:00
Tycho Bickerstaff 3289abde73 fixed hidden bug with furnaces ignoring time burnt 
this patch fixes an issue with furnaces where they would ignore the time burnt in setBurnTimes
this did not cause a problem as this function was only called with the same value as the one
it was using for time burnt
 2013-12-21 15:49:59 +00:00
Tycho Bickerstaff 9f41761e8e Root is now warnings clean 2013-12-21 15:38:37 +00:00
Tycho Bickerstaff 5034ae29b8 Piston is now warnings clean 2013-12-21 15:08:01 +00:00
Tycho Bickerstaff 38f808ac3d ChunkSender is now warnings clean 2013-12-21 15:00:31 +00:00
Tycho Bickerstaff 14d2085e35 basic threadsafe queue interface 2013-12-21 14:43:32 +00:00
Tycho Bickerstaff c99e841e24 added FORCE_32 option 2013-12-21 14:18:22 +00:00
Tycho Bickerstaff b9516c1208 hide lua shared library 2013-12-21 14:12:50 +00:00
Tycho Bickerstaff 650a1483b8 fixed lua dynamic library 2013-12-21 13:50:32 +00:00
Tycho Bickerstaff 869104de34 finished up final build flags for linux 2013-12-21 13:45:27 +00:00
Tycho Bickerstaff b4fb8ace03 Merge branch 'cmake' of github.com:worktycho/MCServer into cmake 2013-12-21 13:33:09 +00:00
Tycho Bickerstaff 779aca6051 Merge branch 'master' into cmake 2013-12-21 13:32:40 +00:00
Tycho Bickerstaff 66d643f407 Merge branch 'master', remote-tracking branch 'upstream/master' 2013-12-21 13:32:27 +00:00
Tycho Bickerstaff 32e6be002d Merge branch 'master' into cmake 2013-12-20 15:33:04 +00:00
Tycho Bickerstaff 18b99c7eff made LUA shared unless STATIC_LUA is set 2013-12-20 15:29:34 +00:00
Tycho Bickerstaff be77ecf19d fixed lua dependency on libm 2013-12-20 15:24:55 +00:00
Tycho Bickerstaff 826e280db9 added profile builds as an option 2013-12-20 14:27:26 +00:00
Tycho Bickerstaff fda983fcb4 possable fix of typo 2013-12-20 14:03:40 +00:00
Tycho Bickerstaff bc2d23550c Revert "fixed bad reference to math library" 
This reverts commit 0836e5e660.
 2013-12-20 13:51:33 +00:00
Tycho Bickerstaff efaabb16df Revert "fixed bad reference to math library" 
This reverts commit c2167d7ed7.
 2013-12-20 13:50:41 +00:00
Tycho Bickerstaff c2167d7ed7 fixed bad reference to math library 2013-12-20 13:27:38 +00:00
Tycho Bickerstaff 0836e5e660 fixed bad reference to math library 2013-12-20 13:21:58 +00:00
Tycho Bickerstaff cb9f30d4ee Merge branch 'cmake' of github.com:worktycho/MCServer into cmake 2013-12-19 17:21:29 +00:00
Tycho Bickerstaff 163fe32a6d modified travis CI file for cmake 2013-12-19 17:21:06 +00:00
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
Tycho Bickerstaff 95c7407dd3 added md5 as a dependency for bindings 2013-12-19 00:55:01 +00:00
Tycho Bickerstaff e2549dfcb2 added expat as lua bindings dependincy 2013-12-19 00:52:52 +00:00
Tycho Bickerstaff aa53fe6761 compiling sqlite 2013-12-19 00:28:48 +00:00
Tycho Bickerstaff afa259e530 added all cpp files to bindings 2013-12-19 00:24:47 +00:00
Tycho Bickerstaff d2f29cb866 moved HTTPServer to globs 2013-12-19 00:16:44 +00:00
Tycho Bickerstaff e02fbd37ab added pthread linking code to OSSupport 2013-12-19 00:15:30 +00:00
Tycho Bickerstaff 0a96bf1c03 moved protocol to glob 2013-12-19 00:11:04 +00:00
Tycho Bickerstaff 3585f93fc9 added blocks and blockentities 2013-12-19 00:06:24 +00:00
Tycho Bickerstaff 9515ece2bd linked in lua 2013-12-19 00:02:15 +00:00
Tycho Bickerstaff cdca5a3eac Merge branch 'master' into cmake 2013-12-19 00:00:14 +00:00
Tycho Bickerstaff 7dd1561a88 fixed bindings generation 2013-12-18 23:59:07 +00:00
Tycho Bickerstaff 1149ab216c Revert "Removed unused ToLua files." to allow the new cmake system to build on tolua++ on linux 
This reverts commit 906fd50343.
 2013-12-18 23:14:31 +00:00
Tycho Bickerstaff 0dbd55614b bindings regenration logic 2013-12-18 23:14:11 +00:00
Tycho Bickerstaff 95ebc37faa added zlib and UI 2013-12-18 19:10:47 +00:00
Tycho Bickerstaff 93d14b0af9 removed make file 2013-12-18 19:09:24 +00:00
Tycho Bickerstaff e627f2f98c Merge branch 'master' into cmake 2013-12-18 19:06:11 +00: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