Alexander Harkness
d290b1e48a
Merge pull request #2574 from Schwertspize/pressure-plate-fix
...
Pressure plate fix
2015-10-28 21:29:10 +00:00
Schwertspize
525b967c93
fixed pressure plate bugs
2015-10-28 22:21:46 +01:00
Alexander Harkness
54583d74b4
Merge pull request #2576 from Schwertspize/patch-1
...
Added myself to list, ran it through `sort -f`
2015-10-28 19:17:09 +00:00
Schwertspize
e02313c7ea
Added myself to list, ran it through sort -f
2015-10-28 20:13:21 +01:00
Alexander Harkness
745e6bd0b8
Merge pull request #2575 from Schwertspize/patch-1
...
remove contentless bullet point
2015-10-28 18:51:41 +00:00
Schwertspize
2f269342c7
remove contentless bullet point
...
white space is for free, but thats not neccesairy
2015-10-28 19:37:32 +01:00
Alexander Harkness
d14c8fa446
Fix wrong teleport permission. (solves #2369 )
2015-10-28 08:24:48 +00:00
Mattes D
d7d2bc0bec
Merge pull request #2566 from cuberite/update_submodules
...
Updated Core and ProtectionAreas
2015-10-27 11:29:55 +01:00
Lukas Pioch
009a05e4f0
Updated Core and ProtectionAreas
2015-10-27 10:19:30 +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
Lukas Pioch
079bb7c016
Update Loops required for JsonCPP
2015-10-26 00:16:35 +00: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
Julian Laubstein
979ab11044
ReTyped block ids
2015-10-15 10:53:32 +02:00
NiLSPACE
cf8d508939
Merge pull request #2544 from cuberite/worktycho-patch-1
...
Removed unused typedef
2015-10-12 16:17:34 +02:00
worktycho
183284a2a4
Removed unused typedef
2015-10-12 15:02:25 +01:00
NiLSPACE
24ebae8c4f
Merge pull request #2543 from Seadragon91/pluginmanager_hooks
...
Added missing hooks to cPluginManager
2015-10-12 11:17:56 +02:00
Lukas Pioch
ff08d3de19
Added missing hooks to cPluginManager
2015-10-12 11:03:49 +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
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
