1
0
Commit Graph

9018 Commits

Author SHA1 Message Date
mmdk95
c12704183b Fix duping doors (#1327) 2015-07-14 18:42:40 +02:00
Julian Laubstein
e92335b669 Merge pull request #2346 from SamJBarney/TreeGrowthUpdate
Sapling Growth Update
2015-07-14 16:36:53 +02:00
worktycho
c638b76828 Merge pull request #2351 from SamJBarney/TorchStairFix
Torches can now be placed on top of upside down stairs.
2015-07-14 07:55:36 +01:00
Samuel Barney
037dbf110d Torches can now be placed on top of upside down stairs. 2015-07-13 17:08:07 -06:00
Julian Laubstein
118aec1198 Merge pull request #2347 from SamJBarney/ClampFix
Replace min-max combo with Clamp in BioGen
2015-07-14 00:14:12 +02:00
Samuel Barney
d017fe5e39 Sapling Growth Update
* Growth has been slowed down
* Saplings do not grow if they do not have enough space to grow
* Saplings do not grow unless the light level is 9 or above
* Dark Oak doesn't grow unless it is in a 2x2

Jungle Trees now will grow into a large tree when 2x2 saplings are used.
2015-07-13 15:24:38 -06:00
Samuel Barney
051787dbc2 Switched from using std::max(std::min()) to using Clamp 2015-07-13 14:17:43 -06:00
Julian Laubstein
f6f27a139e Merge pull request #2344 from bibo38/make_ptr
Changed allocation of smart pointers via make_xxx
2015-07-13 00:54:58 +02:00
Tiger Wang
a4abd52dcc Merge pull request #2339 from mmdk95/master
Fixed DropSpenser sound
2015-07-12 22:39:15 +01:00
bibo38
0cb0bbe51a Changing the shared_ptr/unique_ptr constructors to the make_shared/make_unique functions 2015-07-12 21:02:47 +02:00
mmdk95
d3662e6589 Fixed DropSpenser sound #2333 2015-07-12 19:30:51 +02:00
Julian Laubstein
9b3b047004 Merge pull request #2330 from cuberite/libraryupdate
Library update
2015-07-12 14:46:33 +02:00
Tiger Wang
e69d4536ab Added JsonCPP library location to search paths
* Fixed '-dirty' submodule changes
Probably fixes an issue somewhere too?
2015-07-12 12:23:11 +01:00
Tiger Wang
d8da11ca91 Merge pull request #2328 from SamJBarney/master
Fixes compilation failures on MacOSX 10.10
2015-07-10 22:36:33 +01:00
Tiger Wang
ccfe04a0a2 Updated and submodularised JsonCPP
Conflicts:
	lib/jsoncpp
2015-07-09 23:10:51 +01:00
Tiger Wang
51a118f1ef Updated luaexpat 2015-07-09 23:06:24 +01:00
Tiger Wang
abd5708e5c Updated expat 2015-07-09 23:06:23 +01:00
Tiger Wang
5a3c3447b7 Updated zlib 2015-07-09 23:06:23 +01:00
Samuel Barney
db3642de89 Fixed misplaced parens 2015-07-09 14:41:14 -06:00
Samuel Barney
aa94a275c6 Fixes compilation failures on MacOSX 10.10
* Replace old c-style casts with c++ casts
* Added `-Wno-error=old-style-cast` to Protocol18x.cpp
2015-07-09 11:15:37 -06:00
Mattes D
a55eaba7fa Network: Fixed ServerHandle's address formatting. 2015-07-07 18:10:47 +02:00
Nounours Heureux
91833b7cb8 (Ender) Chests are obstructed by opaque blocks. 2015-07-07 12:29:52 +02:00
Mattes D
bebd4de144 Fixed warnings generated by 64-bit MSVC. 2015-07-07 11:50:06 +02:00
Julian Laubstein
5953e0f1c6 Merge pull request #2319 from SamJBarney/master
Squashed Bonemeal Plant Growth Update
2015-07-06 23:47:40 +02:00
Samuel Barney
2faff189d4 Squashed Bonemeal Plant Growth Update
* Fixed Crops growing to maturity with only 1 bonemeal
* Trees now go through growth stages with bonemeal, as they do in
Vanilla Minecraft
2015-07-06 15:41:08 -06:00
worktycho
106e06617a Merge pull request #2224 from cuberite/ChunkQueueCollapsing
Chunk queue collapsing: MK II
2015-07-04 14:43:00 +01:00
worktycho
fa100d9345 Merge pull request #2312 from SamJBarney/master
Fixes grass dying at night
2015-07-03 20:44:03 +01:00
Samuel Barney
ba0577bbd0 Moved grabbing the light value to after the transparency check. 2015-07-03 13:05:02 -06:00
Samuel Barney
0307b6aba0 Added missing parens 2015-07-02 16:19:23 -06:00
Samuel Barney
e248539d74 Grass now only dies if it has an opaque block above it.
Grass only spreads to a dirt block if the light level is above 4 and the block above it is transparent.
2015-07-02 16:16:05 -06:00
Samuel Barney
404cf5dcfd Farmland is now listed as an opaque block.
Changed spread light falloff for farmland to what it was originally.
2015-07-02 16:13:40 -06:00
worktycho
11cf88b872 Merge pull request #2306 from cuberite/FixNeighborChangedLoop
Added neighbor specification in the OnNeighborChanged() block callback.
2015-07-01 10:39:46 +01:00
Mattes D
66a164a9a7 Added neighbor specification in the OnNeighborChanged() block callback.
Fixes the OnNeighborChanged endless recursion with large melon / pumpkin fields.
Fixes #2213.
2015-07-01 10:40:16 +02:00
Mattes D
b0bd1e3907 APIDump: Fixed a forgotten comma. 2015-06-30 22:36:51 +02:00
Mattes D
0a24f7977b Added the Prefabs folder to the files packed by build. 2015-06-30 22:05:21 +02:00
worktycho
49d88ae790 Merge pull request #2303 from cuberite/RemoveObsoleteScript
Removed the MakeLuaAPI script.
2015-06-30 14:05:05 +01:00
worktycho
351110fa3c Merge pull request #2304 from cuberite/FixBlockAreaHeight
BlockArea: Fixed a crash with areas higher than chunk height.
2015-06-30 14:04:31 +01:00
Mattes D
f6ab461383 BlockArea: Fixed a crash with areas higher than chunk height. 2015-06-30 14:08:21 +02:00
Mattes D
d646c81eb7 Removed the MakeLuaAPI script.
It has been superseded by feeding commands to the server directly via stdin.
2015-06-30 09:52:46 +02:00
Mattes D
e86f593c37 Fixed typos in the readme. 2015-06-30 08:00:10 +02:00
Mattes D
fe81a0dcde Merge pull request #2239 from cuberite/PortalSize
Added a size check for portals.
2015-06-28 21:04:34 +02:00
STRWarrior
e5cfe0cd96 Added a size check for portals.
Made the portal size configurable

Alpha-sorted SetXYZNetherPortalXYZ functions
2015-06-28 17:05:44 +02:00
tycho
257011b440 use atomic for state, to avoid torn reads 2015-06-27 12:10:24 +01:00
worktycho
acec8c5a83 Merge pull request #2294 from bibo38/horsefix
Now Horses spawn with correct data values.
2015-06-26 19:16:14 +01:00
bibo38
bb46afcb7e Now Horses spawn with correct data values.
The max-value of style is 4, of color is 6.
See http://wiki.vg/Entities#Horse
Also based on the if, the max value of HorseType is 7.
Bugfix #2259
2015-06-26 19:32:16 +02:00
worktycho
0a7c54261f Merge pull request #2241 from lkolbly/master
Work on NetherPortalScanner. Setup portal scanner to reset PortalCool…
2015-06-26 14:12:29 +01:00
worktycho
7187c00342 Merge pull request #2282 from Haxi52/button-fixes
Button fixes
2015-06-25 15:46:33 +01:00
Mattes D
8e1437be08 Merge pull request #2290 from bibo38/mousefix
Fixed Middle-Click Button in the ClickWindow-Packet.
2015-06-25 16:11:56 +02:00
worktycho
fc2834e74b Merge pull request #2291 from bibo38/doorfix
Doors now get placed on the server-side.
2015-06-25 14:33:13 +01:00
bibo38
31466fda5f Doors now get placed on the server-side.
The Y-Value is already the lower door block(From ItemHandler.cpp:346).
Increasing it once again, places the door into the air, which is blocked by Cuberite.
Bugfix #2279
2015-06-25 16:17:03 +02:00