flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
9,197 Commits 1 Branch 0 Tags 92 MiB
b4f464976a
Commit Graph

9197 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
worktycho
0786fda18b Merge pull request #2522 from cuberite/FixLoaderGenRaceCondition 
Fixed a race condition between chunk loader and generator.
 2015-10-04 14:55:42 +01: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
tycho
e1d5e5e165 Improved types of utf 16 strings 2015-10-02 17:26:53 +02:00
tycho
899955f9e3 Remove a pair of unused broken functions 2015-10-02 17:26:53 +02:00
worktycho
9889664ffa Merge pull request #2511 from cuberite/BottomLayerSpawn 
The bottom layer cannot hold a valid spawn point
 2015-10-01 15:23:49 +01:00
worktycho
dacab890cc The bottom layer cannot hold a valid spawn point 
Fixes #2510
 2015-10-01 14:49:26 +01: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
Julian Laubstein
baca82cce7 Merge pull request #2515 from Seadragon91/compiling_file 
Update COMPILING.md
 2015-10-01 10:16:08 +02:00
Lukas Pioch
811e76ddf1 Updated COMPILING.md 2015-10-01 10:04:18 +02:00
worktycho
b035a7fd95 Merge pull request #2512 from cuberite/AppveyorFix 
Let appveyor decide what OS to use
 2015-09-29 20:08:15 +01:00
Mattes D
87f992852d Let appveyor decide what OS to use 2015-09-29 20:53:16 +02:00
worktycho
c76a89fbec Merge pull request #2508 from cuberite/LogLuaMemoryStats 
Added LuaState tracker and memory stats logging.
 2015-09-29 13:32:30 +01:00
Mattes D
1c8e60f91a Added LuaState tracker and memory stats logging. 2015-09-28 21:30:31 +02:00
worktycho
a59800ca0c Merge pull request #2507 from cuberite/LuaStrictStrings 
Made Lua API check strings strictly.
 2015-09-28 14:15:06 +01: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
Tiger Wang
4ddff15710 Merge pull request #2498 from cuberite/UnicodeOnWindows 
Enabled Unicode support for Windows
 2015-09-28 09:14:09 +01:00
Tiger Wang
9652f89a6d Merge pull request #2504 from SafwatHalaby/revert 
Fix recalc and "mob dancing", Partial revert of #2446
 2015-09-28 09:13:58 +01:00
Safwat Halaby
db40172b64 Partial revert of #2446 2015-09-28 08:52:08 +03:00
worktycho
30849b056f Merge pull request #2505 from cuberite/SettableWeather 
Added weather intervals to world.ini settings.
 2015-09-28 00:20:19 +01:00
Mattes D
7d551fe9f6 Added weather intervals to world.ini settings. 2015-09-28 01:02:17 +02:00
Safwat Halaby
ebfdac16dc Merge pull request #2502 from SafwatHalaby/seaMonsters 
Disabled squids and Guardians pathfinding, #2460
 2015-09-27 19:58:14 +03:00
Safwat Halaby
fc1633d6e6 Disabled squids and Guardians pathfinding, #2460 2015-09-27 19:48:37 +03:00
worktycho
11c1686092 Merge pull request #2465 from electromatter/master 
Added BungeeCord support for Protocol18x
 2015-09-27 14:24:15 +01: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
Tiger Wang
803c0c6965 Added the _UNICODE flag on Windows 2015-09-26 22:19:29 +01:00
Mattes D
ad57ce5f99 Extended and fixed the cFile API. 2015-09-26 22:54:18 +02:00
Safwat Halaby
78faad480b Merge pull request #2496 from SafwatHalaby/compileCommitId 
Fixed compile.sh console commit version, see #2493
 2015-09-26 21:44:12 +03:00
Safwat Halaby
2378e2a22e Fix compile.sh console commit version, see #2493 2015-09-26 08:47:51 +03:00
Tiger Wang
422bcef8ca Merge pull request #2463 from cuberite/fixes 
Prepared ScheduleTask for threading refactor
 2015-09-25 19:20:00 +01:00
Tiger Wang
a8bfe3a4c1 Prepared ScheduleTask for threading refactor 
* Llama-ified and condensed Schedule/QueueTask
- Removed hackery done with piston animations
 2015-09-25 18:56:49 +01:00
worktycho
335374376b Merge pull request #2495 from Seadragon91/clang-3.7 
Maked it compileable for clang-3.7
 2015-09-25 16:45:11 +01:00
Lukas Pioch
e56aa4032d Maked it compileable for clang-3.7 2015-09-25 17:09:19 +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
Safwat Halaby
26dee448f2 Merge pull request #2492 from SafwatHalaby/compileSh 
Compile.sh namechange to cuberite
 2015-09-25 15:33:06 +03:00
Safwat Halaby
f1270cb7a1 Compile.sh namechange to cuberite 2015-09-25 15:11:39 +03: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
tycho
b4f934b808 fixed cast 2015-09-24 15:54:32 +01:00
tycho
6e86d20f73 Add new "ForEach" function: ForEachLoadedChunk. 2015-09-24 15:54:32 +01:00
electromatter
a24cc01843 Merge branch 'master' into master 2015-09-21 22:44:34 -04:00