diff --git default.cfg default.cfg index 6df96d5..d5590e0 100644 --- default.cfg +++ default.cfg @@ -68,7 +68,7 @@ bind "LEFTARROW" "_left" bind "RIGHTARROW" "_right" bind "ALT" "_strafe" // creep -bind "CTRL" "_button5" +bind "CTRL" "_creep" bind "SHIFT" "_speed" bind "DEL" "_lookdown" bind "PGDN" "_lookup" diff --git guis/mainmenu_settings_controls.gui guis/mainmenu_settings_controls.gui index f6ad6f6..9273cd9 100644 --- guis/mainmenu_settings_controls.gui +++ guis/mainmenu_settings_controls.gui @@ -553,7 +553,7 @@ windowDef SettingsControlsCanvas bindDef CreepKey { rect SETTINGS_X_OFFSET_CONTROLS, 85, 110, MM_LINE_H - bind "_button5" + bind "_creep" BINDINGS_TEXT } @@ -1209,107 +1209,100 @@ windowDef SettingsControlsCanvas windowDef SCGeneralText1 { rect TEXT_X_OFFSET, 0, 230, MM_LINE_H - text "#str_02382" // Toggle Crouch + text "#str_02383" // Always Run SETTINGS_TEXT } windowDef SCGeneralText2 { rect TEXT_X_OFFSET, 17, 230, MM_LINE_H - text "#str_02383" // Always Run + text "Toggle Creep" // Toggle Creep SETTINGS_TEXT } windowDef SCGeneralText3 { rect TEXT_X_OFFSET, 34, 230, MM_LINE_H - text "#str_02384" // Toggle Lean + text "#str_02382" // Toggle Crouch SETTINGS_TEXT } windowDef SCGeneralText4 { rect TEXT_X_OFFSET, 51, 230, MM_LINE_H - text "#str_02385" // Free Look + text "#str_02384" // Toggle Lean SETTINGS_TEXT } - windowDef SCGeneralText41 + windowDef SCGeneralText5 { rect TEXT_X_OFFSET, 68, 230, MM_LINE_H text "#str_menu_ToggleSheathe" // Toggle Sheathe SETTINGS_TEXT } - windowDef SCGeneralText5 + windowDef SCGeneralText6 { rect TEXT_X_OFFSET, 85, 230, MM_LINE_H - text "#str_02441" // Invert Mouse + text "#str_02385" // Free Look SETTINGS_TEXT } - windowDef SCGeneralText6 + windowDef SCGeneralText7 { rect TEXT_X_OFFSET, 102, 230, MM_LINE_H - text "#str_02442" // Smooth Mouse + text "#str_02441" // Invert Mouse SETTINGS_TEXT } - windowDef SCGeneralText7 + windowDef SCGeneralText8 { rect TEXT_X_OFFSET, 119, 230, MM_LINE_H - text "#str_02443" // Mouse Sensitivity + text "#str_02442" // Smooth Mouse SETTINGS_TEXT } - /*windowDef SCGeneralText8 - { - rect TEXT_X_OFFSET, 119, 230, MM_LINE_H - text "Empty" - SETTINGS_TEXT - }*/ - windowDef SCGeneralText9 { rect TEXT_X_OFFSET, 136, 230, MM_LINE_H - text "#str_07312" // Objectives + text "#str_02443" // Mouse Sensitivity SETTINGS_TEXT } windowDef SCGeneralText10 { rect TEXT_X_OFFSET, 153, 230, MM_LINE_H - text "#str_07178" // Quicksave + text "#str_07312" // Objectives SETTINGS_TEXT } windowDef SCGeneralText11 { rect TEXT_X_OFFSET, 170, 230, MM_LINE_H - text "#str_07177" // Quickload + text "#str_07178" // Quicksave SETTINGS_TEXT } windowDef SCGeneralText12 { rect TEXT_X_OFFSET, 187, 230, MM_LINE_H - text "#str_02917" // Save Screenshot + text "#str_07177" // Quickload SETTINGS_TEXT } - /*windowDef SCGeneralText13 + windowDef SCGeneralText13 { - rect TEXT_X_OFFSET, 203, 230, MM_LINE_H - text "Empty" + rect TEXT_X_OFFSET, 204, 230, MM_LINE_H + text "#str_02917" // Save Screenshot SETTINGS_TEXT - }*/ + } choiceDef SCGeneralBind1 { rect SETTINGS_X_OFFSET, 0, 80, MM_LINE_H choices "#str_07300" // Disabled;Enabled values "0;1" - cvar "tdm_toggle_crouch" + cvar "in_alwaysRun" CHOICE_DEF } @@ -1318,7 +1311,7 @@ windowDef SettingsControlsCanvas rect SETTINGS_X_OFFSET, 17, 80, MM_LINE_H choices "#str_07300" // Disabled;Enabled values "0;1" - cvar "in_alwaysRun" + cvar "tdm_toggle_creep" CHOICE_DEF } @@ -1327,7 +1320,7 @@ windowDef SettingsControlsCanvas rect SETTINGS_X_OFFSET, 34, 80, MM_LINE_H choices "#str_07300" // Disabled;Enabled values "0;1" - cvar "pm_lean_toggle" + cvar "tdm_toggle_crouch" CHOICE_DEF } @@ -1336,11 +1329,11 @@ windowDef SettingsControlsCanvas rect SETTINGS_X_OFFSET, 51, 80, MM_LINE_H choices "#str_07300" // Disabled;Enabled values "0;1" - cvar "in_freeLook" + cvar "pm_lean_toggle" CHOICE_DEF } - choiceDef SCGeneralBind41 + choiceDef SCGeneralBind5 { rect SETTINGS_X_OFFSET, 68, 80, MM_LINE_H choices "#str_07300" // Disabled;Enabled @@ -1349,9 +1342,18 @@ windowDef SettingsControlsCanvas CHOICE_DEF } - choiceDef SCGeneralBind5 + choiceDef SCGeneralBind6 { rect SETTINGS_X_OFFSET, 85, 80, MM_LINE_H + choices "#str_07300" // Disabled;Enabled + values "0;1" + cvar "in_freeLook" + CHOICE_DEF + } + + choiceDef SCGeneralBind7 + { + rect SETTINGS_X_OFFSET, 102, 80, MM_LINE_H choices "#str_04221" // No;Yes values "0.022;-0.022" cvar "m_pitch" @@ -1360,7 +1362,7 @@ windowDef SettingsControlsCanvas windowDef SmoothMouseSlider { - rect SETTINGS_X_OFFSET_CONTROLS_GENERAL + 10, 107, 128, MM_SLIDER_H + rect SETTINGS_X_OFFSET_CONTROLS_GENERAL + 10, 124, 128, MM_SLIDER_H background "guis/assets/mainmenu/buttons_settingsmenu/slider_bg" matcolor 0, 0, 0, 1 noevents 1 @@ -1368,7 +1370,7 @@ windowDef SettingsControlsCanvas sliderDef SmoothMouse { - rect SETTINGS_X_OFFSET_CONTROLS_GENERAL + 10, 107, 71, 8 + rect SETTINGS_X_OFFSET_CONTROLS_GENERAL + 10, 124, 71, 8 forecolor 1, .8, .8, .85 matcolor 1, 1, 1, 1 low 1 @@ -1380,7 +1382,7 @@ windowDef SettingsControlsCanvas windowDef SensitivitySlider { - rect SETTINGS_X_OFFSET_CONTROLS_GENERAL + 10, 124, 128, MM_SLIDER_H + rect SETTINGS_X_OFFSET_CONTROLS_GENERAL + 10, 141, 128, MM_SLIDER_H background "guis/assets/mainmenu/buttons_settingsmenu/slider_bg" matcolor 0, 0, 0, 1 noevents 1 @@ -1388,7 +1390,7 @@ windowDef SettingsControlsCanvas sliderDef MouseSensitivity { - rect SETTINGS_X_OFFSET_CONTROLS_GENERAL + 10, 124, 71, 8 + rect SETTINGS_X_OFFSET_CONTROLS_GENERAL + 10, 141, 71, 8 forecolor 1, .8, .8, .85 matcolor 1, 1, 1, 1 low 1 @@ -1398,46 +1400,32 @@ windowDef SettingsControlsCanvas cvar "sensitivity" } - /*bindDef SCGeneralBind8 - { - rect SETTINGS_X_OFFSET_CONTROLS_GENERAL, 119, 110, MM_LINE_H - bind "_impulse51" - BINDINGS_TEXT - }*/ - - bindDef SCGeneralBind9 - { - rect SETTINGS_X_OFFSET_CONTROLS, 136, 110, MM_LINE_H - bind "_impulse19" - BINDINGS_TEXT - } - bindDef SCGeneralBind10 { rect SETTINGS_X_OFFSET_CONTROLS, 153, 110, MM_LINE_H - bind "savegame quick" + bind "_impulse19" BINDINGS_TEXT } bindDef SCGeneralBind11 { rect SETTINGS_X_OFFSET_CONTROLS, 170, 110, MM_LINE_H - bind "loadgame quick" + bind "savegame quick" BINDINGS_TEXT } bindDef SCGeneralBind12 { rect SETTINGS_X_OFFSET_CONTROLS, 187, 110, MM_LINE_H - bind "screenshot" + bind "loadgame quick" BINDINGS_TEXT } - /*bindDef SCGeneralBind13 + bindDef SCGeneralBind13 { - rect SETTINGS_X_OFFSET_CONTROLS, 203, 110, MM_LINE_H - bind "none" + rect SETTINGS_X_OFFSET_CONTROLS, 204, 110, MM_LINE_H + bind "screenshot" BINDINGS_TEXT - }*/ + } } }