Tiger Wang
dfc0f2ae00
Small fix for cEvent
...
Don't bother using atomics since a synchronisation primitive is already
being used.
2015-08-26 23:02:45 +01: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
AZARI Nicolas
f0fcd022a6
Update cRankManager::SetRankVisuals
2015-08-25 09:15:54 +02:00
Tiger Wang
49de9c4269
Merge pull request #2449 from theoduino/master
...
Fix clang compile error
2015-08-24 13:47:00 +01:00
Theo Tosini
92b1a3440d
Fix clang compile error
...
Clang would previously fail on debug builds due to the use of an old-style cast.
2015-08-23 23:11:08 -04:00
Tiger Wang
908a554efa
Merge pull request #2441 from mjhanninen/fix-osx-build-due-cc-flag
...
Remove Clang compiler flag that breaks OS X build
2015-08-22 22:30:00 +01:00
Matti Hänninen
f4cbfcdc1e
Revert Clang compiler flag that breaks OS X build
2015-08-22 22:41:14 +03:00
Tiger Wang
e254a76884
Removed unused function
...
* Fixes #2444
2015-08-22 19:35:56 +01:00
Tiger Wang
3e0af6ca36
Cast UINT to WORD to appease warning
...
* Additional minor cleanups
2015-08-22 14:21:25 +01:00
Tiger Wang
f52a769761
Merge pull request #2427 from cuberite/fixes
...
Fixed and improved restarting
2015-08-22 13:07:34 +01:00
Tiger Wang
1cb612ccdc
Merge pull request #2443 from mjhanninen/fix-osx-build-due-warnings
...
Qualify abs with namespace, use explicit cast
2015-08-22 12:54:36 +01:00
Matti Hänninen
12fb95ba2f
Namespace qualify std::abs, use explicit cast
...
Without 'std' namespace qualification Clang (at least Apple Clang 6.1)
seems to resolve 'abs' to the 'abs' function in 'cstdlib'. This in turn
triggers the 'absolute-value' warning which in turn is promoted to
error.
Implicit casts trigger 'old-style-cast' warnings which are promoted to
errors.
2015-08-22 00:36:29 +03:00
Tiger Wang
a341419b04
Merge pull request #2380 from cuberite/travis
...
Use container-based infrastructure
2015-08-20 17:18:08 +01:00
Tiger Wang
7cf741abde
Merge pull request #2379 from cuberite/hunger
...
Hopefully fixed food drain bugs
2015-08-20 17:16:54 +01:00
Tiger Wang
de2cce9b79
Fixed food drain bugs
2015-08-20 16:26:42 +01:00
Tiger Wang
5751ba0c1c
Use container-based infrastructure for Travis
2015-08-20 16:15:55 +01:00
Tiger Wang
4315a11393
Fixed and improved restarting
...
Restarts are now an actual, close-as-possible to application
exit+reopen.
2015-08-20 16:15:23 +01:00
Samuel Barney
b5ed23d2a6
Merge pull request #2391 from SamJBarney/CropGrowthFix
...
Crop/plant growth fix
2015-08-19 11:05:30 -06:00
Samuel Barney
cc83c4641d
* Logic for handling plant growth has been centralized into cBlockPlant, and all growable plants now inherit from it.
...
* Blocks now have an effect upon plant growth, just like in vanilla.
2015-08-19 10:48:21 -06: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
Julian Laubstein
dd5201c29e
Some warning fixes
2015-08-18 08:49:00 +02:00
Julian Laubstein
d0f1eb1018
Merge pull request #2436 from cuberite/UpdateCompileScript
...
Updated compile.sh to use new naming
2015-08-16 22:55:35 +02:00
Julian Laubstein
d06f7f19ce
Updated compile.sh
2015-08-16 22:41:31 +02:00
Julian Laubstein
4231dcf7e1
Merge pull request #2435 from artur9010/patch-3
...
Update app.yml
2015-08-16 10:26:59 +02:00
Artur
5c0df5b301
Update app.yml
2015-08-15 20:26:22 +02:00
Julian Laubstein
78f869d310
Merge pull request #2430 from cuberite/APIDumpFix
...
Readded plugin article
2015-08-14 10:18:39 +02:00
Julian Laubstein
d501dcb70d
Readded plugin article
2015-08-14 09:40:44 +02:00
Tiger Wang
a5b3e88222
Merge branch 'bearbot-testing'
2015-08-13 16:20:25 +01:00
Julian Laubstein
8438cc0611
Merge pull request #2426 from cuberite/APIDumpNameChangeFix
...
Fixed a few missing MCServers in APIDump
2015-08-13 10:35:27 +02:00
Julian Laubstein
24e8edb19c
Fixed a few missing MCServers in APIDump
2015-08-13 10:19:24 +02:00
Julian Laubstein
cdcc5fe9a7
Merge pull request #2417 from mjhanninen/fix-clang-warnings
...
Fix compilation warnings related to implicit and old-style casts
2015-08-12 17:40:51 +02:00
Matti Hänninen
b20294604c
Fix old style casts and implicit conversions
2015-08-12 16:51:38 +03: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
Julian Laubstein
0958e167e8
Updated APIDump to follow the namechange
2015-08-11 22:48:55 +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
worktycho
63b65c19ef
Merge pull request #2424 from cuberite/CompileMSVC2015
...
Compile MSVC2015
2015-08-10 20:12:06 +01: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
Julian Laubstein
171e754a6e
Merge pull request #2420 from cuberite/FlushLog
...
Flush log file when a warning or error message is output.
2015-08-08 11:15:48 +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
Samuel Barney
4996e53bf5
Refactored code to use cLuaState
...
Fixes #2377 .
2015-08-07 21:17:21 +02:00
Tiger Wang
6fdc4a1ea3
Merge pull request #2415 from nichwall/master
...
Fixes #2413
2015-08-01 18:38:20 -04:00
Nicholas W
fbbf27feea
Fixed Iron Door
2015-08-01 08:47:55 -05:00
Julian Laubstein
d19cde93fa
Merge pull request #2412 from cuberite/UnifyComments
...
Unified the doxy-comment format.
2015-07-31 19:26:33 +02:00
Mattes D
6e4122e551
Unified the doxy-comment format.
2015-07-31 16:49:10 +02:00
