Commit Graph

411 Commits (05332037107d406bf7578fa9e846d300aac11315)

Author SHA1 Message Date
paramat 0533203710 merge upstream commit: Default: Add stone / desert stone / sandstone / obsidian blocks 2016-07-16 13:45:32 +02:00
tchncs 892ab3faaa default: get darkage modpath to ensure basalt is available 2016-07-15 22:33:11 +02:00
tchncs 1e7ea09713 default: flowing lava can cool down to basalt 2016-07-15 19:06:35 +02:00
Xunto b64202fbe9 cherry-pick from github.com/minetest/minetest_game> Default: Fix character model uv-mapping 2016-06-22 15:44:37 +02:00
Auke Kok 77cdaacaac cherry-pick from github.com/minetest/minetest_game> Default: Make brick and plank nodes rotatable 2016-06-22 15:41:25 +02:00
Auke Kok 4c3b8376ab cherry-pick from github.com/minetest/minetest_game> Stairs: Add mossy cobble slab and stair 2016-06-22 15:39:40 +02:00
paramat eff782c61f cherry-pick from github.com/minetest/minetest_game> Mapgen: Add biome fields for riverbed node and depth 2016-06-22 15:38:31 +02:00
paramat 37d3fe0cb1 cherry-pick from github.com/minetest/minetest_game> Default: Bookshelf has 2 openings instead of 4 2016-06-22 15:31:23 +02:00
tchncs d2f63e50c5 change pick_diamond speed and make it group 3 again 2016-05-31 18:02:13 +02:00
Auke Kok 0da14dbb56 cherry-pick from github.com/minetest/minetest_game> Default: Convert saplings to use node timers
Each sapling is given a single node timer that is between
2 and 4 days of game play time (40-80 minutes). If you walk out
of the zone, and come back later, the tree will always grow
to full if the timer has elapsed.

Because trees.lua is all functions, it needs to be parsed before
nodes.lua, since that references some of its functions. Hence,
change the order of parsing here. Otherwise saplings would not
grow to full.
2016-05-28 08:58:23 +02:00
paramat 75a85b951e cherry-pick from github.com/minetest/minetest_game> Stairs/default: Make sandstone(brick) groups consistent
Sandstone is crumbly = 1 cracky = 3 to be slowly diggable by hand
Sandstonebrick(stair/slab) is cracky = 2
2016-05-28 08:42:57 +02:00
Foz c47d026950 cherry-pick from github.com/minetest/minetest_game> Tnt: Fix bug in dropped item counting 2016-05-28 08:40:00 +02:00
tchncs f1ddb91275 update submodules 2016-05-22 22:43:37 +02:00
tchncs f4fc4294b7 fix mergeconflicts 2016-05-02 10:16:25 +02:00
Foz 1a6298958e Default: Add function 'node_sound_gravel_defaults()' 2016-04-29 23:19:30 +01:00
paramat fafbe2c268 Default: New grass and grass_side textures
Derived from Casimir's Voxelgarden texture
2016-04-29 23:19:30 +01:00
Auke Kok 54b87e955d TNT: Add on_blast to all nodes with an inventory
Adds a minor helper function that allows efficient retrieval of
several inventories from a node inventory. We use this helper to
quickly retrieve the items in chests, vessel shelves, book shelves
and furnaces, and return these with the nodes itself to the TNT caller.

The TNT caller then performs the entity physics, and we don't need
to do anything else.

We disable TNT doing anything with bones.

We expose a bug in the code that drops the items - metadata was lost
entirely. This patch corrects that by properly copying the metadata
and creating the drops list inclusive metadata.
2016-04-26 22:33:59 +01:00
KevDoy fa43bd8a56 Default: New heart texture
Similar to before, add symmetry and slightly more rounded off
2016-04-23 20:01:09 +01:00
paramat 0ca43e42bc Default: Create 'grass', 'dry_grass' groups, use in dirt conversion ABM 2016-04-18 01:52:03 +01:00
Auke Kok 33aa5e77dc Character: Fix boat leg wobble.
There was a small leg wobble in the sitting animation (visible
when sitting on the boat). This removes it.
2016-04-18 01:51:57 +01:00
Auke Kok 7d93272caa Change how dirt turns to dirt_with_(something)
This changes how dirt blocks turn to dirt_with -grass, -dry_grass
or -snow.

Previously, dirt that was sunlit would turn to dirt_with_grass no
matter what, but this happened without any context, so you could
get green patches of dirt_with_grass in the middle of a savannah or
even desert.

Dirt no longer turns to covered dirt unless it's within 1 node from
another dirt_with_grass or dirt_with_dry_grass or dirt_with_snow.
This makes dirt_with_grass "growback" a lot slower, since it now only
happens on the edges, but it retains the context nicely now.

If there is any dirt with a grass or dry grass plant, or snow on top,
and enough light, we'll convert it sporadically to dirt_with_grass
or dirt_with_dry_grass or dirt_with_snow.

