Commit Graph
8830 Commits
Author SHA1 Message Date
Alexander Harkness 4ece4a61f6 Merge pull request #2153 from mc-server/gcc5
Update SQLite
2015-06-06 13:52:58 +01:00
tycho 74e7f8fb53 Disable column metadata 2015-06-06 13:22:56 +01:00
Tiger Wang f36acb6835 Merge pull request #2179 from mc-server/ChunkQueueCollapsing
Chunk queue collapsing
2015-06-06 10:55:12 +01:00
worktycho 54c1926a3a Merge pull request #2205 from birkett/master
Daemon support on Linux
2015-06-05 22:33:49 +01:00
tycho ffbe5f6a2f Fix iterating 2015-06-05 22:31:22 +01:00
tycho 9ebbe969c8 Made the list of chunks to stream an unordered_set
This should increase performance of chunk streaming
2015-06-05 22:31:22 +01:00
tycho bfe52277b4 Rewrote ChunkSending queue for significantly improved performance 2015-06-05 22:31:21 +01:00
tycho 19c95ee564 Moved Chunk Broadcasts over to the regular queue 2015-06-05 22:31:21 +01:00
Anthony BirkettandAnthony Birkett 9dac390247 Daemon support on Linux.
Added null console log listener, avoid printf() when stdout is closed.
2015-06-05 15:47:47 +01:00
worktycho 519fd1d36d Merge pull request #2206 from mc-server/APIDumpTimeStamp
APIDump time stamp
2015-06-05 13:04:28 +01:00
Mattes D 5ee0657c69 CMake: Added buildinfo workaround for src packs / systems without git. 2015-06-05 13:37:36 +02:00
Alexander Harkness 19491f8354 Merge pull request #2207 from mc-server/LineBlockTracerFix
Fixed overshoot in cLineBlockTracer.
2015-06-05 11:03:19 +01:00
Mattes D 1ec9665118 Fixed overshoot in cLineBlockTracer.
Fixes #2161.
2015-06-05 11:29:54 +02:00
Mattes D 99b182b4be Added Build info to the cRoot API. 2015-06-05 10:34:13 +02:00
Mattes D 649921f4a8 Provide some BuildInfo even for non-CI builds.
Ref.: #2204
2015-06-05 10:19:58 +02:00
Mattes D 5267285529 Merge pull request #2069 from HaoTNN/master
Fixes lit furnace issue in #2051
2015-06-05 10:12:10 +02:00
Mattes D 620a714196 Debuggers: Added a LineBlockTracer console test command.
Ref.: #2161
2015-06-04 22:22:43 +02:00
worktycho c9ad1ecd3e Merge pull request #2203 from jan64/master
Change SendChatType behavior for < 1.8 clients, update docs
2015-06-04 11:28:43 +01:00
Mattes D f645673bae APIDump: Added timestamp to all generated HTML pages.
Ref.: #2204
2015-06-04 12:23:38 +02:00
worktycho c124a4495a Merge pull request #2188 from cengizIO/master
Skip unknown cflag for Apple clang & remove cSemaphore
2015-06-04 11:21:21 +01:00
Cengiz Can c967698b2d Skip unknown cflag for Apple clang & remove cSemaphore 2015-06-04 11:48:56 +03:00
jan64 82adb0854e Added SendSystemMessage / SendAboveActionBarMessage to the docs
Updated parameters passed to HOOK_KILLING
2015-06-03 18:11:21 +02:00
jan64 fd964200b2 Changed SendAboveActionBarMessage / SendSystemMessage to be a noop for < 1.8 clients 2015-06-03 18:11:12 +02:00
Mattes D d871c47505 Merge pull request #2202 from mc-server/CmakeCleanup
Cmake cleanup
2015-06-03 12:20:34 +02:00
HaoTNN 6f1a3cb6dd Merge remote-tracking branch 'upstream/master' 2015-06-03 02:57:07 -07:00
HaoTNN e82cd6e4eb Fixes multiple furnace issues, including from loading world storage 2015-06-03 02:19:22 -07:00
Mattes D ec4bbe4cc7 CMake: Removed unused legacy LibEvent target. 2015-06-03 10:42:31 +02:00
Mattes D df426abdc5 CMake: Put projects into solution folders in MSVC. 2015-06-03 10:40:01 +02:00
Mattes D 1f2c9b226c Merge pull request #2199 from jan64/master
Added system and above action bar chat messages
2015-06-03 09:49:28 +02:00
Mattes D 9c0bb6132e Merge pull request #2190 from mc-server/CrashDumpArgs
Added cmdline params for crashdump detailness.
2015-06-03 08:26:27 +02:00
HaoTNN 3142598dee Merge branch 'master' of https://github.com/mc-server/MCServer 2015-06-02 16:08:57 -07:00
jan64 d37e0eb72b Added system and above action bar chat messages 2015-06-02 19:59:46 +02:00
Mattes D a0a8e78c0d Added cmdline params for crashdump detailness.
Win32-only, also fixed the call scripts.
Fixes #2184.
2015-06-02 15:19:13 +02:00
Mattes D a42daecd0b Merge pull request #2182 from birkett/master
Use the new style command line parameters for Windows Service support.
2015-06-02 15:05:05 +02:00
Mattes D 94dc3e19fe Merge pull request #2189 from mc-server/MSVCWarningFixes
Fixed warnings in MSVC.
2015-06-02 14:50:31 +02:00
Mattes D 48c153bf53 Fixed warnings in MSVC.
It complained about undefined return values or using uninitialized variables.
2015-06-02 12:51:43 +02:00
Anthony Birkett 65a62601dc Use the new style command line parameters for Windows Service support.
Ignore invalid or malformed command line parameters, prevent unhandled exceptions.
NOTE: Users will need to reinstall the service, now uses "-d" instead of "/service" in the start parameters.
2015-06-01 14:41:06 +01:00
Mattes D a54fa15bc6 Merge pull request #2172 from mc-server/LightingCallbacks
Made cLightingThread own its callbacks
2015-06-01 15:02:42 +02:00
Alexander Harkness 150be79443 Merge pull request #2178 from jammet/patch-7
Fix Daylightsensor recipe
2015-06-01 07:31:16 +01:00
jammet ff55294583 Update crafting.txt 2015-05-31 23:41:00 +02:00
Mattes D 4f086b37d2 Merge pull request #2180 from mc-server/CraftingFix
Fixed crafting recipe matching.
2015-05-31 22:16:34 +02:00
Mattes D 25e83bc1d9 Fixed crafting recipe matching.
Fixes #2096.
2015-05-31 21:21:57 +02:00
Mattes D 98df75d5ab ManualBindings: Fixed DoWithXYZ and ForEachInChunk signatures.
Fixes forum report http://forum.mc-server.org/showthread.php?tid=1993
2015-05-31 19:44:08 +02:00
jammet 80bf058c90 Fix Daylightsensor recipe
Something like Woodslap^-1 didn't work here, so I split it up into individual recipes.
2015-05-31 18:54:49 +02:00
Alexander Harkness ddb173b289 Merge pull request #2173 from mc-server/CleanCmake
Moved shared cmake flags to the CMAKE_C_FLAGS var
2015-05-30 14:07:18 +01:00
tycho 9b798ff9dd Merge branch 'master' of github.com:mc-server/MCServer 2015-05-30 13:34:08 +01:00
tycho d5c89eceb8 Moved shared cmake flags to the CMAKE_C_FLAGS var 2015-05-30 13:32:22 +01:00
Alexander Harkness 4504ec7a67 Updated MagicCarpet submodule. Fixes #2155 2015-05-30 13:06:46 +01:00
tycho bca13d9187 Fixed minor cast warning 2015-05-30 12:31:05 +01:00
Alexander Harkness 28bab37425 Fixed wrong indent. 2015-05-30 11:22:49 +01:00