diff --git a/iw4x/iw4x_00/images/button_ps3_back.iwi b/iw4x/iw4x_00/images/button_ps3_back.iwi new file mode 100644 index 0000000..8f404dd Binary files /dev/null and b/iw4x/iw4x_00/images/button_ps3_back.iwi differ diff --git a/iw4x/iw4x_00/images/button_ps3_circle.iwi b/iw4x/iw4x_00/images/button_ps3_circle.iwi new file mode 100644 index 0000000..8ba1093 Binary files /dev/null and b/iw4x/iw4x_00/images/button_ps3_circle.iwi differ diff --git a/iw4x/iw4x_00/images/button_ps3_cross.iwi b/iw4x/iw4x_00/images/button_ps3_cross.iwi new file mode 100644 index 0000000..6e96340 Binary files /dev/null and b/iw4x/iw4x_00/images/button_ps3_cross.iwi differ diff --git a/iw4x/iw4x_00/images/button_ps3_l1.iwi b/iw4x/iw4x_00/images/button_ps3_l1.iwi new file mode 100644 index 0000000..3b17bcf Binary files /dev/null and b/iw4x/iw4x_00/images/button_ps3_l1.iwi differ diff --git a/iw4x/iw4x_00/images/button_ps3_l2.iwi b/iw4x/iw4x_00/images/button_ps3_l2.iwi new file mode 100644 index 0000000..e39251c Binary files /dev/null and b/iw4x/iw4x_00/images/button_ps3_l2.iwi differ diff --git a/iw4x/iw4x_00/images/button_ps3_l3.iwi b/iw4x/iw4x_00/images/button_ps3_l3.iwi new file mode 100644 index 0000000..525053d Binary files /dev/null and b/iw4x/iw4x_00/images/button_ps3_l3.iwi differ diff --git a/iw4x/iw4x_00/images/button_ps3_r1.iwi b/iw4x/iw4x_00/images/button_ps3_r1.iwi new file mode 100644 index 0000000..95dbf13 Binary files /dev/null and b/iw4x/iw4x_00/images/button_ps3_r1.iwi differ diff --git a/iw4x/iw4x_00/images/button_ps3_r2.iwi b/iw4x/iw4x_00/images/button_ps3_r2.iwi new file mode 100644 index 0000000..0c3dcf6 Binary files /dev/null and b/iw4x/iw4x_00/images/button_ps3_r2.iwi differ diff --git a/iw4x/iw4x_00/images/button_ps3_r3.iwi b/iw4x/iw4x_00/images/button_ps3_r3.iwi new file mode 100644 index 0000000..fa25a1e Binary files /dev/null and b/iw4x/iw4x_00/images/button_ps3_r3.iwi differ diff --git a/iw4x/iw4x_00/images/button_ps3_square.iwi b/iw4x/iw4x_00/images/button_ps3_square.iwi new file mode 100644 index 0000000..a3b25d5 Binary files /dev/null and b/iw4x/iw4x_00/images/button_ps3_square.iwi differ diff --git a/iw4x/iw4x_00/images/button_ps3_start.iwi b/iw4x/iw4x_00/images/button_ps3_start.iwi new file mode 100644 index 0000000..0ab5830 Binary files /dev/null and b/iw4x/iw4x_00/images/button_ps3_start.iwi differ diff --git a/iw4x/iw4x_00/images/button_ps3_triangle.iwi b/iw4x/iw4x_00/images/button_ps3_triangle.iwi new file mode 100644 index 0000000..e5bfa7e Binary files /dev/null and b/iw4x/iw4x_00/images/button_ps3_triangle.iwi differ diff --git a/iw4x/iw4x_00/images/dpad_ps3_down.iwi b/iw4x/iw4x_00/images/dpad_ps3_down.iwi new file mode 100644 index 0000000..a0203c8 Binary files /dev/null and b/iw4x/iw4x_00/images/dpad_ps3_down.iwi differ diff --git a/iw4x/iw4x_00/images/dpad_ps3_left.iwi b/iw4x/iw4x_00/images/dpad_ps3_left.iwi new file mode 100644 index 0000000..a6d0343 Binary files /dev/null and b/iw4x/iw4x_00/images/dpad_ps3_left.iwi differ diff --git a/iw4x/iw4x_00/images/dpad_ps3_right.iwi b/iw4x/iw4x_00/images/dpad_ps3_right.iwi new file mode 100644 index 0000000..02f1824 Binary files /dev/null and b/iw4x/iw4x_00/images/dpad_ps3_right.iwi differ diff --git a/iw4x/iw4x_00/images/dpad_ps3_up.iwi b/iw4x/iw4x_00/images/dpad_ps3_up.iwi new file mode 100644 index 0000000..6dc6149 Binary files /dev/null and b/iw4x/iw4x_00/images/dpad_ps3_up.iwi differ diff --git a/iw4x/iw4x_00/images/hud_dpad_ps3.iwi b/iw4x/iw4x_00/images/hud_dpad_ps3.iwi new file mode 100644 index 0000000..8cfc8f5 Binary files /dev/null and b/iw4x/iw4x_00/images/hud_dpad_ps3.iwi differ diff --git a/iw4x/iw4x_00/localizedstrings/iw4x_english.str b/iw4x/iw4x_00/localizedstrings/iw4x_english.str index 977a34c..f331480 100644 --- a/iw4x/iw4x_00/localizedstrings/iw4x_english.str +++ b/iw4x/iw4x_00/localizedstrings/iw4x_english.str @@ -1009,6 +1009,18 @@ LANG_ENGLISH "Turn accepting inputs from gamepads on/off" REFERENCE MPUI_DESC_LOOK_INVERSION LANG_ENGLISH "Inverts the gamepad pitch axis (up/down)" +REFERENCE MENU_GPAD_STYLE +LANG_ENGLISH "Button Style" + +REFERENCE MPUI_DESC_GPAD_STYLE +LANG_ENGLISH "Switch between Xbox and PlayStation HUDs." + +REFERENCE MENU_GPAD_XBOX_CAPS +LANG_ENGLISH "Xbox" + +REFERENCE MENU_GPAD_PS_CAPS +LANG_ENGLISH "PlayStation" + REFERENCE MENU_SLOWDOWN_ENABLED LANG_ENGLISH "Enable slowdown aim assist" diff --git a/iw4x/iw4x_00/ui_mp/dpad_hd.menu b/iw4x/iw4x_00/ui_mp/dpad_hd.menu index b74090e..a01743e 100644 --- a/iw4x/iw4x_00/ui_mp/dpad_hd.menu +++ b/iw4x/iw4x_00/ui_mp/dpad_hd.menu @@ -43,7 +43,7 @@ textStyle 3 textFont 10 feeder 0 - visible when ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_present" ) ) + visible when ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) ) } itemDef { @@ -70,7 +70,7 @@ feeder 0 visible 1 exp text ( "^3" + keybinding( "+actionslot 1" ) ) - visible when ( ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_present" ) ) && actionslotusable( 1 ) ) + visible when ( ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) ) && actionslotusable( 1 ) ) } itemDef { @@ -94,7 +94,7 @@ textStyle 3 textFont 10 feeder 0 - visible when ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_present" ) ) + visible when ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) ) } itemDef { @@ -121,7 +121,7 @@ feeder 0 visible 1 exp text ( "^3" + keybinding( "+actionslot 3" ) ) - visible when ( ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_present" ) ) && actionslotusable( 3 ) ) + visible when ( ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) ) && actionslotusable( 3 ) ) } itemDef { @@ -145,7 +145,7 @@ textStyle 3 textFont 10 feeder 0 - visible when ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_present" ) ) + visible when ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) ) } itemDef { @@ -172,7 +172,7 @@ feeder 0 visible 1 exp text ( "^3" + keybinding( "+actionslot 4" ) ) - visible when ( ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_present" ) ) && actionslotusable( 4 ) ) + visible when ( ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) ) && actionslotusable( 4 ) ) } itemDef { @@ -183,7 +183,18 @@ foreColor 1 1 1 0.65 background "hud_dpad_xbox360" textScale 0.55 - visible when ( dvarbool( "gpad_enabled" ) && dvarint( "gpad_present" ) ) + visible when ( dvarbool( "gpad_enabled" ) && dvarint( "gpad_in_use" ) && !dvarbool( "gpad_style" ) ) + } + itemDef + { + rect -68.6667 -42.3333 42.6667 42.6667 10 10 + style 3 + decoration + visible 1 + foreColor 1 1 1 0.65 + background "hud_dpad_ps3" + textScale 0.55 + visible when ( dvarbool( "gpad_enabled" ) && dvarint( "gpad_in_use" ) && dvarbool( "gpad_style" ) ) } itemDef { @@ -194,7 +205,7 @@ foreColor 1 0.9 0.5 1 background "hud_dpad_arrow_left" textScale 0.55 - visible when ( ( dvarbool( "gpad_enabled" ) && dvarint( "gpad_present" ) ) && actionslotusable( 3 ) ) + visible when ( ( dvarbool( "gpad_enabled" ) && dvarint( "gpad_in_use" ) ) && actionslotusable( 3 ) ) } itemDef { @@ -209,7 +220,7 @@ textAlignY -3 textScale 0.3333 textStyle 3 - visible when ( dvarbool( "gpad_enabled" ) && dvarint( "gpad_present" ) ) + visible when ( dvarbool( "gpad_enabled" ) && dvarint( "gpad_in_use" ) ) } itemDef { @@ -221,7 +232,7 @@ background "hud_dpad_arrow_right" textScale 0.55 exp foreColor a ( 0.25 + ( sin( milliseconds( ) / 200 ) + 1 ) ) - visible when ( ( dvarbool( "gpad_enabled" ) && dvarint( "gpad_present" ) ) && actionslotusable( 4 ) ) + visible when ( ( dvarbool( "gpad_enabled" ) && dvarint( "gpad_in_use" ) ) && actionslotusable( 4 ) ) } itemDef { @@ -234,7 +245,7 @@ textAlignX -40 textScale 0.3333 textStyle 3 - visible when ( dvarbool( "gpad_enabled" ) && dvarint( "gpad_present" ) ) + visible when ( dvarbool( "gpad_enabled" ) && dvarint( "gpad_in_use" ) ) } } -} +} \ No newline at end of file diff --git a/iw4x/iw4x_00/ui_mp/pc_options_gamepad.menu b/iw4x/iw4x_00/ui_mp/pc_options_gamepad.menu index 1e89639..a4f7372 100644 --- a/iw4x/iw4x_00/ui_mp/pc_options_gamepad.menu +++ b/iw4x/iw4x_00/ui_mp/pc_options_gamepad.menu @@ -119,11 +119,12 @@ menuDef "@MENU_TACTICAL_ALT"; "buttons_tactical_alt"; "@MENU_LEFTY_ALT"; "buttons_lefty_alt"; "@MENU_NOMAD_ALT"; "buttons_nomad_alt"}, execNow "bindgpbuttonsconfigs";, ;, ON_GPAD_DISABLED, ON_GPAD_ENABLED) - PC_OPTIONS_DVARYESNO_RAW(4, "@MENU_SLOWDOWN_ENABLED", "gpad_slowdown_enabled", ;, "@MPUI_DESC_SLOWDOWN_ENABLED", ON_GPAD_DISABLED, ON_GPAD_ENABLED) - PC_OPTIONS_DVARYESNO_RAW(5, "@MENU_LOCKON_ENABLED", "gpad_lockon_enabled", ;, "@MPUI_DESC_LOCKON_ENABLED", ON_GPAD_DISABLED, ON_GPAD_ENABLED) - PC_OPTIONS_SEPERATOR(5) - PC_OPTIONS_DVARSLIDER_RAW(6, "@MENU_LOOK_SENSITIVITY", "input_viewSensitivity", 0.5, 4, 1.0, ;, ;, ;, ON_GPAD_DISABLED, ON_GPAD_ENABLED, ON_GPAD_ENABLED) - PC_OPTIONS_FLOATLIST_RAW(7, "@MENU_LOOK_SENSITIVITY_PRESET", "input_viewSensitivity", + PC_OPTIONS_FLOATLIST_RAW(4, "@MENU_GPAD_STYLE", "gpad_style", {"@MENU_GPAD_XBOX_CAPS" 0 "@MENU_GPAD_PS_CAPS" 1}, ;, "@MPUI_DESC_GPAD_STYLE", ON_GPAD_DISABLED, ON_GPAD_ENABLED) + PC_OPTIONS_DVARYESNO_RAW(5, "@MENU_SLOWDOWN_ENABLED", "gpad_slowdown_enabled", ;, "@MPUI_DESC_SLOWDOWN_ENABLED", ON_GPAD_DISABLED, ON_GPAD_ENABLED) + PC_OPTIONS_DVARYESNO_RAW(6, "@MENU_LOCKON_ENABLED", "gpad_lockon_enabled", ;, "@MPUI_DESC_LOCKON_ENABLED", ON_GPAD_DISABLED, ON_GPAD_ENABLED) + PC_OPTIONS_SEPERATOR(6) + PC_OPTIONS_DVARSLIDER_RAW(7, "@MENU_LOOK_SENSITIVITY", "input_viewSensitivity", 0.5, 4, 1.0, ;, ;, ;, ON_GPAD_DISABLED, ON_GPAD_ENABLED, ON_GPAD_ENABLED) + PC_OPTIONS_FLOATLIST_RAW(8, "@MENU_LOOK_SENSITIVITY_PRESET", "input_viewSensitivity", {"@MENU_SENSITIVITY_LOW_CAPS" SENSITIVITY_1 "@MENU_SENSITIVITY_MEDIUM_CAPS" SENSITIVITY_2 "3" SENSITIVITY_3 "@MENU_SENSITIVITY_HIGH_CAPS" SENSITIVITY_4 "5" SENSITIVITY_5 "6" SENSITIVITY_6 "@MENU_SENSITIVITY_VERY_HIGH_CAPS" SENSITIVITY_7 "8" SENSITIVITY_8 "9" SENSITIVITY_9 "@MENU_SENSITIVITY_INSANE_CAPS" SENSITIVITY_10}, diff --git a/zone/patch/iw4x_patch_mp.ff b/zone/patch/iw4x_patch_mp.ff index e9275b9..2873bab 100644 Binary files a/zone/patch/iw4x_patch_mp.ff and b/zone/patch/iw4x_patch_mp.ff differ