Merge branch 'master' of https://github.com/Ombridride/minetest-minetestforfun-server

minetestforfun_game/mods/stairs/init.lua

@@ -7,14 +7,22 @@ stairs = {}
 function stairs.register_stair(subname, recipeitem, groups, images, description, sounds)
 	minetest.register_node(":stairs:stair_" .. subname, {
 		description = description,
-		drawtype = "nodebox",
+		drawtype = "mesh",
+		mesh = "stairs.obj",
 		tiles = images,
 		paramtype = "light",
 		paramtype2 = "facedir",
 		is_ground_content = false,
 		groups = groups,
 		sounds = sounds,
-		node_box = {
+		selection_box = {
+			type = "fixed",
+			fixed = {
+				{-0.5, -0.5, -0.5, 0.5, 0, 0.5},
+				{-0.5, 0, 0, 0.5, 0.5, 0.5},
+			},
+		},
+		collision_box = {
 			type = "fixed",
 			fixed = {
 				{-0.5, -0.5, -0.5, 0.5, 0, 0.5},
@@ -138,7 +146,7 @@ function stairs.register_slab(subname, recipeitem, groups, images, description,
 				end
 				return itemstack
 			end
-
+			
 			-- Upside down slabs
 			if p0.y-1 == p1.y then
 				-- Turn into full block if pointing at a existing slab
@@ -267,7 +275,7 @@ stairs.register_stair_and_slab("sandstone", "default:sandstone",
 		"Sandstone Stair",
 		"Sandstone Slab",
 		default.node_sound_stone_defaults())
-
+		
 stairs.register_stair_and_slab("sandstonebrick", "default:sandstonebrick",
 		{crumbly=2,cracky=2},
 		{"default_sandstone_brick.png"},
@@ -308,14 +316,4 @@ stairs.register_stair_and_slab("obsidianbrick", "default:obsidianbrick",
 		{"default_obsidian_brick.png"},
 		"Obsidian Brick Stair",
 		"Obsidian Brick Slab",
-		default.node_sound_stone_defaults())
-
--- From BFD:
-
-stairs.register_stair_and_slab("cherry_wood", "default:cherry_plank",
-		{snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3},
-		{"default_wood_cherry_planks.png"},
-		"Cherry Plank Stair",
-		"Cherry Plank Slab",
-		"Cherry Plank Corner Stair",
-		default.node_sound_wood_defaults())
+		default.node_sound_stone_defaults())

minetestforfun_game/mods/stairs/models/stairs.obj

@@ -0,0 +1,39 @@
+# Blender v2.74 (sub 0) OBJ File: ''
+# www.blender.org
+v -0.500000 -0.500000 0.500000
+v -0.500000 0.000000 0.000000
+v -0.500000 0.000000 -0.500000
+v -0.500000 -0.500000 -0.500000
+v 0.500000 -0.500000 0.500000
+v 0.500000 -0.500000 -0.500000
+v 0.500000 0.000000 -0.500000
+v 0.500000 0.000000 0.000000
+v -0.500000 0.500000 0.500000
+v -0.500000 0.500000 0.000000
+v 0.500000 0.500000 0.000000
+v 0.500000 0.500000 0.500000
+vt 0.000000 0.500000
+vt 0.000000 0.000000
+vt 0.500000 0.500000
+vt 1.000000 0.000000
+vt 1.000000 0.500000
+vt 1.000000 1.000000
+vt 0.000000 1.000000
+vt 0.500000 1.000000
+vt 0.999900 0.000100
+vt 0.999900 0.999900
+vt 0.000100 0.999900
+vt 0.000100 0.000100
+s off
+f 3/1 4/2 2/3
+f 8/3 6/4 7/5
+f 4/4 3/5 7/1 6/2
+f 1/4 4/6 6/7 5/2
+f 2/5 8/1 7/2 3/4
+f 2/5 10/6 11/7 8/1
+f 9/6 12/7 11/1 10/5
+f 8/3 11/8 12/7
+f 5/9 12/10 9/11 1/12
+f 2/3 9/6 10/8
+f 4/2 1/4 9/6
+f 6/4 12/7 5/2

other_things/update_sources.txt

@@ -15,6 +15,10 @@
 # http://gitorious.org/calinou/carbone
 # https://github.com/Jordach/big_freaking_dig (some elements)
 
+# Minetest_game
+# [Stairs]
+# mff-edit: Optimized stair mesh
+
 # Mods
 [3D Armor]
 dir: 3d_armor