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
worktycho
1a572e6611
Merge pull request #2535 from cuberite/FixGitQueries
...
Added WORKING_DIRECTORY specification to git queries used in CMake.
2015-10-09 10:38:23 +01: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
Tiger Wang
4a8e7bddcc
Merge pull request #2528 from OdnetninI/master
...
Fixed flight in Spectator Mode
2015-10-05 22:05:37 +01:00
Mattes D
7c6bad2192
Merge pull request #2527 from cuberite/FixPrefabHitBox
...
Fix prefab hit box
2015-10-05 22:03:35 +02:00
OdnetninI
545aa2a989
Spectator Mode doesn't fly[FIX]
2015-10-05 21:59:15 +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
tycho
d8c860ae58
Improved the data structure for storing loaded chunks
...
Should significantly increase the performance of deciding which chunks to stream
2015-10-05 16:20:07 +01:00
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
