From a2ab013ba947de156f06434f95b93c8b48c4895a Mon Sep 17 00:00:00 2001 From: AdamTadeusz Date: Tue, 30 Apr 2024 09:07:16 +0100 Subject: [PATCH 01/13] first pass --- mp/game/neo/resource/neo_ui/Neo_ClassMenu.res | 35 +- .../resource/neo_ui/Neo_LoadoutMenu_Dev.res | 849 ++++++++---------- mp/game/neo/resource/neo_ui/Neo_TeamMenu.res | 18 +- mp/src/game/client/neo/c_neo_player.cpp | 29 +- .../neo/game_controls/neo_classmenu.cpp | 2 - .../neo/game_controls/neo_loadoutmenu.cpp | 30 +- .../client/neo/game_controls/neo_teammenu.cpp | 24 +- .../client/neo/game_controls/neo_teammenu.h | 7 +- mp/src/game/client/particlemgr.h | 2 +- mp/src/lib/public/mathlib.pdb | Bin 0 -> 315392 bytes mp/src/lib/public/raytrace.pdb | Bin 0 -> 405504 bytes mp/src/lib/public/tier1.pdb | Bin 0 -> 1126400 bytes mp/src/lib/public/vgui_controls.pdb | Bin 0 -> 3878912 bytes mp/src/public/tier0/memalloc.h | 2 +- 14 files changed, 460 insertions(+), 538 deletions(-) create mode 100644 mp/src/lib/public/mathlib.pdb create mode 100644 mp/src/lib/public/raytrace.pdb create mode 100644 mp/src/lib/public/tier1.pdb create mode 100644 mp/src/lib/public/vgui_controls.pdb diff --git a/mp/game/neo/resource/neo_ui/Neo_ClassMenu.res b/mp/game/neo/resource/neo_ui/Neo_ClassMenu.res index 4a29df5af..ad85ac943 100644 --- a/mp/game/neo/resource/neo_ui/Neo_ClassMenu.res +++ b/mp/game/neo/resource/neo_ui/Neo_ClassMenu.res @@ -4,11 +4,11 @@ { "ControlName" "CNeoClassMenu" "fieldName" "classmenu" - "xpos" "325" - "ypos" "176" + "xpos" "cs-0.5" + "ypos" "cs-0.5" "wide" "430" "tall" "432" - "autoResize" "1" + "autoResize" "0" "pinCorner" "0" "visible" "1" "enabled" "1" @@ -20,11 +20,11 @@ { "ControlName" "Label" "fieldName" "TitleLabel" - "xpos" "165" + "xpos" "cs-0.5" "ypos" "0" "wide" "100" "tall" "16" - "autoResize" "1" + "autoResize" "0" "pinCorner" "0" "visible" "1" "enabled" "1" @@ -37,34 +37,34 @@ } "IconPanel1" { - "ControlName" "IconPanel" + "ControlName" "ImagePanel" "fieldName" "IconPanel1" "xpos" "87" "ypos" "20" "wide" "256" "tall" "32" - "autoResize" "1" + "autoResize" "0" "pinCorner" "0" "visible" "1" "enabled" "1" "tabPosition" "0" - "image" "vgui/choose_class" + "image" "choose_class" "scaleImage" "0" } "IconPanel2" { - "ControlName" "IconPanel" + "ControlName" "ImagePanel" "fieldName" "IconPanel2" "xpos" "87" "ypos" "90" "wide" "256" "tall" "32" - "autoResize" "1" + "autoResize" "0" "pinCorner" "0" "visible" "1" "enabled" "1" "tabPosition" "0" - "image" "vgui/choose_playermodel" + "image" "choose_playermodel" "scaleImage" "0" } "Scout_Button" @@ -75,7 +75,7 @@ "ypos" "55" "wide" "128" "tall" "30" - "autoResize" "1" + "autoResize" "0" "pinCorner" "0" "visible" "1" "enabled" "1" @@ -97,7 +97,7 @@ "ypos" "55" "wide" "128" "tall" "30" - "autoResize" "1" + "autoResize" "0" "pinCorner" "0" "visible" "1" "enabled" "1" @@ -118,7 +118,7 @@ "ypos" "55" "wide" "128" "tall" "30" - "autoResize" "1" + "autoResize" "0" "pinCorner" "0" "visible" "1" "enabled" "1" @@ -150,6 +150,7 @@ "wrap" "0" "Command" "SetVariant 0" "Default" "0" + "image" "cm/jinrai_assault01" } "Model_ImagePanel2" { @@ -170,6 +171,7 @@ "wrap" "0" "Command" "SetVariant 1" "Default" "0" + "image" "cm/jinrai_assault02" } "Model_ImagePanel3" { @@ -190,16 +192,17 @@ "wrap" "0" "Command" "SetVariant 2" "Default" "0" + "image" "cm/jinrai_assault03" } "Back_Button" { "ControlName" "Button" "fieldName" "Back_Button" "xpos" "8" - "ypos" "150" + "ypos" "394" "wide" "207" "tall" "30" - "autoResize" "1" + "autoResize" "0" "pinCorner" "0" "visible" "1" "enabled" "1" diff --git a/mp/game/neo/resource/neo_ui/Neo_LoadoutMenu_Dev.res b/mp/game/neo/resource/neo_ui/Neo_LoadoutMenu_Dev.res index 54ae3805c..5ddec7ed8 100644 --- a/mp/game/neo/resource/neo_ui/Neo_LoadoutMenu_Dev.res +++ b/mp/game/neo/resource/neo_ui/Neo_LoadoutMenu_Dev.res @@ -1,356 +1,127 @@ "resource/neo_ui/Neo_LoadoutMenu_Dev.res" { - "loadout_dev" - { - "ControlName" "CNeoLoadoutMenu_Dev" - "fieldName" "loadout_dev" - "xpos" "415" - "ypos" "159" - "wide" "850" - "tall" "450" - "autoResize" "1" - "pinCorner" "0" + "neo_loadoutmenu" + { + "ControlName" "CNeoLoadoutMenu" + "fieldName" "neo_loadoutmenu" + "xpos" "cs-0.5" + "ypos" "cs-0.5" + "wide" "800" + "tall" "646" + "autoResize" "0" + "pinCorner" "0" + "RoundedCorners" "15" + "pin_corner_to_sibling" "0" + "pin_to_sibling_corner" "0" "visible" "1" "enabled" "1" "tabPosition" "0" "settitlebarvisible" "0" "title" "#Frame_Untitled" + "bgcolor" "200 200 200 255" } - "Weapon_ImagePanel" - { - "ControlName" "ImagePanel" - "fieldName" "Weapon_ImagePanel" - "xpos" "220" - "ypos" "25" - "wide" "620" - "tall" "385" - "autoResize" "1" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "tabPosition" "0" - "image" "loadout/none" - "scaleImage" "0" - } - "frame_topGrip" - { - "ControlName" "Panel" - "fieldName" "frame_topGrip" - "xpos" "8" - "ypos" "0" - "wide" "834" - "tall" "5" - "autoResize" "1" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "tabPosition" "0" - } - "frame_bottomGrip" - { - "ControlName" "Panel" - "fieldName" "frame_bottomGrip" - "xpos" "8" - "ypos" "445" - "wide" "824" - "tall" "5" - "autoResize" "1" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "tabPosition" "0" - } - "frame_leftGrip" - { - "ControlName" "Panel" - "fieldName" "frame_leftGrip" - "xpos" "0" - "ypos" "8" - "wide" "5" - "tall" "434" - "autoResize" "1" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "tabPosition" "0" - } - "frame_rightGrip" - { - "ControlName" "Panel" - "fieldName" "frame_rightGrip" - "xpos" "845" - "ypos" "8" - "wide" "5" - "tall" "424" - "autoResize" "1" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "tabPosition" "0" - } - "frame_tlGrip" - { - "ControlName" "Panel" - "fieldName" "frame_tlGrip" - "xpos" "0" - "ypos" "0" - "wide" "8" - "tall" "8" - "autoResize" "1" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "tabPosition" "0" - } - "frame_trGrip" - { - "ControlName" "Panel" - "fieldName" "frame_trGrip" - "xpos" "842" - "ypos" "0" - "wide" "8" - "tall" "8" - "autoResize" "1" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "tabPosition" "0" - } - "frame_blGrip" - { - "ControlName" "Panel" - "fieldName" "frame_blGrip" - "xpos" "0" - "ypos" "442" - "wide" "8" - "tall" "8" - "autoResize" "1" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "tabPosition" "0" - } - "frame_brGrip" - { - "ControlName" "Panel" - "fieldName" "frame_brGrip" - "xpos" "832" - "ypos" "432" - "wide" "18" - "tall" "18" - "autoResize" "1" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "tabPosition" "0" - } - "frame_caption" - { - "ControlName" "Panel" - "fieldName" "frame_caption" - "xpos" "0" - "ypos" "0" - "wide" "840" - "tall" "23" - "autoResize" "1" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "tabPosition" "0" - } - "frame_minimize" - { - "ControlName" "Button" - "fieldName" "frame_minimize" - "xpos" "0" - "ypos" "0" - "wide" "18" - "tall" "18" - "autoResize" "1" - "pinCorner" "0" - "visible" "0" - "enabled" "1" - "tabPosition" "0" - "labelText" "0" - "textAlignment" "north-west" - "dulltext" "0" - "brighttext" "0" - "wrap" "0" - "Default" "0" - } - "frame_maximize" - { - "ControlName" "Button" - "fieldName" "frame_maximize" - "xpos" "0" - "ypos" "0" - "wide" "18" - "tall" "18" - "autoResize" "1" - "pinCorner" "0" - "visible" "0" - "enabled" "1" - "tabPosition" "0" - "labelText" "1" - "textAlignment" "north-west" - "dulltext" "0" - "brighttext" "0" - "wrap" "0" - "Default" "0" - } - "frame_mintosystray" - { - "ControlName" "Button" - "fieldName" "frame_mintosystray" - "xpos" "0" - "ypos" "0" - "wide" "18" - "tall" "18" - "autoResize" "1" - "pinCorner" "0" - "visible" "0" - "enabled" "1" - "tabPosition" "0" - "labelText" "o" - "textAlignment" "north-west" - "dulltext" "0" - "brighttext" "0" - "wrap" "0" - "Command" "MinimizeToSysTray" - "Default" "0" - } - "frame_close" - { - "ControlName" "Button" - "fieldName" "frame_close" - "xpos" "0" - "ypos" "0" - "wide" "18" - "tall" "18" - "autoResize" "1" - "pinCorner" "0" - "visible" "0" - "enabled" "1" - "tabPosition" "0" - "labelText" "r" - "textAlignment" "north-west" - "dulltext" "0" - "brighttext" "0" - "wrap" "0" - "Default" "0" - } - "frame_menu" - { - "ControlName" "FrameSystemButton" - "fieldName" "frame_menu" - "xpos" "7" - "ypos" "8" - "wide" "18" - "tall" "18" - "autoResize" "1" - "pinCorner" "0" - "visible" "0" - "enabled" "1" - "tabPosition" "0" - "textAlignment" "west" - "dulltext" "0" - "brighttext" "0" - "wrap" "0" - "Default" "0" - } +// "Weapon_ImagePanel" +// { +// "ControlName" "ImagePanel" +// "fieldName" "Weapon_ImagePanel" +// "xpos" "219" +// "ypos" "24" +// "wide" "619" +// "tall" "384" +// "autoResize" "1" +// "pinCorner" "0" +// "RoundedCorners" "15" +// "pin_corner_to_sibling" "0" +// "pin_to_sibling_corner" "0" +// "visible" "1" +// "enabled" "1" +// "tabPosition" "0" +// "image" "loadout/none" +// "scaleImage" "0" +// "scaleAmount" "0.000000" +// "tileImage" "0" +// "tileHorizontally" "0" +// "tileVertically" "0" +// } "TitleLabel" { "ControlName" "Label" "fieldName" "TitleLabel" - "xpos" "250" + "xpos" "0" "ypos" "0" - "wide" "200" + "wide" "800" // why f not working "tall" "16" "autoResize" "1" "pinCorner" "0" + "RoundedCorners" "15" + "pin_corner_to_sibling" "0" + "pin_to_sibling_corner" "0" "visible" "1" "enabled" "1" "tabPosition" "0" "labelText" "LOADOUT MENU" - "textAlignment" "east" - "dulltext" "0" - "brighttext" "0" - "wrap" "0" - } - "Scout_Button" - { - "ControlName" "Button" - "fieldName" "Scout_Button" - "xpos" "616" - "ypos" "291" - "wide" "128" - "tall" "25" - "autoResize" "1" - "pinCorner" "0" - "visible" "0" - "enabled" "0" - "tabPosition" "0" - "labelText" "Misc1" - "textAlignment" "center" + "textAlignment" "north" "dulltext" "0" "brighttext" "0" - "Font" "Default" "wrap" "0" - "Command" "setclass 1" - "Default" "0" - } - "Misc2" - { - "ControlName" "Button" - "fieldName" "Misc2" - "xpos" "615" - "ypos" "322" - "wide" "128" - "tall" "25" - "autoResize" "1" - "pinCorner" "0" - "visible" "0" - "enabled" "0" - "tabPosition" "0" - "labelText" "Misc2" - "textAlignment" "center" - "dulltext" "0" - "brighttext" "0" - "wrap" "0" - "Command" "setclass 2" - "Default" "0" - } - "Done_Button" + "centerwrap" "0" + "textinsetx" "0" + "textinsety" "0" + "auto_wide_tocontents" "0" + "use_proportional_insets" "0" + "bgcolor" "51 51 51 255" + } +// "Done_Button" +// { +// "ControlName" "Button" +// "fieldName" "Done_Button" +// "xpos" "776" +// "ypos" "417" +// "wide" "64" +// "tall" "24" +// "autoResize" "1" +// "pinCorner" "0" +// "RoundedCorners" "15" +// "pin_corner_to_sibling" "0" +// "pin_to_sibling_corner" "0" +// "visible" "1" +// "enabled" "1" +// "tabPosition" "0" +// "labelText" "GO!" +// "textAlignment" "center" +// "dulltext" "0" +// "brighttext" "0" +// "wrap" "0" +// "centerwrap" "0" +// "textinsetx" "6" +// "textinsety" "0" +// "auto_wide_tocontents" "0" +// "use_proportional_insets" "0" +// "command" "playerready" +// "Default" "0" +// } + "Button1Image" { - "ControlName" "Button" - "fieldName" "Done_Button" - "xpos" "776" - "ypos" "418" - "wide" "64" - "tall" "25" - "autoResize" "1" - "pinCorner" "0" - "visible" "1" - "enabled" "0" - "tabPosition" "0" - "labelText" "GO!" - "textAlignment" "center" - "dulltext" "0" - "brighttext" "0" - "wrap" "0" - "Command" "playerready" - "Default" "0" + "ControlName" "ImagePanel" + "xpos" "8" + "ypos" "64" + "wide" "256" + "tall" "128" + "image" "loadout/loadout_mpn" } "Button1" { "ControlName" "Button" "fieldName" "Button1" - "xpos" "10" - "ypos" "25" - "wide" "200" - "tall" "25" - "autoResize" "1" - "pinCorner" "0" + "xpos" "8" + "ypos" "64" + "wide" "256" + "tall" "128" + "autoResize" "0" + "pinCorner" "0" + "RoundedCorners" "15" + "pin_corner_to_sibling" "0" + "pin_to_sibling_corner" "0" "visible" "1" "enabled" "1" "tabPosition" "0" @@ -360,19 +131,36 @@ "brighttext" "0" "Font" "Default" "wrap" "0" - "Command" "loadout 0" + "centerwrap" "0" + "textinsetx" "6" + "textinsety" "0" + "auto_wide_tocontents" "0" + "use_proportional_insets" "0" + "command" "loadout 0" "Default" "0" } + "Button2Image" + { + "ControlName" "ImagePanel" + "xpos" "272" + "ypos" "64" + "wide" "256" + "tall" "128" + "image" "loadout/loadout_srm" + } "Button2" { "ControlName" "Button" "fieldName" "Button2" - "xpos" "10" - "ypos" "55" - "wide" "200" - "tall" "25" - "autoResize" "1" - "pinCorner" "0" + "xpos" "272" + "ypos" "64" + "wide" "256" + "tall" "128" + "autoResize" "0" + "pinCorner" "0" + "RoundedCorners" "15" + "pin_corner_to_sibling" "0" + "pin_to_sibling_corner" "0" "visible" "1" "enabled" "1" "tabPosition" "0" @@ -382,19 +170,36 @@ "brighttext" "0" "Font" "Default" "wrap" "0" - "Command" "loadout 1" + "centerwrap" "0" + "textinsetx" "6" + "textinsety" "0" + "auto_wide_tocontents" "0" + "use_proportional_insets" "0" + "command" "loadout 1" "Default" "0" } + "Button3Image" + { + "ControlName" "ImagePanel" + "xpos" "536" + "ypos" "64" + "wide" "256" + "tall" "128" + "image" "loadout/loadout_srms" + } "Button3" { "ControlName" "Button" "fieldName" "Button3" - "xpos" "10" - "ypos" "85" - "wide" "200" - "tall" "25" - "autoResize" "1" - "pinCorner" "0" + "xpos" "536" + "ypos" "64" + "wide" "256" + "tall" "128" + "autoResize" "0" + "pinCorner" "0" + "RoundedCorners" "15" + "pin_corner_to_sibling" "0" + "pin_to_sibling_corner" "0" "visible" "1" "enabled" "1" "tabPosition" "0" @@ -404,19 +209,36 @@ "brighttext" "0" "Font" "Default" "wrap" "0" - "Command" "loadout 2" + "centerwrap" "0" + "textinsetx" "6" + "textinsety" "0" + "auto_wide_tocontents" "0" + "use_proportional_insets" "0" + "command" "loadout 2" "Default" "0" } + "Button4Image" + { + "ControlName" "ImagePanel" + "xpos" "8" + "ypos" "200" + "wide" "256" + "tall" "128" + "image" "loadout/loadout_jitte" + } "Button4" { "ControlName" "Button" "fieldName" "Button4" - "xpos" "10" - "ypos" "115" - "wide" "200" - "tall" "25" - "autoResize" "1" - "pinCorner" "0" + "xpos" "8" + "ypos" "200" + "wide" "256" + "tall" "128" + "autoResize" "0" + "pinCorner" "0" + "RoundedCorners" "15" + "pin_corner_to_sibling" "0" + "pin_to_sibling_corner" "0" "visible" "1" "enabled" "1" "tabPosition" "0" @@ -426,19 +248,36 @@ "brighttext" "0" "Font" "Default" "wrap" "0" - "Command" "loadout 3" + "centerwrap" "0" + "textinsetx" "6" + "textinsety" "0" + "auto_wide_tocontents" "0" + "use_proportional_insets" "0" + "command" "loadout 3" "Default" "0" } + "Button5Image" + { + "ControlName" "ImagePanel" + "xpos" "272" + "ypos" "200" + "wide" "256" + "tall" "128" + "image" "loadout/loadout_jittes" + } "Button5" { "ControlName" "Button" "fieldName" "Button5" - "xpos" "10" - "ypos" "145" - "wide" "200" - "tall" "25" - "autoResize" "1" - "pinCorner" "0" + "xpos" "272" + "ypos" "200" + "wide" "256" + "tall" "128" + "autoResize" "0" + "pinCorner" "0" + "RoundedCorners" "15" + "pin_corner_to_sibling" "0" + "pin_to_sibling_corner" "0" "visible" "1" "enabled" "1" "tabPosition" "0" @@ -448,19 +287,36 @@ "brighttext" "0" "Font" "Default" "wrap" "0" - "Command" "loadout 4" + "centerwrap" "0" + "textinsetx" "6" + "textinsety" "0" + "auto_wide_tocontents" "0" + "use_proportional_insets" "0" + "command" "loadout 4" "Default" "0" } + "Button6Image" + { + "ControlName" "ImagePanel" + "xpos" "536" + "ypos" "200" + "wide" "256" + "tall" "128" + "image" "loadout/loadout_zr68c" + } "Button6" { "ControlName" "Button" "fieldName" "Button6" - "xpos" "10" - "ypos" "175" - "wide" "200" - "tall" "25" - "autoResize" "1" - "pinCorner" "0" + "xpos" "536" + "ypos" "200" + "wide" "256" + "tall" "128" + "autoResize" "0" + "pinCorner" "0" + "RoundedCorners" "15" + "pin_corner_to_sibling" "0" + "pin_to_sibling_corner" "0" "visible" "1" "enabled" "1" "tabPosition" "0" @@ -470,19 +326,36 @@ "brighttext" "0" "Font" "Default" "wrap" "0" - "Command" "loadout 5" + "centerwrap" "0" + "textinsetx" "6" + "textinsety" "0" + "auto_wide_tocontents" "0" + "use_proportional_insets" "0" + "command" "loadout 5" "Default" "0" } + "Button7Image" + { + "ControlName" "ImagePanel" + "xpos" "8" + "ypos" "336" + "wide" "256" + "tall" "128" + "image" "loadout/loadout_zr68s" + } "Button7" { "ControlName" "Button" "fieldName" "Button7" - "xpos" "10" - "ypos" "205" - "wide" "200" - "tall" "25" - "autoResize" "1" - "pinCorner" "0" + "xpos" "8" + "ypos" "336" + "wide" "256" + "tall" "128" + "autoResize" "0" + "pinCorner" "0" + "RoundedCorners" "15" + "pin_corner_to_sibling" "0" + "pin_to_sibling_corner" "0" "visible" "1" "enabled" "1" "tabPosition" "0" @@ -492,19 +365,36 @@ "brighttext" "0" "Font" "Default" "wrap" "0" - "Command" "loadout 6" + "centerwrap" "0" + "textinsetx" "6" + "textinsety" "0" + "auto_wide_tocontents" "0" + "use_proportional_insets" "0" + "command" "loadout 6" "Default" "0" } + "Button8Image" + { + "ControlName" "ImagePanel" + "xpos" "272" + "ypos" "336" + "wide" "256" + "tall" "128" + "image" "loadout/loadout_zr68l" + } "Button8" { "ControlName" "Button" "fieldName" "Button8" - "xpos" "10" - "ypos" "235" - "wide" "200" - "tall" "25" - "autoResize" "1" - "pinCorner" "0" + "xpos" "272" + "ypos" "336" + "wide" "256" + "tall" "128" + "autoResize" "0" + "pinCorner" "0" + "RoundedCorners" "15" + "pin_corner_to_sibling" "0" + "pin_to_sibling_corner" "0" "visible" "1" "enabled" "1" "tabPosition" "0" @@ -514,85 +404,153 @@ "brighttext" "0" "Font" "Default" "wrap" "0" - "Command" "loadout 7" + "centerwrap" "0" + "textinsetx" "6" + "textinsety" "0" + "auto_wide_tocontents" "0" + "use_proportional_insets" "0" + "command" "loadout 7" "Default" "0" } + "Button9Image" + { + "ControlName" "ImagePanel" + "xpos" "536" + "ypos" "336" + "wide" "256" + "tall" "128" + "image" "loadout/loadout_mx" + } "Button9" { "ControlName" "Button" "fieldName" "Button9" - "xpos" "10" - "ypos" "265" - "wide" "200" - "tall" "25" - "autoResize" "1" - "pinCorner" "0" + "xpos" "536" + "ypos" "336" + "wide" "256" + "tall" "128" + "autoResize" "0" + "pinCorner" "0" + "RoundedCorners" "15" + "pin_corner_to_sibling" "0" + "pin_to_sibling_corner" "0" "visible" "1" "enabled" "1" "tabPosition" "0" "labelText" "MX" "textAlignment" "center" - "dulltext" "0" + "dulltext" "1" "brighttext" "0" "Font" "Default" "wrap" "0" - "Command" "loadout 8" + "centerwrap" "0" + "textinsetx" "6" + "textinsety" "0" + "auto_wide_tocontents" "0" + "use_proportional_insets" "0" + "command" "loadout 8" "Default" "0" } + "Button10Image" + { + "ControlName" "ImagePanel" + "xpos" "8" + "ypos" "472" + "wide" "256" + "tall" "128" + "image" "loadout/loadout_pz" + } "Button10" { "ControlName" "Button" "fieldName" "Button10" - "xpos" "10" - "ypos" "295" - "wide" "200" - "tall" "25" - "autoResize" "1" - "pinCorner" "0" + "xpos" "8" + "ypos" "472" + "wide" "256" + "tall" "128" + "autoResize" "0" + "pinCorner" "0" + "RoundedCorners" "15" + "pin_corner_to_sibling" "0" + "pin_to_sibling_corner" "0" "visible" "1" "enabled" "1" "tabPosition" "0" "labelText" "PZ252" "textAlignment" "center" - "dulltext" "0" + "dulltext" "1" "brighttext" "0" "Font" "Default" "wrap" "0" - "Command" "loadout 9" + "centerwrap" "0" + "textinsetx" "6" + "textinsety" "0" + "auto_wide_tocontents" "0" + "use_proportional_insets" "0" + "command" "loadout 9" "Default" "0" } + "Button11Image" + { + "ControlName" "ImagePanel" + "xpos" "272" + "ypos" "472" + "wide" "256" + "tall" "128" + "image" "loadout/loadout_supa7" + } "Button11" { "ControlName" "Button" "fieldName" "Button11" - "xpos" "10" - "ypos" "325" - "wide" "200" - "tall" "25" - "autoResize" "1" - "pinCorner" "0" + "xpos" "272" + "ypos" "472" + "wide" "256" + "tall" "128" + "autoResize" "0" + "pinCorner" "0" + "RoundedCorners" "15" + "pin_corner_to_sibling" "0" + "pin_to_sibling_corner" "0" "visible" "1" "enabled" "1" "tabPosition" "0" "labelText" "Murata Supa-7" "textAlignment" "center" - "dulltext" "0" + "dulltext" "1" "brighttext" "0" "Font" "Default" "wrap" "0" - "Command" "loadout 10" + "centerwrap" "0" + "textinsetx" "6" + "textinsety" "0" + "auto_wide_tocontents" "0" + "use_proportional_insets" "0" + "command" "loadout 10" "Default" "0" } + "Button12Image" + { + "ControlName" "ImagePanel" + "xpos" "536" + "ypos" "472" + "wide" "256" + "tall" "128" + "image" "loadout/loadout_mosok" + } "Button12" { "ControlName" "Button" "fieldName" "Button12" - "xpos" "10" - "ypos" "355" - "wide" "200" - "tall" "25" - "autoResize" "1" - "pinCorner" "0" + "xpos" "536" + "ypos" "472" + "wide" "256" + "tall" "128" + "autoResize" "0" + "pinCorner" "0" + "RoundedCorners" "15" + "pin_corner_to_sibling" "0" + "pin_to_sibling_corner" "0" "visible" "1" "enabled" "1" "tabPosition" "0" @@ -602,19 +560,36 @@ "brighttext" "0" "Font" "Default" "wrap" "0" - "Command" "loadout 11" + "centerwrap" "0" + "textinsetx" "6" + "textinsety" "0" + "auto_wide_tocontents" "0" + "use_proportional_insets" "0" + "command" "loadout 11" "Default" "0" } + "Button13Image" + { + "ControlName" "ImagePanel" + "xpos" "272" + "ypos" "608" + "wide" "256" + "tall" "128" + "image" "loadout/loadout_mosokl" + } "Button13" { "ControlName" "Button" "fieldName" "Button13" - "xpos" "10" - "ypos" "385" - "wide" "200" - "tall" "25" - "autoResize" "1" - "pinCorner" "0" + "xpos" "272" + "ypos" "608" + "wide" "256" + "tall" "128" + "autoResize" "0" + "pinCorner" "0" + "RoundedCorners" "15" + "pin_corner_to_sibling" "0" + "pin_to_sibling_corner" "0" "visible" "1" "enabled" "1" "tabPosition" "0" @@ -624,60 +599,34 @@ "brighttext" "0" "Font" "Default" "wrap" "0" - "Command" "loadout 12" - "Default" "1" + "centerwrap" "0" + "textinsetx" "6" + "textinsety" "0" + "auto_wide_tocontents" "0" + "use_proportional_insets" "0" + "command" "loadout 12" + "Default" "0" } "Button14" { "ControlName" "Button" "fieldName" "Button14" - "xpos" "10" - "ypos" "415" - "wide" "200" - "tall" "25" + "xpos" "272" + "ypos" "608" + "wide" "256" + "tall" "24" "autoResize" "1" "pinCorner" "0" "visible" "0" "enabled" "0" "tabPosition" "0" + "labelText" "<< CHANGE CLASS" "textAlignment" "center" "dulltext" "0" - "brighttext" "0" + "brighttext" "1" "Font" "Default" "wrap" "0" "Command" "loadout 13" "Default" "0" } -// "Weapon_ImagePanel" -// { -// "ControlName" "ImagePanel" -// "fieldName" "Weapon_ImagePanel" -// "xpos" "220" -// "ypos" "25" -// "wide" "620" -// "tall" "385" -// "autoResize" "1" -// "pinCorner" "0" -// "visible" "1" -// "enabled" "1" -// "tabPosition" "0" -// "image" "vgui/loadout/none" -// "scaleImage" "0" -// } - "BuildModeDialog" - { - "ControlName" "BuildModeDialog" - "fieldName" "BuildModeDialog" - "xpos" "33" - "ypos" "60" - "wide" "300" - "tall" "420" - "autoResize" "1" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "tabPosition" "0" - "settitlebarvisible" "1" - "title" "#Frame_Untitled" - } } diff --git a/mp/game/neo/resource/neo_ui/Neo_TeamMenu.res b/mp/game/neo/resource/neo_ui/Neo_TeamMenu.res index e60aa0c25..7220300f3 100644 --- a/mp/game/neo/resource/neo_ui/Neo_TeamMenu.res +++ b/mp/game/neo/resource/neo_ui/Neo_TeamMenu.res @@ -4,8 +4,8 @@ { "ControlName" "CNeoTeamMenu" "fieldName" "team" - "xpos" "332" - "ypos" "276" + "xpos" "cs-0.5" + "ypos" "cs-0.5" "wide" "360" "tall" "215" "autoResize" "0" @@ -18,10 +18,10 @@ } "neo_IconPanel1" { - "ControlName" "IconPanel" + "ControlName" "ImagePanel" "fieldName" "neo_IconPanel1" "xpos" "10" - "ypos" "17" + "ypos" "18" "wide" "110" "tall" "110" "autoResize" "0" @@ -29,12 +29,12 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "image" "vgui/jinrai_128tm" + "image" "jinrai_128tm" "scaleImage" "1" } "neo_IconPanel2" { - "ControlName" "IconPanel" + "ControlName" "ImagePanel" "fieldName" "neo_IconPanel2" "xpos" "125" "ypos" "18" @@ -45,7 +45,7 @@ "visible" "1" "enabled" "1" "tabPosition" "0" - "image" "vgui/nsf_128tm" + "image" "nsf_128tm" "scaleImage" "1" } "neo_Label1" @@ -70,7 +70,7 @@ } "neo_IconPanel3" { - "ControlName" "IconPanel" + "ControlName" "ImagePanel" "fieldName" "neo_IconPanel3" "xpos" "10" "ypos" "166" @@ -82,7 +82,7 @@ "enabled" "1" "tabPosition" "0" "fillcolor" "black" - "image" "vgui/darkgrey_background" + "image" "darkgrey_background" "scaleImage" "1" } "neo_jplayercountlabel" diff --git a/mp/src/game/client/neo/c_neo_player.cpp b/mp/src/game/client/neo/c_neo_player.cpp index 57c6b616c..8a03847da 100644 --- a/mp/src/game/client/neo/c_neo_player.cpp +++ b/mp/src/game/client/neo/c_neo_player.cpp @@ -122,22 +122,13 @@ class NeoLoadoutMenu_Cb : public ICommandCallback return; } + panel->SetProportional(false); // Fixes wrong menu size when in windowed mode, regardless of whether proportional is set to false in the res file (NEOWTF) panel->ApplySchemeSettings(vgui::scheme()->GetIScheme(panel->GetScheme())); - int panelWide = 960, panelTall = 700, screenWide, screenTall; - surface()->GetScreenSize(screenWide, screenTall); - // Resize panel, but make sure it fits the resolution. - panel->SetSize(Min(screenWide, panelWide), Min(screenTall, panelTall)); - panel->SetPos((screenWide / 2) - (panelWide / 2), - (screenTall / 2) - (panelTall / 2)); - panel->SetMouseInputEnabled(true); panel->SetKeyBoardInputEnabled(true); panel->SetCursorAlwaysVisible(true); - panel->SetControlEnabled("Scout_Button", true); - panel->SetControlEnabled("Misc2", true); - panel->SetControlEnabled("Done_Button", true); panel->SetControlEnabled("Button1", true); panel->SetControlEnabled("Button2", true); panel->SetControlEnabled("Button3", true); @@ -193,16 +184,9 @@ class NeoClassMenu_Cb : public ICommandCallback Warning("Couldn't find class panel\n"); return; } - + panel->SetProportional(false); panel->ApplySchemeSettings(vgui::scheme()->GetIScheme(panel->GetScheme())); - int panelWide = 650, panelTall = 280, screenWide, screenTall; - surface()->GetScreenSize(screenWide, screenTall); - // Resize panel, but make sure it fits the resolution. - panel->SetSize(Min(screenWide, panelWide), Min(screenTall, panelTall)); - panel->SetPos((screenWide / 2) - (panelWide / 2), - (screenTall / 2) - (panelTall / 2)); - panel->SetMouseInputEnabled(true); panel->SetKeyBoardInputEnabled(true); panel->SetCursorAlwaysVisible(true); @@ -248,16 +232,9 @@ class NeoTeamMenu_Cb : public ICommandCallback return; } + panel->SetProportional(false); panel->ApplySchemeSettings(vgui::scheme()->GetIScheme(panel->GetScheme())); - int panelWide = 360, panelTall = 215, screenWide, screenTall; - panelWide *= 1.5; panelTall *= 1.5; - surface()->GetScreenSize(screenWide, screenTall); - // Resize panel, but make sure it fits the resolution. - panel->SetSize(Min(screenWide, panelWide), Min(screenTall, panelTall)); - panel->SetPos((screenWide / 2) - (panelWide / 2), - (screenTall / 2) - (panelTall / 2)); - panel->SetMouseInputEnabled(true); panel->SetKeyBoardInputEnabled(true); panel->SetCursorAlwaysVisible(true); diff --git a/mp/src/game/client/neo/game_controls/neo_classmenu.cpp b/mp/src/game/client/neo/game_controls/neo_classmenu.cpp index 7a1e89e23..c9dc14e88 100644 --- a/mp/src/game/client/neo/game_controls/neo_classmenu.cpp +++ b/mp/src/game/client/neo/game_controls/neo_classmenu.cpp @@ -266,8 +266,6 @@ void CNeoClassMenu::ApplySchemeSettings(vgui::IScheme *pScheme) SetPaintBorderEnabled(false); SetBorder( NULL ); - - SetMinimumSize(950, 450); } void CNeoClassMenu::MoveLabelToFront(const char *textEntryName) diff --git a/mp/src/game/client/neo/game_controls/neo_loadoutmenu.cpp b/mp/src/game/client/neo/game_controls/neo_loadoutmenu.cpp index ce99a3ae8..a6ac02115 100644 --- a/mp/src/game/client/neo/game_controls/neo_loadoutmenu.cpp +++ b/mp/src/game/client/neo/game_controls/neo_loadoutmenu.cpp @@ -38,9 +38,9 @@ using namespace vgui; #define CONTROL_BUTTON14 "Button14" static const char *szButtons[] = { - CONTROL_SCOUT_BUTTON, + /*CONTROL_SCOUT_BUTTON, CONTROL_MISC2_BUTTON, - CONTROL_DONE_BUTTON, + CONTROL_DONE_BUTTON,*/ CONTROL_BUTTON1, CONTROL_BUTTON2, CONTROL_BUTTON3, @@ -93,21 +93,21 @@ CNeoLoadoutMenu::CNeoLoadoutMenu(IViewPort *pViewPort) LoadControlSettings(GetResFile()); SetVisible(false); - SetProportional(true); + SetProportional(false); SetMouseInputEnabled(true); SetKeyBoardInputEnabled(true); SetTitleBarVisible(false); - m_pWeapon_ImagePanel = new ImagePanel(this, "Weapon_ImagePanel"); - m_pWeapon_ImagePanel->SetAutoDelete(true); + /*m_pWeapon_ImagePanel = new ImagePanel(this, "Weapon_ImagePanel"); + m_pWeapon_ImagePanel->SetAutoDelete(true);*/ m_pTitleLabel = new Label(this, "TitleLabel", "labelText"); m_pTitleLabel->SetAutoDelete(true); - m_pScout_Button = FindControl