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

9130 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Mattes D
137bd1d6e8 Merge pull request #2375 from jammet/patch-8 
Corrected Pillar of Quartz and Chiseled Quartz.
 2015-07-23 10:58:09 +02:00
Matti Hänninen
6836bf6576 Fix FreeBSD build broken by strict compiler check 
Downgrade tautological-compare to warning to let the build pass on
FreeBSD 10.0. Note that I wasn't able to reproduce the problem on OS X
Clang; probably due to Clang version differences.
 2015-07-20 18:17:45 +03:00
jammet
202f66c427 Update crafting.txt 
Corrected Pillar of Quartz and Chiseled Quartz.
 2015-07-19 19:06:56 +02:00
Alexander Harkness
b7114af5ae Merge pull request #2372 from jammet/patch-7 
Update crafting.txt
 2015-07-19 13:51:16 +01:00
jammet
663dc36742 Update crafting.txt 
Corrected QuartzBlock recipe
 2015-07-19 10:02:54 +02:00
Tiger Wang
84e31ba670 Merge pull request #2362 from scribblemaniac/fix-redstone 
Fixed redstone issue
 2015-07-17 23:37:47 +01:00
Tiger Wang
e5d3a9d59d Merge pull request #2365 from bibo38/coreupdate 
Updated the Core submodule reference to the latest commit.
 2015-07-17 23:37:04 +01:00
Samuel Barney
9fde99aca2 Added documentation for GetLargeTreeAdjustment 2015-07-17 15:26:21 -06:00
Julian Laubstein
9fba48533f Merge pull request #2295 from bibo38/rabbitcolors 
Added Rabbit Metadata values.
 2015-07-17 17:12:27 +02:00
scribblemaniac
00c3144283 Fixed redstone issue 
Fixed issue where glowstone blocks would block power transmission
in some situations.
 2015-07-17 00:48:21 -06:00
bibo38
6a27ec2ea0 Added Rabbit Metadata values. 
Added the Rabbit Types and the MoreCarrotTicks value. Types are selected randomly on creation.
Fixes #1867
 2015-07-17 01:09:06 +02:00
bibo38
e1174405fe Updated the Core submodule reference to the latest commit. 
Without this, the Core module always fails on start and cannot be used. See Pull Request #144 of Core.
 2015-07-17 00:30:44 +02:00
Tiger Wang
c633dd8cec Merge pull request #2363 from scribblemaniac/improve-spider-ai 
Improved spider AI
 2015-07-16 22:22:48 +01:00
Tiger Wang
4b99a5bd49 Merge pull request #2364 from hallucino/ageable-mobs 
Spawn baby mobs
 2015-07-16 22:22:42 +01:00
Julian Laubstein
29d1f37258 Merge pull request #2360 from bibo38/waterfix 
Now Water sources will also be created on top of existing water sources.
 2015-07-16 23:07:24 +02:00
hallucino
9c85ed5864 Spawn baby mobs 2015-07-16 22:49:55 +02:00
scribblemaniac
55aa438831 Improved spider AI 
Fixes #2335
 2015-07-16 11:15:57 -06:00
bibo38
3c9e113985 Now Water sources will also be created on top of existing water sources. 
See also on http://minecraft.gamepedia.com/Water#Source_blocks
Fixes #2097
 2015-07-15 23:36:51 +02:00
Tiger Wang
eadd761a29 Merge pull request #2348 from bibo38/customname 
Added CustomName and Health to sended Metadata of Monsters.
 2015-07-15 22:18:11 +01:00
Julian Laubstein
8b74adcfab Merge pull request #2353 from SamJBarney/DyedArmor 
Implements Dyed Leather Armor
 2015-07-15 22:31:48 +02:00
Samuel Barney
561296f269 Leather Armor can now be dyed. 
* Created new color class to handle dye-related coloring
 2015-07-15 14:05:36 -06:00