mirror of
https://github.com/minetest/minetest.git
synced 2024-08-19 04:54:18 +02:00
Change pitch fly binding to 'P', add to change keys menu (#8314)
This commit is contained in:
parent
a4677496f3
commit
4f7674d448
@ -212,7 +212,7 @@ keymap_freemove (Fly key) key KEY_KEY_K
|
|||||||
|
|
||||||
# Key for toggling pitch move mode.
|
# Key for toggling pitch move mode.
|
||||||
# See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
|
# See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
|
||||||
keymap_pitchmove (Pitch move key) key KEY_KEY_L
|
keymap_pitchmove (Pitch move key) key KEY_KEY_P
|
||||||
|
|
||||||
# Key for toggling fast mode.
|
# Key for toggling fast mode.
|
||||||
# See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
|
# See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
|
||||||
|
@ -204,7 +204,7 @@
|
|||||||
# Key for toggling pitch move mode.
|
# Key for toggling pitch move mode.
|
||||||
# See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
|
# See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
|
||||||
# type: key
|
# type: key
|
||||||
# keymap_pitchmove = KEY_KEY_L
|
# keymap_pitchmove = KEY_KEY_P
|
||||||
|
|
||||||
# Key for toggling fast mode.
|
# Key for toggling fast mode.
|
||||||
# See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
|
# See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3
|
||||||
@ -1291,7 +1291,7 @@
|
|||||||
# ask_reconnect_on_crash = false
|
# ask_reconnect_on_crash = false
|
||||||
|
|
||||||
# From how far clients know about objects, stated in mapblocks (16 nodes).
|
# From how far clients know about objects, stated in mapblocks (16 nodes).
|
||||||
#
|
#
|
||||||
# Setting this larger than active_block_range will also cause the server
|
# Setting this larger than active_block_range will also cause the server
|
||||||
# to maintain active objects up to this distance in the direction the
|
# to maintain active objects up to this distance in the direction the
|
||||||
# player is looking. (This can avoid mobs suddenly disappearing from view)
|
# player is looking. (This can avoid mobs suddenly disappearing from view)
|
||||||
@ -1804,7 +1804,7 @@
|
|||||||
# octaves = 3,
|
# octaves = 3,
|
||||||
# persistence = 0.5,
|
# persistence = 0.5,
|
||||||
# lacunarity = 2.0,
|
# lacunarity = 2.0,
|
||||||
# flags =
|
# flags =
|
||||||
# }
|
# }
|
||||||
|
|
||||||
# Second of two 3D noises that together define tunnels.
|
# Second of two 3D noises that together define tunnels.
|
||||||
@ -1817,7 +1817,7 @@
|
|||||||
# octaves = 3,
|
# octaves = 3,
|
||||||
# persistence = 0.5,
|
# persistence = 0.5,
|
||||||
# lacunarity = 2.0,
|
# lacunarity = 2.0,
|
||||||
# flags =
|
# flags =
|
||||||
# }
|
# }
|
||||||
|
|
||||||
# 3D noise defining giant caverns.
|
# 3D noise defining giant caverns.
|
||||||
@ -1830,7 +1830,7 @@
|
|||||||
# octaves = 5,
|
# octaves = 5,
|
||||||
# persistence = 0.63,
|
# persistence = 0.63,
|
||||||
# lacunarity = 2.0,
|
# lacunarity = 2.0,
|
||||||
# flags =
|
# flags =
|
||||||
# }
|
# }
|
||||||
|
|
||||||
# 3D noise defining terrain.
|
# 3D noise defining terrain.
|
||||||
@ -2213,7 +2213,7 @@
|
|||||||
# octaves = 5,
|
# octaves = 5,
|
||||||
# persistence = 0.63,
|
# persistence = 0.63,
|
||||||
# lacunarity = 2.0,
|
# lacunarity = 2.0,
|
||||||
# flags =
|
# flags =
|
||||||
# }
|
# }
|
||||||
|
|
||||||
# 3D noise defining structure of river canyon walls.
|
# 3D noise defining structure of river canyon walls.
|
||||||
@ -2226,7 +2226,7 @@
|
|||||||
# octaves = 4,
|
# octaves = 4,
|
||||||
# persistence = 0.75,
|
# persistence = 0.75,
|
||||||
# lacunarity = 2.0,
|
# lacunarity = 2.0,
|
||||||
# flags =
|
# flags =
|
||||||
# }
|
# }
|
||||||
|
|
||||||
# 3D noise defining giant caverns.
|
# 3D noise defining giant caverns.
|
||||||
@ -2239,7 +2239,7 @@
|
|||||||
# octaves = 5,
|
# octaves = 5,
|
||||||
# persistence = 0.63,
|
# persistence = 0.63,
|
||||||
# lacunarity = 2.0,
|
# lacunarity = 2.0,
|
||||||
# flags =
|
# flags =
|
||||||
# }
|
# }
|
||||||
|
|
||||||
# First of two 3D noises that together define tunnels.
|
# First of two 3D noises that together define tunnels.
|
||||||
@ -2252,7 +2252,7 @@
|
|||||||
# octaves = 3,
|
# octaves = 3,
|
||||||
# persistence = 0.5,
|
# persistence = 0.5,
|
||||||
# lacunarity = 2.0,
|
# lacunarity = 2.0,
|
||||||
# flags =
|
# flags =
|
||||||
# }
|
# }
|
||||||
|
|
||||||
# Second of two 3D noises that together define tunnels.
|
# Second of two 3D noises that together define tunnels.
|
||||||
@ -2265,7 +2265,7 @@
|
|||||||
# octaves = 3,
|
# octaves = 3,
|
||||||
# persistence = 0.5,
|
# persistence = 0.5,
|
||||||
# lacunarity = 2.0,
|
# lacunarity = 2.0,
|
||||||
# flags =
|
# flags =
|
||||||
# }
|
# }
|
||||||
|
|
||||||
## Mapgen Carpathian
|
## Mapgen Carpathian
|
||||||
@ -2465,7 +2465,7 @@
|
|||||||
# octaves = 5,
|
# octaves = 5,
|
||||||
# persistence = 0.55,
|
# persistence = 0.55,
|
||||||
# lacunarity = 2.0,
|
# lacunarity = 2.0,
|
||||||
# flags =
|
# flags =
|
||||||
# }
|
# }
|
||||||
|
|
||||||
# First of two 3D noises that together define tunnels.
|
# First of two 3D noises that together define tunnels.
|
||||||
@ -2478,7 +2478,7 @@
|
|||||||
# octaves = 3,
|
# octaves = 3,
|
||||||
# persistence = 0.5,
|
# persistence = 0.5,
|
||||||
# lacunarity = 2.0,
|
# lacunarity = 2.0,
|
||||||
# flags =
|
# flags =
|
||||||
# }
|
# }
|
||||||
|
|
||||||
# Second of two 3D noises that together define tunnels.
|
# Second of two 3D noises that together define tunnels.
|
||||||
@ -2491,7 +2491,7 @@
|
|||||||
# octaves = 3,
|
# octaves = 3,
|
||||||
# persistence = 0.5,
|
# persistence = 0.5,
|
||||||
# lacunarity = 2.0,
|
# lacunarity = 2.0,
|
||||||
# flags =
|
# flags =
|
||||||
# }
|
# }
|
||||||
|
|
||||||
# 3D noise defining giant caverns.
|
# 3D noise defining giant caverns.
|
||||||
@ -2504,7 +2504,7 @@
|
|||||||
# octaves = 5,
|
# octaves = 5,
|
||||||
# persistence = 0.63,
|
# persistence = 0.63,
|
||||||
# lacunarity = 2.0,
|
# lacunarity = 2.0,
|
||||||
# flags =
|
# flags =
|
||||||
# }
|
# }
|
||||||
|
|
||||||
## Mapgen Flat
|
## Mapgen Flat
|
||||||
@ -2596,7 +2596,7 @@
|
|||||||
# octaves = 3,
|
# octaves = 3,
|
||||||
# persistence = 0.5,
|
# persistence = 0.5,
|
||||||
# lacunarity = 2.0,
|
# lacunarity = 2.0,
|
||||||
# flags =
|
# flags =
|
||||||
# }
|
# }
|
||||||
|
|
||||||
# Second of two 3D noises that together define tunnels.
|
# Second of two 3D noises that together define tunnels.
|
||||||
@ -2609,7 +2609,7 @@
|
|||||||
# octaves = 3,
|
# octaves = 3,
|
||||||
# persistence = 0.5,
|
# persistence = 0.5,
|
||||||
# lacunarity = 2.0,
|
# lacunarity = 2.0,
|
||||||
# flags =
|
# flags =
|
||||||
# }
|
# }
|
||||||
|
|
||||||
## Mapgen Fractal
|
## Mapgen Fractal
|
||||||
@ -2759,7 +2759,7 @@
|
|||||||
# octaves = 3,
|
# octaves = 3,
|
||||||
# persistence = 0.5,
|
# persistence = 0.5,
|
||||||
# lacunarity = 2.0,
|
# lacunarity = 2.0,
|
||||||
# flags =
|
# flags =
|
||||||
# }
|
# }
|
||||||
|
|
||||||
# Second of two 3D noises that together define tunnels.
|
# Second of two 3D noises that together define tunnels.
|
||||||
@ -2772,7 +2772,7 @@
|
|||||||
# octaves = 3,
|
# octaves = 3,
|
||||||
# persistence = 0.5,
|
# persistence = 0.5,
|
||||||
# lacunarity = 2.0,
|
# lacunarity = 2.0,
|
||||||
# flags =
|
# flags =
|
||||||
# }
|
# }
|
||||||
|
|
||||||
## Mapgen Valleys
|
## Mapgen Valleys
|
||||||
@ -2844,7 +2844,7 @@
|
|||||||
# octaves = 3,
|
# octaves = 3,
|
||||||
# persistence = 0.5,
|
# persistence = 0.5,
|
||||||
# lacunarity = 2.0,
|
# lacunarity = 2.0,
|
||||||
# flags =
|
# flags =
|
||||||
# }
|
# }
|
||||||
|
|
||||||
# Second of two 3D noises that together define tunnels.
|
# Second of two 3D noises that together define tunnels.
|
||||||
@ -2857,7 +2857,7 @@
|
|||||||
# octaves = 3,
|
# octaves = 3,
|
||||||
# persistence = 0.5,
|
# persistence = 0.5,
|
||||||
# lacunarity = 2.0,
|
# lacunarity = 2.0,
|
||||||
# flags =
|
# flags =
|
||||||
# }
|
# }
|
||||||
|
|
||||||
# The depth of dirt or other biome filler node.
|
# The depth of dirt or other biome filler node.
|
||||||
@ -2883,7 +2883,7 @@
|
|||||||
# octaves = 6,
|
# octaves = 6,
|
||||||
# persistence = 0.63,
|
# persistence = 0.63,
|
||||||
# lacunarity = 2.0,
|
# lacunarity = 2.0,
|
||||||
# flags =
|
# flags =
|
||||||
# }
|
# }
|
||||||
|
|
||||||
# Defines large-scale river channel structure.
|
# Defines large-scale river channel structure.
|
||||||
@ -2935,7 +2935,7 @@
|
|||||||
# octaves = 6,
|
# octaves = 6,
|
||||||
# persistence = 0.8,
|
# persistence = 0.8,
|
||||||
# lacunarity = 2.0,
|
# lacunarity = 2.0,
|
||||||
# flags =
|
# flags =
|
||||||
# }
|
# }
|
||||||
|
|
||||||
# Amplifies the valleys.
|
# Amplifies the valleys.
|
||||||
@ -3025,4 +3025,3 @@
|
|||||||
# so see a full list at https://content.minetest.net/help/content_flags/
|
# so see a full list at https://content.minetest.net/help/content_flags/
|
||||||
# type: string
|
# type: string
|
||||||
# contentdb_flag_blacklist = nonfree, desktop_default
|
# contentdb_flag_blacklist = nonfree, desktop_default
|
||||||
|
|
||||||
|
@ -82,7 +82,7 @@ void set_default_settings(Settings *settings)
|
|||||||
settings->setDefault("keymap_console", "KEY_F10");
|
settings->setDefault("keymap_console", "KEY_F10");
|
||||||
settings->setDefault("keymap_rangeselect", "KEY_KEY_R");
|
settings->setDefault("keymap_rangeselect", "KEY_KEY_R");
|
||||||
settings->setDefault("keymap_freemove", "KEY_KEY_K");
|
settings->setDefault("keymap_freemove", "KEY_KEY_K");
|
||||||
settings->setDefault("keymap_pitchmove", "KEY_KEY_L");
|
settings->setDefault("keymap_pitchmove", "KEY_KEY_P");
|
||||||
settings->setDefault("keymap_fastmove", "KEY_KEY_J");
|
settings->setDefault("keymap_fastmove", "KEY_KEY_J");
|
||||||
settings->setDefault("keymap_noclip", "KEY_KEY_H");
|
settings->setDefault("keymap_noclip", "KEY_KEY_H");
|
||||||
settings->setDefault("keymap_hotbar_next", "KEY_KEY_N");
|
settings->setDefault("keymap_hotbar_next", "KEY_KEY_N");
|
||||||
|
@ -50,7 +50,7 @@ enum
|
|||||||
GUI_ID_KEY_FAST_BUTTON,
|
GUI_ID_KEY_FAST_BUTTON,
|
||||||
GUI_ID_KEY_JUMP_BUTTON,
|
GUI_ID_KEY_JUMP_BUTTON,
|
||||||
GUI_ID_KEY_NOCLIP_BUTTON,
|
GUI_ID_KEY_NOCLIP_BUTTON,
|
||||||
GUI_ID_KEY_CINEMATIC_BUTTON,
|
GUI_ID_KEY_PITCH_MOVE,
|
||||||
GUI_ID_KEY_CHAT_BUTTON,
|
GUI_ID_KEY_CHAT_BUTTON,
|
||||||
GUI_ID_KEY_CMD_BUTTON,
|
GUI_ID_KEY_CMD_BUTTON,
|
||||||
GUI_ID_KEY_CMD_LOCAL_BUTTON,
|
GUI_ID_KEY_CMD_LOCAL_BUTTON,
|
||||||
@ -119,9 +119,9 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
|
|||||||
|
|
||||||
const float s = m_gui_scale;
|
const float s = m_gui_scale;
|
||||||
DesiredRect = core::rect<s32>(
|
DesiredRect = core::rect<s32>(
|
||||||
screensize.X / 2 - 745 * s / 2,
|
screensize.X / 2 - 835 * s / 2,
|
||||||
screensize.Y / 2 - 430 * s / 2,
|
screensize.Y / 2 - 430 * s / 2,
|
||||||
screensize.X / 2 + 745 * s / 2,
|
screensize.X / 2 + 835 * s / 2,
|
||||||
screensize.Y / 2 + 430 * s / 2
|
screensize.Y / 2 + 430 * s / 2
|
||||||
);
|
);
|
||||||
recalculateAbsolutePosition(false);
|
recalculateAbsolutePosition(false);
|
||||||
@ -155,13 +155,13 @@ void GUIKeyChangeMenu::regenerateGui(v2u32 screensize)
|
|||||||
|
|
||||||
{
|
{
|
||||||
core::rect<s32> rect(0, 0, 100 * s, 30 * s);
|
core::rect<s32> rect(0, 0, 100 * s, 30 * s);
|
||||||
rect += topleft + v2s32(offset.X + 120 * s, offset.Y - 5 * s);
|
rect += topleft + v2s32(offset.X + 150 * s, offset.Y - 5 * s);
|
||||||
const wchar_t *text = wgettext(k->key.name());
|
const wchar_t *text = wgettext(k->key.name());
|
||||||
k->button = Environment->addButton(rect, this, k->id, text);
|
k->button = Environment->addButton(rect, this, k->id, text);
|
||||||
delete[] text;
|
delete[] text;
|
||||||
}
|
}
|
||||||
if ((i + 1) % KMaxButtonPerColumns == 0) {
|
if ((i + 1) % KMaxButtonPerColumns == 0) {
|
||||||
offset.X += 230 * s;
|
offset.X += 260 * s;
|
||||||
offset.Y = 60 * s;
|
offset.Y = 60 * s;
|
||||||
} else {
|
} else {
|
||||||
offset += v2s32(0, 25 * s);
|
offset += v2s32(0, 25 * s);
|
||||||
@ -430,9 +430,9 @@ void GUIKeyChangeMenu::init_keys()
|
|||||||
this->add_key(GUI_ID_KEY_HOTBAR_NEXT_BUTTON,wgettext("Next item"), "keymap_hotbar_next");
|
this->add_key(GUI_ID_KEY_HOTBAR_NEXT_BUTTON,wgettext("Next item"), "keymap_hotbar_next");
|
||||||
this->add_key(GUI_ID_KEY_ZOOM_BUTTON, wgettext("Zoom"), "keymap_zoom");
|
this->add_key(GUI_ID_KEY_ZOOM_BUTTON, wgettext("Zoom"), "keymap_zoom");
|
||||||
this->add_key(GUI_ID_KEY_CAMERA_BUTTON, wgettext("Change camera"), "keymap_camera_mode");
|
this->add_key(GUI_ID_KEY_CAMERA_BUTTON, wgettext("Change camera"), "keymap_camera_mode");
|
||||||
this->add_key(GUI_ID_KEY_CINEMATIC_BUTTON, wgettext("Toggle Cinematic"), "keymap_cinematic");
|
|
||||||
this->add_key(GUI_ID_KEY_MINIMAP_BUTTON, wgettext("Toggle minimap"), "keymap_minimap");
|
this->add_key(GUI_ID_KEY_MINIMAP_BUTTON, wgettext("Toggle minimap"), "keymap_minimap");
|
||||||
this->add_key(GUI_ID_KEY_FLY_BUTTON, wgettext("Toggle fly"), "keymap_freemove");
|
this->add_key(GUI_ID_KEY_FLY_BUTTON, wgettext("Toggle fly"), "keymap_freemove");
|
||||||
|
this->add_key(GUI_ID_KEY_PITCH_MOVE, wgettext("Toggle pitchmove"), "keymap_pitchmove");
|
||||||
this->add_key(GUI_ID_KEY_FAST_BUTTON, wgettext("Toggle fast"), "keymap_fastmove");
|
this->add_key(GUI_ID_KEY_FAST_BUTTON, wgettext("Toggle fast"), "keymap_fastmove");
|
||||||
this->add_key(GUI_ID_KEY_NOCLIP_BUTTON, wgettext("Toggle noclip"), "keymap_noclip");
|
this->add_key(GUI_ID_KEY_NOCLIP_BUTTON, wgettext("Toggle noclip"), "keymap_noclip");
|
||||||
this->add_key(GUI_ID_KEY_MUTE_BUTTON, wgettext("Mute"), "keymap_mute");
|
this->add_key(GUI_ID_KEY_MUTE_BUTTON, wgettext("Mute"), "keymap_mute");
|
||||||
@ -451,4 +451,3 @@ void GUIKeyChangeMenu::init_keys()
|
|||||||
this->add_key(GUI_ID_KEY_CHATLOG_BUTTON, wgettext("Toggle chat log"), "keymap_toggle_chat");
|
this->add_key(GUI_ID_KEY_CHATLOG_BUTTON, wgettext("Toggle chat log"), "keymap_toggle_chat");
|
||||||
this->add_key(GUI_ID_KEY_FOG_BUTTON, wgettext("Toggle fog"), "keymap_toggle_fog");
|
this->add_key(GUI_ID_KEY_FOG_BUTTON, wgettext("Toggle fog"), "keymap_toggle_fog");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user