1
0
Commit Graph

9285 Commits

Author SHA1 Message Date
Mattes D
d041057da2 Merge pull request #2457 from cuberite/log
Increase robustness of the logging subsystem
2015-09-16 09:12:56 +02:00
tycho
3187dbf0aa Increase robustness of the logging subsystem 2015-09-15 16:19:49 +01: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
David Erbelding
d0fd51ea9d Fixed flint drop rates from 1/30 to 1/10 to match the wiki. 2015-09-13 23:18:21 -04: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
Eric Chai
1ef6bd8169 added bungeecord support for protocol18x 2015-09-06 09:58:18 -04: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
Tiger Wang
4463eed826 Merge pull request #2459 from cuberite/fixes
Fixes #2458
2015-09-02 22:10:41 +01:00
Tiger Wang
511334c500 Fixes #2485 2015-09-02 21:11:25 +01:00
Tiger Wang
7664981f51 Merge pull request #2447 from mjhanninen/fix-freebsd-signal-include
Fix FreeBSD build by including signal.h
2015-09-02 18:37:56 +01:00
Matti Hanninen
c3d84a24a9 Include signal.h jointly for POSIX systems
Otherwise, for example, FreeBSD the build fails due to SIGKILL not being
around.
2015-08-27 08:15:08 +03:00
Tiger Wang
3b8dc45dc3 Merge pull request #2446 from cuberite/asyncpathfinder
Fixed a position bug in the pathfinder
2015-08-26 23:13:13 +01:00
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
baf3a07804 Fixed a position bug in the pathfinder 2015-08-22 17:06:08 +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