Merge pull request 'Fix #1808 (Make end credits speed up when pressing jump)' (#1835) from NO11/MineClone2:credits into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1835
This commit is contained in:
commit
f894153b8a
|
@ -1,23 +1,26 @@
|
||||||
|
local modname = minetest.get_current_modname()
|
||||||
|
local S = minetest.get_translator(modname)
|
||||||
|
|
||||||
mcl_credits = {
|
mcl_credits = {
|
||||||
players = {},
|
players = {},
|
||||||
}
|
}
|
||||||
|
|
||||||
mcl_credits.description = "A faithful Open Source clone of Minecraft"
|
mcl_credits.description = S("A faithful Open Source clone of Minecraft")
|
||||||
|
|
||||||
-- Sub-lists are sorted by number of commits, but the list should not be rearranged (-> new contributors are just added at the end of the list)
|
-- Sub-lists are sorted by number of commits, but the list should not be rearranged (-> new contributors are just added at the end of the list)
|
||||||
mcl_credits.people = {
|
mcl_credits.people = {
|
||||||
{"Creator of MineClone", 0x0A9400, {
|
{ S("Creator of MineClone"), 0x0A9400, {
|
||||||
"davedevils",
|
"davedevils",
|
||||||
}},
|
}},
|
||||||
{"Creator of MineClone2", 0xFBF837, {
|
{ S("Creator of MineClone2"), 0xFBF837, {
|
||||||
"Wuzzy",
|
"Wuzzy",
|
||||||
}},
|
}},
|
||||||
{"Maintainers", 0xFF51D5, {
|
{ S("Maintainers"), 0xFF51D5, {
|
||||||
"Fleckenstein",
|
"Fleckenstein",
|
||||||
"kay27",
|
"kay27",
|
||||||
"oilboi",
|
"oilboi",
|
||||||
}},
|
}},
|
||||||
{"Developers", 0xF84355, {
|
{ S("Developers"), 0xF84355, {
|
||||||
"bzoss",
|
"bzoss",
|
||||||
"AFCMS",
|
"AFCMS",
|
||||||
"epCode",
|
"epCode",
|
||||||
|
@ -30,7 +33,7 @@ mcl_credits.people = {
|
||||||
"Code-Sploit",
|
"Code-Sploit",
|
||||||
"NO11",
|
"NO11",
|
||||||
}},
|
}},
|
||||||
{"Contributors", 0x52FF00, {
|
{ S("Contributors"), 0x52FF00, {
|
||||||
"Laurent Rocher",
|
"Laurent Rocher",
|
||||||
"HimbeerserverDE",
|
"HimbeerserverDE",
|
||||||
"TechDudie",
|
"TechDudie",
|
||||||
|
@ -64,7 +67,7 @@ mcl_credits.people = {
|
||||||
"NO11",
|
"NO11",
|
||||||
"j45",
|
"j45",
|
||||||
}},
|
}},
|
||||||
{"Original Mod Authors", 0x343434, {
|
{ S("Original Mod Authors"), 0x343434, {
|
||||||
"Wuzzy",
|
"Wuzzy",
|
||||||
"Fleckenstein",
|
"Fleckenstein",
|
||||||
"BlockMen",
|
"BlockMen",
|
||||||
|
@ -96,12 +99,12 @@ mcl_credits.people = {
|
||||||
"jordan4ibanez",
|
"jordan4ibanez",
|
||||||
"paramat",
|
"paramat",
|
||||||
}},
|
}},
|
||||||
{"3D Models", 0x0019FF, {
|
{ S("3D Models"), 0x0019FF, {
|
||||||
"22i",
|
"22i",
|
||||||
"tobyplowy",
|
"tobyplowy",
|
||||||
"epCode",
|
"epCode",
|
||||||
}},
|
}},
|
||||||
{"Textures", 0xFF9705, {
|
{ S("Textures"), 0xFF9705, {
|
||||||
"XSSheep",
|
"XSSheep",
|
||||||
"Wuzzy",
|
"Wuzzy",
|
||||||
"kingoscargames",
|
"kingoscargames",
|
||||||
|
@ -110,7 +113,7 @@ mcl_credits.people = {
|
||||||
"yutyo",
|
"yutyo",
|
||||||
"NO11",
|
"NO11",
|
||||||
}},
|
}},
|
||||||
{"Translations", 0x00FF60, {
|
{ S("Translations"), 0x00FF60, {
|
||||||
"Wuzzy",
|
"Wuzzy",
|
||||||
"Rocher Laurent",
|
"Rocher Laurent",
|
||||||
"wuniversales",
|
"wuniversales",
|
||||||
|
@ -142,7 +145,7 @@ function mcl_credits.show(player)
|
||||||
ids = {
|
ids = {
|
||||||
player:hud_add({
|
player:hud_add({
|
||||||
hud_elem_type = "image",
|
hud_elem_type = "image",
|
||||||
text = "menu_bg.png",
|
text = "credits_bg.png",
|
||||||
position = {x = 0, y = 0},
|
position = {x = 0, y = 0},
|
||||||
alignment = {x = 1, y = 1},
|
alignment = {x = 1, y = 1},
|
||||||
scale = {x = -100, y = -100},
|
scale = {x = -100, y = -100},
|
||||||
|
@ -150,13 +153,22 @@ function mcl_credits.show(player)
|
||||||
}),
|
}),
|
||||||
player:hud_add({
|
player:hud_add({
|
||||||
hud_elem_type = "text",
|
hud_elem_type = "text",
|
||||||
text = "Sneak to skip",
|
text = S("Sneak to skip"),
|
||||||
position = {x = 1, y = 1},
|
position = {x = 1, y = 1},
|
||||||
alignment = {x = -1, y = -1},
|
alignment = {x = -1, y = -1},
|
||||||
offset = {x = -5, y = -5},
|
offset = {x = -5, y = -5},
|
||||||
z_index = 1001,
|
z_index = 1001,
|
||||||
number = 0xFFFFFF,
|
number = 0xFFFFFF,
|
||||||
})
|
}),
|
||||||
|
player:hud_add({
|
||||||
|
hud_elem_type = "text",
|
||||||
|
text = " "..S("Jump to speed up (additionally sprint)"),
|
||||||
|
position = {x = 0, y = 1},
|
||||||
|
alignment = {x = 1, y = -1},
|
||||||
|
offset = {x = -5, y = -5},
|
||||||
|
z_index = 1002,
|
||||||
|
number = 0xFFFFFF,
|
||||||
|
}),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
add_hud_element({
|
add_hud_element({
|
||||||
|
@ -216,13 +228,22 @@ end)
|
||||||
minetest.register_globalstep(function(dtime)
|
minetest.register_globalstep(function(dtime)
|
||||||
for _, huds in pairs(mcl_credits.players) do
|
for _, huds in pairs(mcl_credits.players) do
|
||||||
local player = huds.player
|
local player = huds.player
|
||||||
if not huds.new and player:get_player_control().sneak then
|
local control = player:get_player_control()
|
||||||
|
if not huds.new and control.sneak then
|
||||||
mcl_credits.hide(player)
|
mcl_credits.hide(player)
|
||||||
else
|
else
|
||||||
local moving = {}
|
local moving = {}
|
||||||
local any
|
local any
|
||||||
for id, y in pairs(huds.moving) do
|
for id, y in pairs(huds.moving) do
|
||||||
y = y - 1
|
y = y - 1
|
||||||
|
|
||||||
|
if control.jump then
|
||||||
|
y = y - 2
|
||||||
|
if control.aux1 then
|
||||||
|
y = y - 5
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
if y > -100 then
|
if y > -100 then
|
||||||
if id == huds.icon then
|
if id == huds.icon then
|
||||||
y = math.max(400, y)
|
y = math.max(400, y)
|
||||||
|
|
13
mods/HUD/mcl_credits/locale/mcl_credits.de.tr
Normal file
13
mods/HUD/mcl_credits/locale/mcl_credits.de.tr
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
# textdomain: mcl_credits
|
||||||
|
3D Models=3D Modelle
|
||||||
|
A faithful Open Source clone of Minecraft=Ein treuer Open-Source-Klon von Minecraft
|
||||||
|
Contributors=Mitwirkende
|
||||||
|
Creator of MineClone=Schöpfer von MineClone
|
||||||
|
Creator of MineClone2=Schöpfer von MineClone2
|
||||||
|
Developers=Entwickler
|
||||||
|
Jump to speed up (additionally sprint)=Springen, um zu beschleunigen (zusätzlich sprinten)
|
||||||
|
Maintainers=Betreuer
|
||||||
|
Original Mod Authors=Original-Mod-Autoren
|
||||||
|
Sneak to skip=Schleichen zum Überspringen
|
||||||
|
Textures=Texturen
|
||||||
|
Translations=Übersetzungen
|
14
mods/HUD/mcl_credits/locale/template.txt
Normal file
14
mods/HUD/mcl_credits/locale/template.txt
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
# textdomain: mcl_credits
|
||||||
|
3D Models=
|
||||||
|
A faithful Open Source clone of Minecraft=
|
||||||
|
Contributors=
|
||||||
|
Creator of MineClone=
|
||||||
|
Creator of MineClone2=
|
||||||
|
Developers=
|
||||||
|
Jump to speed up (additionally sprint)=
|
||||||
|
Maintainers=
|
||||||
|
MineClone5=
|
||||||
|
Original Mod Authors=
|
||||||
|
Sneak to skip=
|
||||||
|
Textures=
|
||||||
|
Translations=
|
Loading…
Reference in New Issue
Block a user