This allows us to plant grass of our choice in a large dirt patch,
or in a region where otherwise that type of grass is not present.

This used to be done by 2 abms, but I've combined them in to a single
ABM that is ordered to run with maximum efficiency, solving for the
most common outcome first before attempting more complex checks.
2016-04-16 19:27:34 +01:00
Auke Kok 64fe69f382 Remove "grass under snow" from default:dirt_with_snow in darkness.
This is technically "dirt with grass" that's just under a snow
cover, so in darkness the grass on these nodes will also die,
turning it into dirt.

This doesn't convert dirt_with_snow under snow.
2016-04-16 19:27:34 +01:00
kilbith 082b36d3e7 Books: Split text per page relatively to number of lines 2016-04-14 02:45:57 +01:00
tenplus1 6e1a329763 default: Strengthen obsidian glass Remove group 'oddly_breakable_by_hand' 2016-04-12 01:27:55 +01:00
tchncs 31c58164d8 fix mergeconflicts 2016-04-11 12:39:33 +02:00
paramat aadac1223d Default/mapgen: Denser rainforest, fewer logs 2016-04-08 01:12:56 +01:00
Auke Kok f4e77edcc6 Flood snow with either lava or water.
Fixes #1005

This doesn't flood snow or ice blocks.
2016-04-04 05:39:23 +01:00
Auke Kok 4d7dbfc826 Start timer as well when moving items around.
It's possible to hit this when using an e.g. charcoal mod
where a tree is both a fuel and a source.
2016-03-30 23:10:59 +01:00
tenplus1 787ccb5747 Add recipe to craft clay block back into lumps
Added a recipe to craft a clay block back into 4 clay lumps.
2016-03-30 23:10:52 +01:00
Jean-Patrick Guerrero 12bcfeab4d Shelves: Fix listring functionality + code cleaning 2016-03-30 23:10:46 +01:00
tchncs 0b4aa7b59c merge master of minetest/minetest_game 2016-03-29 16:08:55 +02:00
tchncs 068c3eaa0e fixed little mistake on furnace reverting 2016-03-26 20:24:17 +01:00
tchncs 0feed93d9e location fix: furnace.lua 2016-03-26 20:14:20 +01:00
tchncs ad7d460096 revert failed operations 2016-03-26 20:02:17 +01:00
tchncs 8564858efe re-added submodule boats 2016-03-26 19:24:40 +01:00
tchncs 954123df52 Revert "update submodule boats"
This reverts commit a58df5b448.
2016-03-26 19:14:57 +01:00
tchncs a58df5b448 update submodule boats 2016-03-26 19:13:46 +01:00
paramat 14334a1d89 Default: Reduce sand footstep and dug sound gains 2016-03-25 13:15:22 +00:00
Jean-Patrick Guerrero 6749da1070 Books: Ensure backward compatibility for older written books 2016-03-25 13:15:12 +00:00
Jean-Patrick Guerrero a71948c007 Books: Move page buttons at the bottom 2016-03-22 15:46:19 +00:00
Jean-Patrick Guerrero c3d2bc383b Wooden Sign: Add group oddly_breakable_by_hand 2016-03-22 15:46:13 +00:00
paramat 7d55320d5c Default: Make some plant nodes non-flammable 2016-03-22 15:46:07 +00:00
paramat 0d3bca790c Default: Fix rotation errors for mapgen aspen and sapling jungletree 2016-03-22 15:46:00 +00:00
Jean-Patrick Guerrero b57dd0f9b2 Books: Add support for multiple pages 2016-03-21 06:17:40 +00:00
tchncs 02c87c3b01 Merge https://github.com/minetest/minetest_game 2016-03-18 18:51:32 +01:00
tchncs 28976d3e6c Revert "Convert fences to NDT_CONNECTED."
This reverts commit d979293f14.
2016-03-18 18:50:17 +01:00
Auke Kok c94349eaef Re-export character.b3d without texture linkage.
I've created a modified B3Dexport.py version that automatically strips
the embedded texture link to external texture files. These links were
causing the engine to spew "can't find character.png" messages on the
console, but were harmless due to texture loading being done by the
client side and not through irrlicht.

I previously moved character.png to /textures/, which is wrong. I now
understand that character.png was in the same folder as character.blend
simply to make blender load the texture from the embedded linkage
automatically. Nothing more, nothing less.

Subsequently the character.png file should just sit in convenience
in the /models/ folder with the blend file, and not in the textures
file. This patch moves it back. And yes, minetest does load the
character.png from this path.
2016-03-18 02:35:14 +00:00
paramat f18871d60c Default: Colourise desert cobble to be consistent with desert stone
Hue and saturation match desert stone and desert stone brick
Preserve original mortar colour
2016-03-15 16:23:13 +00:00
Jean-Patrick Guerrero 28884cc784 Add flint and flint-and-steel 2016-03-15 16:22:42 +00:00
tchncs d672f9a7db added alias for default:ladder 2016-03-14 21:06:42 +01:00