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

9051 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tiger Wang
5751ba0c1c Use container-based infrastructure for Travis 2015-08-20 16:15:55 +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
Julian Laubstein
41d7119a38 Merge pull request #2400 from cuberite/OffloadBadChunks 
Offload bad chunks
 2015-07-31 14:18:43 +02:00
Mattes D
d2a0c85764 Chunks that fail to load are offloaded to extra files. 
Ref.: #1970
 2015-07-31 08:49:23 +02:00
Mattes D
08aa3f6ff5 Added reason parameter to load failures. 2015-07-31 08:48:23 +02:00
Mattes D
7379848ae5 Moved AString reading hack to cFile. 2015-07-31 08:48:22 +02:00
Julian Laubstein
735d590abf Merge pull request #2371 from SamJBarney/WarningFix 
Warning fixes
 2015-07-29 18:45:36 +02:00
Samuel Barney
804805d35a Silenced and fixed many warning messages across multiple files. 2015-07-29 09:49:30 -06:00
Mattes D
5dbe1e7303 Merge pull request #2376 from mjhanninen/fix-freebsd-build 
Fix FreeBSD build
 2015-07-29 15:36:57 +02:00
Artur
e7b08ee96c WebAdmin: Changed MCServer to Cuberite 2015-07-29 15:05:15 +02:00
Mattes D
e2ec59095f Merge pull request #2388 from zackp30/armv7-cmake 
Fix compilation on ARMv7. Fixes #2387.
 2015-07-29 14:59:23 +02:00
Alexander Harkness
8eeb25dac6 Merge pull request #2394 from cuberite/FixCustomRecipes 
Fixed custom recipes result clientside bug.
 2015-07-26 15:26:39 +01:00
Mattes D
97beb2a350 Fixed custom recipes result clientside bug. 
Fixes #2345.
 2015-07-26 13:30:25 +02:00
Mattes D
fe7bd6767f Merge pull request #2393 from jammet/patch-8 
Fixed red carpet crafting recipe.
 2015-07-26 12:06:31 +02:00
jammet
b1df5ae46d Update crafting.txt 
Corrected red carpet recipe.
 2015-07-26 11:21:35 +02:00
Zack Piper
2a3f0de94d Fix compilation on ARMv7.Fixes #2387. 2015-07-24 18:02:03 +00:00
Julian Laubstein
7cb981443e Merge pull request #2383 from cuberite/GoogleTestFix 
Fixed cNetworkSingleton's HasTerminated flag.
 2015-07-23 21:18:16 +02:00
Mattes D
c74d856b57 Fixed cNetworkSingleton's HasTerminated flag. 
Should fix random failures in Google-test.
 2015-07-23 16:15:21 +02:00