mirror of
https://git.minetest.land/VoxeLibre/VoxeLibre.git
synced 2024-11-30 06:21:05 +01:00
Merge branch 'master' into title-API
This commit is contained in:
commit
c642f9e2f7
2 changed files with 3 additions and 8 deletions
Binary file not shown.
Before Width: | Height: | Size: 260 B After Width: | Height: | Size: 3 KiB |
|
@ -21,12 +21,7 @@ local function arrow_image(colorstring, opacity)
|
||||||
if not opacity then
|
if not opacity then
|
||||||
opacity = 127
|
opacity = 127
|
||||||
end
|
end
|
||||||
return {"mcl_bows_arrow.png^[transformFX^(mcl_bows_arrow_overlay.png^[transformFX^[colorize:"..colorstring..":"..tostring(opacity)..")",
|
return {"mcl_bows_arrow.png^(mcl_bows_arrow_overlay.png^[colorize:"..colorstring..":"..tostring(opacity)..")"}
|
||||||
"mcl_bows_arrow.png^[transformFX^(mcl_bows_arrow_overlay.png^[transformFX^[colorize:"..colorstring..":"..tostring(opacity)..")",
|
|
||||||
"mcl_bows_arrow_back.png^[colorize:"..colorstring..":"..tostring(opacity),
|
|
||||||
"mcl_bows_arrow_front.png^[colorize:"..colorstring..":"..tostring(opacity),
|
|
||||||
"mcl_bows_arrow.png^(mcl_bows_arrow_overlay.png^[colorize:"..colorstring..":"..tostring(opacity)..")",
|
|
||||||
"mcl_bows_arrow.png^[transformFX^(mcl_bows_arrow_overlay.png^[transformFX^[colorize:"..colorstring..":"..tostring(opacity)..")"}
|
|
||||||
end
|
end
|
||||||
|
|
||||||
local how_to_shoot = minetest.registered_items["mcl_bows:arrow"]._doc_items_usagehelp
|
local how_to_shoot = minetest.registered_items["mcl_bows:arrow"]._doc_items_usagehelp
|
||||||
|
@ -105,7 +100,7 @@ function mcl_potions.register_arrow(name, desc, color, def)
|
||||||
physical = true,
|
physical = true,
|
||||||
visual = "mesh",
|
visual = "mesh",
|
||||||
mesh = "mcl_bows_arrow.obj",
|
mesh = "mcl_bows_arrow.obj",
|
||||||
visual_size = {x=1, y=1},
|
visual_size = {x=-1, y=1},
|
||||||
textures = arrow_image(color, 100),
|
textures = arrow_image(color, 100),
|
||||||
collisionbox = {-0.19, -0.125, -0.19, 0.19, 0.125, 0.19},
|
collisionbox = {-0.19, -0.125, -0.19, 0.19, 0.125, 0.19},
|
||||||
collide_with_objects = false,
|
collide_with_objects = false,
|
||||||
|
|
Loading…
Reference in a new issue