flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
9,421 Commits 1 Branch 0 Tags
8b851d504875906afe3b40dd87f642fd7d5a93f1
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Mattes D 749274aa43 Merge pull request #2759 from cuberite/ExplosionAPI 
Revised the explosion-related Lua API and docs.
 2015-12-18 14:32:01 +01:00
Mattes D 086c8b1834 Revised the explosion-related Lua API and docs. 
Fixes #2746.
 2015-12-18 12:40:34 +01:00
Mattes D dae27fa9ec Merge pull request #2770 from cuberite/RemoveChunkDataCollector 
Removed unused class cChunkDataCollector.
 2015-12-18 12:39:52 +01:00
Mattes D d135e49451 Removed unused class cChunkDataCollector. 2015-12-18 12:24:47 +01:00
Mattes D c8de191e4d Merge pull request #2758 from cuberite/FastNBTFix 
Fixed String Parsing crash bug
 2015-12-18 12:24:05 +01:00
Mattes D eb87214f6d Merge pull request #2755 from cuberite/coverage 
Working coverage build
 2015-12-18 12:03:29 +01:00
Mattes D a7d0abcdc1 Merge pull request #2751 from cuberite/PieceStructuresFix 
PieceStructures generator: Fixed wrong merge conflict resolution.
 2015-12-17 19:33:28 +01:00
Mattes D f060d9f9b0 PieceStructures generator: Fixed wrong merge conflict resolution. 
Also improved reporting messages.
Ref.: http://forum.mc-server.org/showthread.php?tid=2256
 2015-12-17 19:33:12 +01:00
Mattes D b8fe09901b Fixed opposite condition in OreNests finisher. 2015-12-09 08:03:33 +01:00
Mattes D ac8504a6ef Merge pull request #2706 from Gargaj/deadcreeper 
Stop creepers from exploding even if they just died
 2015-12-09 07:47:06 +01:00
Mattes D 68e575c917 Merge pull request #2713 from Gargaj/patch-2 
Tilling dirt should send block update
 2015-12-06 13:40:45 +01:00
Mattes D f9a3eb0278 Merge pull request #2704 from Gargaj/patch-1 
Fix wolf collars
 2015-12-03 16:20:48 +01:00
Mattes D ef7c6ea7e7 Merge pull request #2707 from Gargaj/rabbitstew 
Merge cItemMushroomSoupHandler into cItemFoodHandler
 2015-12-03 15:12:07 +01:00
Mattes D 03a972ec55 Use C++11 auto instead of per-platform types. 
Closes #2686.
 2015-12-03 14:39:36 +01:00
Mattes D 213419a4cc Merge pull request #2699 from SafwatHalaby/breedDocs 
Breeding documentation
 2015-12-03 13:57:58 +01:00
Mattes D 3fb3566484 Merge pull request #2422 from cuberite/PieceStructuresGen 
Added PieceStructures generator.
 2015-12-03 13:07:23 +01:00
Mattes D 3de22f5183 Changed Nether defaults to use PieceStructures. 2015-12-01 11:39:02 +01:00
Mattes D 2c3d933349 Added more details to the cubeset format documentation. 2015-12-01 10:35:08 +01:00
Mattes D b8fbba5eb9 Added PieceStructures generator. 2015-12-01 10:35:07 +01:00
Mattes D ac0a360915 Merge pull request #2693 from cuberite/NormalizeOrePocketConfigNames 
Normalized OrePockets generator config names.
 2015-11-28 16:57:41 +01:00
Mattes D 851ee6a27f Normalized OrePockets generator config names. 
All INI values use AllInitialCapsStyle, no underscores.
 2015-11-27 12:44:42 +01:00
Mattes D 326f5e04f7 OrePockets finisher is now configurable. 2015-11-25 15:06:32 +01:00
Mattes D f2a8d5c047 Added OrePockets and DirtPockets finish gens. 2015-11-25 09:22:20 +01:00
Mattes D 19d38291fb Merge pull request #2671 from SafwatHalaby/compile 
compile.sh - Automatically choose master branch
 2015-11-21 14:52:01 +01:00
Mattes D ecbb857fad Added brewing.txt to list of files packed with the windows build. 2015-11-10 16:04:48 +01:00
Mattes D 2d736a349d Merge pull request #2607 from cuberite/IgnoreLibArtefacts 
Ignore MSVC build artefacts in submodularised libraries.
 2015-11-05 12:21:15 +01:00
Mattes D 7fdfbebe05 Ignore MSVC build artefacts in submodularised libraries. 2015-11-05 11:32:00 +01:00
Mattes D 434d3eebdb Merge pull request #2606 from cuberite/MSVCWarnings 
MSVC: Reviewed warnings, disabled a useless one, re-enabled an old one.
 2015-11-05 11:31:24 +01:00
Mattes D 1abf065953 MSVC: Reviewed warnings, disabled a useless one, re-enabled an old one. 2015-11-05 11:09:37 +01:00
Mattes D 01821237e8 Merge pull request #2601 from Gargaj/patch-1 
Fix being set on fire while directly being under lava
 2015-11-04 22:49:59 +01:00
Mattes D 0946de1f3c Merge pull request #2595 from cengizIO/master 
Use an unreserved qualifier for thread local storage
 2015-11-03 10:27:39 +01:00
Mattes D 445938e01d Merge pull request #2464 from bibo38/assertfix 
Fixed failed assertation
 2015-11-03 09:20:56 +01:00
Mattes D ca705c23e8 Merge pull request #2578 from cuberite/revert-2574-pressure-plate-fix 
Revert "Pressure plate fix"
 2015-10-29 11:57:38 +01:00
Mattes D a7c75d61ce Revert "Pressure plate fix" 2015-10-29 11:43:01 +01:00
Mattes D d7d2bc0bec Merge pull request #2566 from cuberite/update_submodules 
Updated Core and ProtectionAreas
 2015-10-27 11:29:55 +01:00
Mattes D 1a2cc9e497 Merge pull request #2564 from cuberite/update_jsoncpp_no_jsoncpp 
Update Loops required for JsonCPP
 2015-10-26 07:41:07 +01:00
Mattes D 7761f7e5b8 Debuggers: Added a plugin channel test with funny chars in data. 2015-10-21 20:59:54 +02:00
Mattes D da92286da9 Fixed a crash when sending messages too early after connection. 2015-10-21 20:59:48 +02:00
Mattes D 140d31343f Merge pull request #2517 from cuberite/ReTypingOfBlocks 
ReTyped block ids
 2015-10-15 12:14:27 +02:00
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