master #7

Merged
NO11 merged 26 commits from VoxeLibre/VoxeLibre:master into master 2021-08-31 23:02:42 +02:00
6 changed files with 7 additions and 8 deletions
Showing only changes of commit b5f7ae5458 - Show all commits

View File

@ -84,7 +84,7 @@ local function attach_object(self, obj)
end end
end, name) end, name)
obj:set_look_horizontal(yaw) obj:set_look_horizontal(yaw)
mcl_tmp_message.message(obj, S("Sneak to dismount")) mcl_title.set(obj, "actionbar", {text=S("Sneak to dismount"), color="white", stay=3})
else else
obj:get_luaentity()._old_visual_size = visual_size obj:get_luaentity()._old_visual_size = visual_size
end end

View File

@ -1,7 +1,7 @@
name = mcl_boats name = mcl_boats
author = PilzAdam author = PilzAdam
description = Adds drivable boats. description = Adds drivable boats.
depends = mcl_player, flowlib depends = mcl_player, flowlib, mcl_title
optional_depends = mcl_core, doc_identifier optional_depends = mcl_core, doc_identifier

View File

@ -646,7 +646,7 @@ register_minecart(
if player then if player then
mcl_player.player_set_animation(player, "sit" , 30) mcl_player.player_set_animation(player, "sit" , 30)
player:set_eye_offset({x=0, y=-5.5, z=0},{x=0, y=-4, z=0}) player:set_eye_offset({x=0, y=-5.5, z=0},{x=0, y=-4, z=0})
mcl_tmp_message.message(clicker, S("Sneak to dismount")) mcl_title.set(clicker, "actionbar", {text=S("Sneak to dismount"), color="white", stay=3})
end end
end, name) end, name)
end end

View File

@ -1,6 +1,6 @@
name = mcl_minecarts name = mcl_minecarts
author = Krock author = Krock
description = Minecarts are vehicles to move players quickly on rails. description = Minecarts are vehicles to move players quickly on rails.
depends = mcl_explosions, mcl_core, mcl_sounds, mcl_player, mcl_achievements, mcl_chests, mcl_furnaces, mesecons_commandblock, mcl_hoppers, mcl_tnt, mesecons depends = mcl_title, mcl_explosions, mcl_core, mcl_sounds, mcl_player, mcl_achievements, mcl_chests, mcl_furnaces, mesecons_commandblock, mcl_hoppers, mcl_tnt, mesecons
optional_depends = doc_identifier, mcl_wip optional_depends = doc_identifier, mcl_wip

View File

@ -45,7 +45,7 @@ local player_params = {}
minetest.register_on_joinplayer(function(player) minetest.register_on_joinplayer(function(player)
local playername = player:get_player_name() local playername = player:get_player_name()
player_params[playername] = { player_params[player] = {
stay = gametick_to_secondes(mcl_title.defaults.stay), stay = gametick_to_secondes(mcl_title.defaults.stay),
--fadeIn = gametick_to_secondes(mcl_title.defaults.fadein), --fadeIn = gametick_to_secondes(mcl_title.defaults.fadein),
--fadeOut = gametick_to_secondes(mcl_title.defaults.fadeout), --fadeOut = gametick_to_secondes(mcl_title.defaults.fadeout),
@ -127,14 +127,13 @@ function mcl_title.set(player, type, data)
return false return false
end end
--TODO: enable this code then Fleckenstein's pr get merged (in about 5-6 years) --TODO: enable this code then Fleckenstein's pr get merged (in about 5-6 years lol)
--if data.bold == nil then data.bold = false end --if data.bold == nil then data.bold = false end
--if data.italic == nil then data.italic = false end --if data.italic == nil then data.italic = false end
player:hud_change(huds_idx[type][player], "text", data.text) player:hud_change(huds_idx[type][player], "text", data.text)
player:hud_change(huds_idx[type][player], "number", hex_color) player:hud_change(huds_idx[type][player], "number", hex_color)
hud_hide_timeouts[type][player:get_player_name()] = data.stay or mcl_title.params_get(player).stay hud_hide_timeouts[type][player:get_player_name()] = data.stay or mcl_title.params_get(player).stay
return true return true
end end

View File

@ -330,7 +330,7 @@ function mcl_beds.on_rightclick(pos, player, is_top)
message = select(2, lay_down(player, ppos, other)) message = select(2, lay_down(player, ppos, other))
end end
if message then if message then
mcl_tmp_message.message(player, message) mcl_title.set(player, "actionbar", {text=message, color="white", stay=3})
end end
else else
lay_down(player, nil, nil, false) lay_down(player, nil, nil, false)