flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
9,166 Commits 1 Branch 0 Tags
ff08d3de19ade25fda42b043d3e90edd69092bef
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Mattes D f6cd03db53 APIDump: Added a missing endline to the NewlyUndocumented output file. 2015-10-11 21:25:40 +02:00
Mattes D 4a1cec01e8 Merge pull request #2537 from cuberite/NetworkSslClientTest 
Added 'net sclient' command to NetworkTest plugin.
 2015-10-11 21:23:06 +02:00
Mattes D b95d6a5b8a Added 'net sclient' command to NetworkTest plugin. 2015-10-09 18:34:32 +02:00
Mattes D afda3b0019 Added WORKING_DIRECTORY specification to git queries used in CMake. 
Fixes #2493.
 2015-10-09 11:15:40 +02:00
Mattes D c2b06b59d0 Merge pull request #2534 from cuberite/FixHTTPSServer 
Fixed a possible crash in HTTPS server.
 2015-10-08 22:03:24 +02:00
Mattes D 5bd683a86d Fixed a possible crash in HTTPS server. 2015-10-08 19:08:11 +02:00
Mattes D 5d376bae1c Merge pull request #2532 from cuberite/CheckSpaceComparisons 
StyleCheck: Check spaces around ==, <=, >=
 2015-10-08 18:46:27 +02:00
Mattes D 66e8190ca8 StyleCheck: Check spaces around ==, <=, >= 2015-10-08 17:43:26 +02:00
Mattes D 86ab236b01 Merge pull request #2533 from cuberite/LuaTLSClientCertFix 
Fixed bindings for cTCPLink:StartTLSClient().
 2015-10-08 17:42:12 +02:00
Mattes D 6c7f51a008 Fixed bindings for cTCPLink:StartTLSClient(). 
The bindings used to enforce client cert, now it's optional.
 2015-10-08 16:14:50 +02:00
Mattes D 7c6bad2192 Merge pull request #2527 from cuberite/FixPrefabHitBox 
Fix prefab hit box
 2015-10-05 22:03:35 +02:00
Mattes D 28801493a8 Updated PlainsVillage prefabs. 
Some connectors had been off by one block.
 2015-10-05 21:19:35 +02:00
Mattes D 60800655c8 Generator: Fixed missing hitbox assignment. 
This had caused village houses to generate too close to each other.
 2015-10-05 21:15:08 +02:00
Mattes D be27992a07 Merge pull request #2525 from cuberite/StreamPerf 
Improved the data structure for storing loaded chunks
 2015-10-05 18:08:45 +02:00
Mattes D 9da404ea2d Fixed a race condition between chunk loader and generator. 
When using ChunkWorx to generate multiple chunks, the server would sometimes fail an assert because it would generate a chunk even when it was successfully loaded. This was caused by chunks queued in cWorld's m_SetChunkDataQueue and thus being marked as "InQueue" although they were already loaded.

Solved by adding a new parameter to chunk coord callbacks specifying whether the operation succeeded or failed, and using that instead of the chunk presence flag to decide whether to generate or not.
 2015-10-04 14:06:37 +02:00
Mattes D d8127aa228 Merge pull request #2519 from cuberite/RemoveStyleCheckFromTravis 
Removed the BasicStyleCheck from Travis builds.
 2015-10-02 18:28:20 +02:00
Mattes D 908b72abf0 Removed the BasicStyleCheck from Travis builds. 
The check is being done on dedicated CircleCI "build" now.
 2015-10-02 17:43:31 +02:00
Mattes D c801985697 Merge pull request #2509 from cuberite/UTF16Types 
Improved typing for utf16 and removed a couple of unused methods.
 2015-10-02 17:43:00 +02:00
Mattes D 8688bb50be Merge pull request #2518 from cuberite/UpdateSQLiteCpp 
Updated the SQLiteCpp library.
 2015-10-01 13:56:44 +02:00
Mattes D 5b196efd5c Updated the SQLiteCpp library. 
The Windows builds started failing because the library was asking for a submodule that seems to have moved. The submodule wasn't needed anyway.
 2015-10-01 13:28:32 +02:00
