Looki2000/sussycraft-engine
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

fixed conflicts

Browse Source
This commit is contained in:
Kacper Kostka 2023-02-23 17:00:43 +01:00
commit 68e5f9525e
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
builtin/mainmenu/tab_about.lua
View File

@ -15,13 +15,22 @@
--with this program; if not, write to the Free Software Foundation, Inc., --with this program; if not, write to the Free Software Foundation, Inc.,
--51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. --51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-- https://github.com/orgs/minetest/teams/engine/members
local sussycraft_authors = { local sussycraft_authors = {
"SussyCraft Game Authors:", "SussyCraft Game Authors:",
"Kacper Kostka (kacperks) <kacperks@cubesoftware.xyz> (Programming, Textures)",
"Łukasz Brzostowski (Looki2000) <looki2000@cubesoftware.xyz> (Programming, Textures, 3D Models, Soundtrack)", "Kacper Kostka (kacperks) <kacperks@cubesoftware.xyz>",
"Karol Rostek (karoltoja200) discord:karoltoja200#6809 (Textures)", "(Programming, Textures)",
"Dawid Cholewiusz (D47 0_o) discord:D46 0_o#8952 (Structures builder)",
"Łukasz Brzostowski (Looki2000)",
"<electro.brzostek@gmail.com or looki2000@cubesoftware.xyz>",
"(Programming, Textures, 3D Models, Soundtrack, Sounds)",
"Karol Rostek (karoltoja200) discord:karoltoja200#6809",
"(Textures)",
"Dawid Cholewiusz (D47 0_o) discord:D46 0_o#8952",
"(Structures builder)",
"Kacper Brzostowski (wooden plank texture)", "Kacper Brzostowski (wooden plank texture)",
} }
local core_developers = { local core_developers = {
@ -159,6 +168,13 @@ return {
core.colorize("#ff0", fgettext("Previous Contributors")) core.colorize("#ff0", fgettext("Previous Contributors"))
}) })
prepare_credits(credit_list, previous_contributors) prepare_credits(credit_list, previous_contributors)
local excamation_marks_count = math.random(1, 30)
table.insert_all(credit_list, {
"",
"",
core.colorize("#f00", fgettext("AMOGUS IS SUS" .. string.rep("!", excamation_marks_count)))
})
local credit_fs, scroll_height = build_hacky_list(credit_list) local credit_fs, scroll_height = build_hacky_list(credit_list)
-- account for the visible portion -- account for the visible portion
scroll_height = math.max(0, scroll_height - 6.9) scroll_height = math.max(0, scroll_height - 6.9)

2
src/defaultsettings.cpp
View File

@ -466,7 +466,7 @@ void set_default_settings()
#ifdef HAVE_TOUCHSCREENGUI #ifdef HAVE_TOUCHSCREENGUI
settings->setDefault("touchtarget", "true"); settings->setDefault("touchtarget", "true");
settings->setDefault("touchscreen_threshold","5"); settings->setDefault("touchscreen_threshold","10");
settings->setDefault("fixed_virtual_joystick", "false"); settings->setDefault("fixed_virtual_joystick", "false");
settings->setDefault("virtual_joystick_triggers_aux1", "false"); settings->setDefault("virtual_joystick_triggers_aux1", "false");
settings->setDefault("clickable_chat_weblinks", "false"); settings->setDefault("clickable_chat_weblinks", "false");