Minor changes and fixes
parent
12055482d5
commit
2793e9c655
|
@ -78,8 +78,6 @@ src/cmake_config.h
|
||||||
src/cmake_config_githash.h
|
src/cmake_config_githash.h
|
||||||
src/lua/build/
|
src/lua/build/
|
||||||
locale/
|
locale/
|
||||||
!/games/*/files/*/locale
|
|
||||||
!/games/*/files/*/*/locale
|
|
||||||
.directory
|
.directory
|
||||||
.gradle/
|
.gradle/
|
||||||
*.cbp
|
*.cbp
|
||||||
|
|
|
@ -5,7 +5,7 @@ MultiCraft is an Open Source sandbox game inspired by [Minecraft](https://minecr
|
||||||
|
|
||||||
MultiCraft is based on the Minetest project, which is developed by a [number of contributors](https://github.com/minetest/minetest/graphs/contributors).
|
MultiCraft is based on the Minetest project, which is developed by a [number of contributors](https://github.com/minetest/minetest/graphs/contributors).
|
||||||
|
|
||||||
Copyright © 2014-2019 Maksim Gamarnik [MoNTE48] <MoNTE48@mail.ua> & MultiCraft Development Team.
|
Copyright © 2014-2021 Maksim Gamarnik [MoNTE48] <MoNTE48@mail.ua> & MultiCraft Development Team.
|
||||||
|
|
||||||
The engine and the game is licensed under LGPLv3 (or higher). Resources games licensed under CC-BY-SA 4.0, unless otherwise stated.
|
The engine and the game is licensed under LGPLv3 (or higher). Resources games licensed under CC-BY-SA 4.0, unless otherwise stated.
|
||||||
|
|
||||||
|
|
|
@ -32,4 +32,6 @@ dofile(gamepath .. "hud.lua")
|
||||||
dofile(gamepath .. "statbars.lua")
|
dofile(gamepath .. "statbars.lua")
|
||||||
dofile(gamepath .. "hunger.lua")
|
dofile(gamepath .. "hunger.lua")
|
||||||
|
|
||||||
|
core.features = {} -- dummy
|
||||||
|
|
||||||
profiler = nil
|
profiler = nil
|
||||||
|
|
|
@ -21,10 +21,13 @@ local multicraft_developers = {
|
||||||
"Maksim Gamarnik (MoNTE48) <MoNTE48@mail.ua>",
|
"Maksim Gamarnik (MoNTE48) <MoNTE48@mail.ua>",
|
||||||
"Bektur Mambetov (ubulem) <berkut87@gmail.com>",
|
"Bektur Mambetov (ubulem) <berkut87@gmail.com>",
|
||||||
"Alexander Zavrin (Ransom.00)",
|
"Alexander Zavrin (Ransom.00)",
|
||||||
|
"luk3yx",
|
||||||
|
"Nathan Salapat (NathanS21) <nathan@nathansalapat.com>",
|
||||||
|
"Vitaliy Lobachevskiy (numberZero) <numzer0@yandex.ru>",
|
||||||
|
"Jean-Patrick Guerrero (kilbith) <jeanpatrick.guerrero@gmail.com>",
|
||||||
|
"An0n3m0us",
|
||||||
"sfan5 <sfan5@live.de>",
|
"sfan5 <sfan5@live.de>",
|
||||||
"Stuart Jones (stujones11) <stujones111@gmail.com>",
|
"Stuart Jones (stujones11) <stujones111@gmail.com>",
|
||||||
"Jean-Patrick Guerrero (kilbith) <jeanpatrick.guerrero@gmail.com>",
|
|
||||||
"luk3yx",
|
|
||||||
"And other people who helped make the world better!"
|
"And other people who helped make the world better!"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -98,8 +101,8 @@ return {
|
||||||
cbf_formspec = function()
|
cbf_formspec = function()
|
||||||
local version = core.get_version()
|
local version = core.get_version()
|
||||||
return "label[0.1,-0.1;" ..
|
return "label[0.1,-0.1;" ..
|
||||||
"MultiCraft Open Source Project, ver. " .. version.string .. "\n" ..
|
"MultiCraft Open Source, ver. " .. version.string .. "\n" ..
|
||||||
"Copyright (C) 2014-2020 MultiCraft Development Team\n" ..
|
"Copyright (C) 2014-2021 MultiCraft Development Team\n" ..
|
||||||
"Licence: LGPLv3.0+ and CC-BY-SA 4.0\n" ..
|
"Licence: LGPLv3.0+ and CC-BY-SA 4.0\n" ..
|
||||||
"Home page: http://multicraft.world]" ..
|
"Home page: http://multicraft.world]" ..
|
||||||
"tablecolumns[color;text]" ..
|
"tablecolumns[color;text]" ..
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
*
|
||||||
|
!.gitignore
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit cf7922ffb3a81245a32fee5d4869098d52b0bd21
|
|
|
@ -42,7 +42,7 @@ bool MyEventReceiver::OnEvent(const SEvent &event)
|
||||||
if (isMenuActive()) {
|
if (isMenuActive()) {
|
||||||
#ifdef HAVE_TOUCHSCREENGUI
|
#ifdef HAVE_TOUCHSCREENGUI
|
||||||
if (m_touchscreengui)
|
if (m_touchscreengui)
|
||||||
m_touchscreengui->Toggle(false);
|
m_touchscreengui->hide();
|
||||||
#endif
|
#endif
|
||||||
return g_menumgr.preprocessEvent(event);
|
return g_menumgr.preprocessEvent(event);
|
||||||
}
|
}
|
||||||
|
|
|
@ -918,7 +918,7 @@ void TouchScreenGUI::Toggle(bool visible)
|
||||||
button.guibutton->setVisible(visible);
|
button.guibutton->setVisible(visible);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (m_joystick_btn_off->guibutton)
|
if (m_joystick_btn_off != nullptr && m_joystick_btn_off->guibutton)
|
||||||
m_joystick_btn_off->guibutton->setVisible(visible);
|
m_joystick_btn_off->guibutton->setVisible(visible);
|
||||||
|
|
||||||
// clear all active buttons
|
// clear all active buttons
|
||||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 814 B After Width: | Height: | Size: 790 B |
Binary file not shown.
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1014 B |
Loading…
Reference in New Issue