Mattes D 87f992852d Let appveyor decide what OS to use 2015-09-29 20:53:16 +02:00
Mattes D 1c8e60f91a Added LuaState tracker and memory stats logging. 2015-09-28 21:30:31 +02:00
Mattes D 5614056640 Made Lua API check strings strictly. 
Previously nil was accepted as a string in cLuaState::CheckParamString(), now it's reported as an error.
 2015-09-28 14:53:50 +02:00
Mattes D 7d551fe9f6 Added weather intervals to world.ini settings. 2015-09-28 01:02:17 +02:00
Mattes D 24026b9eee Merge pull request #2501 from cuberite/APIDumpCheck 
Api dump check
 2015-09-27 14:23:45 +02:00
Mattes D c9f2b4e4df CI builds fail on newly undocumented API. 2015-09-27 13:57:17 +02:00
Mattes D 96879aa866 APIDump: Added an apicheck command. 
This checks the current API for undocumented functions against the current list of official undocumented functions (http://apidocs.cuberite.org/_undocumented.lua) and reports any newly found ones. To be used in CI to check against newly introduced API functions without documentation.
 2015-09-27 13:57:07 +02:00
Mattes D 0e3bb7a398 Merge pull request #2500 from cuberite/FileApiExtend 
Extended and fixed the cFile API.
 2015-09-27 00:10:50 +02:00
Mattes D ad57ce5f99 Extended and fixed the cFile API. 2015-09-26 22:54:18 +02:00
Mattes D 02f65168b1 Merge pull request #2491 from cuberite/FixLilypadPopout 
Lilypads drop when not on source water.
 2015-09-25 15:24:52 +02:00
Mattes D 741dc78547 Lilypads drop when not on source water. 
Lilypad blocks now break and drop as items when the block below them changes to non-water or non-source water.
Fixes #2404.
 2015-09-25 14:42:32 +02:00
Mattes D 7f61819971 Merge pull request #2490 from cuberite/cuberite 
Namechange to Cuberite
 2015-09-25 13:12:55 +02:00
Mattes D 82d9ac1e1c Namechange to Cuberite 2015-09-25 10:14:17 +02:00
Mattes D b6e28ad422 Merge pull request #2478 from cuberite/FixArmBuild 
Fixed flags for ARM native debug build.
 2015-09-25 09:58:21 +02:00
Mattes D 2758756caa Fixed flags for ARM native debug build. 
Also fixed indentation style to all-tabs.
 2015-09-25 07:38:51 +02:00
Mattes D 7ecace5939 Merge pull request #2487 from cuberite/sigpipe 
Ignore Sigpipe
 2015-09-19 22:12:39 +02:00
Mattes D 9b3933d641 Merge pull request #2479 from cuberite/clientPerformance 
Removed a significant performance issue.
 2015-09-19 01:21:01 +02:00
Mattes D 9871c0b073 Added CircleCI for stylechecking. 
This will allow us to remove the stylecheck from Travis builds, making them a bit faster, and having fast style checks
 2015-09-17 11:20:10 +02:00
Mattes D d041057da2 Merge pull request #2457 from cuberite/log 
Increase robustness of the logging subsystem
 2015-09-16 09:12:56 +02:00
Mattes D 991f1a209f Merge pull request #2473 from cuberite/APIDumpRename 
APIDump: Fixed ZBS integration filenames after project rename.
 2015-09-14 16:18:29 +02:00
Mattes D f8554813cf APIDump: Fixed ZBS integration filenames after project rename. 2015-09-14 11:22:50 +02:00
Mattes D d816166364 Merge pull request #2474 from Erbelding/master 
Fixed flint drop rates from 1/30 to 1/10 to match the wiki.
 2015-09-14 11:20:30 +02:00
Mattes D 76d2f85b9a Fixed Lua output folders for Windows builds. 
Fixes #2468.
 2015-09-08 09:12:02 +02:00
Mattes D 3211251b3a Added gallery web previews to ignore list. 2015-09-07 10:08:12 +02:00
Mattes D 3fb183aaf0 Fixed pack-list for buildservers. 2015-09-06 10:42:44 +02:00
Mattes D 7da79fdc19 Merge pull request #2437 from cuberite/outputChange 
Output folder change; cmake project name change
 2015-09-06 10:05:18 +02:00
Mattes D dac97826f7 Renamed output directory to Server 2015-09-05 22:01:21 +02:00
Mattes D 69a44b2fee Merge pull request #2450 from nicodinh/patch-1 
Fixed false-positive error message in cRankManager::SetRankVisuals().
 2015-08-25 10:04:25 +02:00
Mattes D dffa8a7b56 Merge pull request #2439 from cuberite/AppveyorYml 
Added Appveyor yml settings file.
 2015-08-18 08:52:41 +02:00
Mattes D 9779ab2bd6 Added Appveyor yml settings file. 2015-08-18 08:52:23 +02:00
Mattes D 5ea1b9cee1 Merge pull request #2433 from cuberite/WarningFixTrial 
Some warning fixes
 2015-08-18 08:49:39 +02:00
Mattes D d118550a5b Merge pull request #2425 from cuberite/APIDumpNameChange 
Updated APIDump to follow the namechange
 2015-08-12 08:25:29 +02:00
Mattes D 6308643669 Merge pull request #2423 from cuberite/JsonCppCheck 
Added check for JsonCpp submodule presence.
 2015-08-11 09:22:31 +02:00
Mattes D 54e36588dd Added check for JsonCpp submodule presence. 2015-08-11 08:33:59 +02:00
Mattes D 92ac33e923 Checked LeakFinder in MSVC2015, enabled support for it. 2015-08-10 13:54:19 +02:00
Mattes D db09c733ea Fixed SQLiteCpp MSVC2015 compilation. 
SQLiteCpp had a "noexcept" keyword that MSVC2015 didn't like, upgrading it makes it compile.
 2015-08-10 13:23:28 +02:00
Mattes D 6e616c7168 Merge pull request #2421 from cuberite/StackWalkerWarningIgnore 
MSVC: Ignore the deprecation warning in 3rd party StackWalker.
 2015-08-10 07:27:55 +02:00
Mattes D bfc698f0ed MSVC: Ignore the deprecation warning in 3rd party StackWalker. 2015-08-09 09:23:12 +02:00
Mattes D a985949cfe Flush log file when a warning or error message is output. 
Fixes #2419.
 2015-08-08 10:40:40 +02:00
Mattes D 6e4122e551 Unified the doxy-comment format. 2015-07-31 16:49:10 +02:00
Mattes D d2a0c85764 Chunks that fail to load are offloaded to extra files. 
Ref.: #1970
 2015-07-31 08:49:23 +02:00
Mattes D 08aa3f6ff5 Added reason parameter to load failures. 2015-07-31 08:48:23 +02:00
Mattes D 7379848ae5 Moved AString reading hack to cFile. 2015-07-31 08:48:22 +02:00
Mattes D 5dbe1e7303 Merge pull request #2376 from mjhanninen/fix-freebsd-build 
Fix FreeBSD build
 2015-07-29 15:36:57 +02:00
Mattes D e2ec59095f Merge pull request #2388 from zackp30/armv7-cmake 
Fix compilation on ARMv7. Fixes #2387.
 2015-07-29 14:59:23 +02:00
Mattes D 97beb2a350 Fixed custom recipes result clientside bug. 
Fixes #2345.
 2015-07-26 13:30:25 +02:00
Mattes D fe7bd6767f Merge pull request #2393 from jammet/patch-8 
Fixed red carpet crafting recipe.
 2015-07-26 12:06:31 +02:00
Mattes D c74d856b57 Fixed cNetworkSingleton's HasTerminated flag. 
Should fix random failures in Google-test.
 2015-07-23 16:15:21 +02:00
Mattes D 137bd1d6e8 Merge pull request #2375 from jammet/patch-8 
Corrected Pillar of Quartz and Chiseled Quartz.
 2015-07-23 10:58:09 +02:00
Mattes D a55eaba7fa Network: Fixed ServerHandle's address formatting. 2015-07-07 18:10:47 +02:00
Mattes D bebd4de144 Fixed warnings generated by 64-bit MSVC. 2015-07-07 11:50:06 +02:00
Mattes D 66a164a9a7 Added neighbor specification in the OnNeighborChanged() block callback. 
Fixes the OnNeighborChanged endless recursion with large melon / pumpkin fields.
Fixes #2213.
 2015-07-01 10:40:16 +02:00
Mattes D b0bd1e3907 APIDump: Fixed a forgotten comma. 2015-06-30 22:36:51 +02:00
Mattes D 0a24f7977b Added the Prefabs folder to the files packed by build. 2015-06-30 22:05:21 +02:00
Mattes D f6ab461383 BlockArea: Fixed a crash with areas higher than chunk height. 2015-06-30 14:08:21 +02:00
Mattes D d646c81eb7 Removed the MakeLuaAPI script. 
It has been superseded by feeding commands to the server directly via stdin.
 2015-06-30 09:52:46 +02:00
Mattes D e86f593c37 Fixed typos in the readme. 2015-06-30 08:00:10 +02:00
Mattes D fe81a0dcde Merge pull request #2239 from cuberite/PortalSize 
Added a size check for portals.
 2015-06-28 21:04:34 +02:00
Mattes D 8e1437be08 Merge pull request #2290 from bibo38/mousefix 
Fixed Middle-Click Button in the ClickWindow-Packet.
 2015-06-25 16:11:56 +02:00
Mattes D c1780366b0 Merge pull request #2288 from cuberite/melonFix 
Call Neighbour changed handlers when a melon is created
 2015-06-24 14:59:47 +02:00
Mattes D 4f8e2f180d Added a forgotten break in cHangingEntity constructor. 
This had caused loading the cHangingEntity to fail in debug builds.
 2015-06-24 13:39:11 +02:00
Mattes D 2daa9c5854 Fixed melon metadata when growing from stem. 2015-06-23 17:23:35 +02:00
Mattes D 55a5f11b1b Fixed right-click with bonemeal. 
The client would send invalid right-click events with Y set to 0x7ff, which would crash the server. Only process bonemeal for valid clicks (valid blockface).
 2015-06-23 15:23:11 +02:00
Mattes D 6cd71a1e73 Generate biomes when pregenerating heights through CompositedHeiGen. 
Fixes #2283.
 2015-06-23 14:45:35 +02:00
Mattes D d83c9f194f Merge pull request #2274 from cuberite/ItemsRemovalFix 
Refactored block placement workflow.
 2015-06-21 22:18:17 +02:00
Mattes D 3889b2cac2 Refactored block placement workflow. 
Multi-blocks can now use the default OnPlayerPlaced() callback in cItemHandler.
 2015-06-21 19:49:22 +02:00
Mattes D 4ce8bebfd8 Merge pull request #2267 from cuberite/InfoDumpFix 
Fixed InfoDump.lua when there are no commands in plugin.
 2015-06-21 16:46:18 +02:00
Mattes D e06dd8f20e Added basic support for loading village prefabs from files. 2015-06-20 15:37:41 +02:00
Mattes D cbb40c3e74 Fixed InfoDump.lua when there are no commands in plugin. 2015-06-20 10:05:13 +02:00
Mattes D 98bcf5d386 Added cubeset file format docs. 2015-06-19 16:16:03 +02:00
Mattes D 8df31067d4 Externalized cPrefabPiecePool self-test. 2015-06-19 16:15:59 +02:00
Mattes D ae16689420 PrefabPiecePool: Added loading from cubeset file. 2015-06-18 23:32:43 +02:00
Mattes D c6012a95bd LuaState: Added support for config-style usage. 
Globals and table values can be queried from the Lua state easily.
Use perfect forwarding.
 2015-06-17 17:13:45 +02:00
Mattes D 8eb6bde881 Merge pull request #2249 from cuberite/old-chunk-serializer 
Removed version 2.9 serilization
 2015-06-16 11:58:26 +02:00
Mattes D ec4bd42dd8 Updated prefabs from the Gallery server. 2015-06-13 18:14:09 +02:00
Mattes D f0ee0b8ce8 NetherPortalScanner: Fixed type conversion warnings. 2015-06-13 08:46:05 +02:00
Mattes D d390214929 SelfTests are registered and executed after logging framework init. 
Fixes #2228.
 2015-06-11 22:20:04 +02:00
Mattes D d436a71cbc Merge pull request #2162 from lkolbly/master 
Nether Portal Jumping & Creation Code
 2015-06-10 08:00:50 +02:00
Mattes D db863422b8 cBlockArea: Added CountSpecificBlocks() API function. 2015-06-08 21:52:13 +02:00
Mattes D 5ee0657c69 CMake: Added buildinfo workaround for src packs / systems without git. 2015-06-05 13:37:36 +02:00