1
0
Fork 0
Commit Graph

4508 Commits

Author SHA1 Message Date
Tiger Wang 9d4d25cdbf Merge pull request #2352 from mmdk95/master
Fix duping doors
2015-07-14 21:32:28 +01:00
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
Samuel Barney 037dbf110d Torches can now be placed on top of upside down stairs. 2015-07-13 17:08:07 -06: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
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 ccfe04a0a2 Updated and submodularised JsonCPP
Conflicts:
	lib/jsoncpp
2015-07-09 23:10:51 +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
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
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
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 f6ab461383 BlockArea: Fixed a crash with areas higher than chunk height. 2015-06-30 14:08:21 +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
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
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
bibo38 ec628846d2 Fixed Middle-Click Button in the ClickWindow-Packet.
See http://wiki.vg/Protocol#Click_Window
The MiddleClick has the button 2 and not 0. Now you can max an item in an inventory in Creative mode, without inventory desync.
Bugfix #2260
2015-06-25 13:01:48 +02:00
Hax52 9f1d1c058f Buttons no longer click on when already on. Buttons now play sound when clicking off. 2015-06-24 13:52:56 -05:00
Mattes D c1780366b0 Merge pull request #2288 from cuberite/melonFix
Call Neighbour changed handlers when a melon is created
2015-06-24 14:59:47 +02:00
Mattes D 4f8e2f180d Added a forgotten break in cHangingEntity constructor.
This had caused loading the cHangingEntity to fail in debug builds.
2015-06-24 13:39:11 +02:00
tycho b02b262a7c Call Neighbour changed handlers when a melon is created
Should prevent cascading farmland updates on breaking melons
2015-06-23 21:27:37 +01:00
worktycho c0d8a4933e Merge pull request #2284 from cuberite/FixBiomeGen
Generate biomes when pregenerating heights through CompositedHeiGen.
2015-06-23 17:26:39 +01:00
Mattes D 2daa9c5854 Fixed melon metadata when growing from stem. 2015-06-23 17:23:35 +02:00
Mattes D 55a5f11b1b Fixed right-click with bonemeal.
The client would send invalid right-click events with Y set to 0x7ff, which would crash the server. Only process bonemeal for valid clicks (valid blockface).
2015-06-23 15:23:11 +02:00
Mattes D 6cd71a1e73 Generate biomes when pregenerating heights through CompositedHeiGen.
Fixes #2283.
2015-06-23 14:45:35 +02:00
Tiger Wang 33fc1474d9 Fixed minor errors in Tycho's code
Everything should work now :)
2015-06-22 21:27:13 +01:00
Samuel Barney e70e2b8ecc Rebased version of Code 2015-06-22 11:29:38 -06:00
Mattes D 3889b2cac2 Refactored block placement workflow.
Multi-blocks can now use the default OnPlayerPlaced() callback in cItemHandler.
2015-06-21 19:49:22 +02:00
Mattes D e06dd8f20e Added basic support for loading village prefabs from files. 2015-06-20 15:37:41 +02:00
worktycho 33d68572a6 Merge pull request #2255 from cuberite/LoadablePieces
Loadable pieces
2015-06-19 19:41:28 +01:00
Mattes D 8df31067d4 Externalized cPrefabPiecePool self-test. 2015-06-19 16:15:59 +02:00
Mattes D ae16689420 PrefabPiecePool: Added loading from cubeset file. 2015-06-18 23:32:43 +02:00
Tiger Wang 6920e468ad Check the return value of InflateString
Fixes #2256
2015-06-18 11:19:41 +01:00
Mattes D c6012a95bd LuaState: Added support for config-style usage.
Globals and table values can be queried from the Lua state easily.
Use perfect forwarding.
2015-06-17 17:13:45 +02:00