diff --git a/resource/scheme/borders.res b/resource/scheme/borders.res index 95e8b327..afb8957f 100644 --- a/resource/scheme/borders.res +++ b/resource/scheme/borders.res @@ -53,6 +53,17 @@ "draw_corner_width" "8" "draw_corner_height" "8" } + "MaterialBlueDark" + { + "bordertype" "scalable_image" + "backgroundtype" "2" + "color" "70 125 185 255" + "image" "replay/thumbnails/panels/material_generic" + "src_corner_height" "24" + "src_corner_width" "24" + "draw_corner_width" "8" + "draw_corner_height" "8" + } //============================================================================== // MATERIAL RED @@ -89,6 +100,17 @@ "draw_corner_width" "8" "draw_corner_height" "8" } + "MaterialRedDark" + { + "bordertype" "scalable_image" + "backgroundtype" "2" + "color" "150 50 50 255" + "image" "replay/thumbnails/panels/material_generic" + "src_corner_height" "24" + "src_corner_width" "24" + "draw_corner_width" "8" + "draw_corner_height" "8" + } //============================================================================== // MATERIAL WHITE diff --git a/resource/ui/teammenu.res b/resource/ui/teammenu.res index 26b32566..db8cba54 100644 --- a/resource/ui/teammenu.res +++ b/resource/ui/teammenu.res @@ -67,86 +67,103 @@ "proportionaltoparent" "1" } - "BlueFrame" + "BlueTeamButton" { - "ControlName" "EditablePanel" - "fieldName" "BlueFrame" + "ControlName" "EditablePanel" + "fieldname" "BlueTeamButton" "xpos" "-1" "ypos" "0" - "zpos" "5" + "zpos" "50" "wide" "140" "tall" "50" "visible" "1" "enabled" "1" - "paintbackground" "0" - "border" "MaterialBlue" "pin_to_sibling" "TeamsAnchor" "pin_corner_to_sibling" "PIN_TOPRIGHT" "pin_to_sibling_corner" "PIN_TOPLEFT" - } - "Blue" - { - "ControlName" "CExLabel" - "fieldName" "Blue" - "xpos" "-10" - "ypos" "0" - "zpos" "7" - "wide" "80" - "tall" "50" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "labelText" "Blue" - "textAlignment" "east" - "font" "Size 18" - "fgcolor" "White" - - "pin_to_sibling" "BlueFrame" - "pin_corner_to_sibling" "PIN_CENTER_RIGHT" - "pin_to_sibling_corner" "PIN_CENTER_RIGHT" + "JoinButton" + { + "ControlName" "CExButton" + "fieldname" "JoinButton" + "xpos" "0" + "ypos" "0" + "zpos" "1" + "wide" "f0" + "tall" "f0" + "visible" "1" + "enabled" "1" + "proportionaltoparent" "1" + "labeltext" "" + "textAlignment" "center" + "font" "" + "command" "jointeam blue" + "actionsignallevel" "2" + + "paintbackground" "0" + "paintborder" "1" + "border" "MaterialBlue" + "border_default" "MaterialBlue" + "border_armed" "MaterialBlueDark" + } + "BlueLabel" + { + "ControlName" "CExLabel" + "fieldName" "BlueLabel" + "xpos" "rs1-12" + "ypos" "cs-0.5" + "zpos" "7" + "wide" "50" + "tall" "f10" + "visible" "1" + "enabled" "1" + "mouseinputenabled" "0" + "proportionaltoparent" "1" + "labelText" "Blue" + "textAlignment" "east" + "font" "Size 18" + "fgcolor" "White" + } + "BlueLabelShadow" + { + "ControlName" "CExLabel" + "fieldName" "BlueLabelShadow" + "xpos" "-1" + "ypos" "-1" + "zpos" "6" + "wide" "50" + "tall" "f10" + "visible" "1" + "enabled" "1" + "mouseinputenabled" "0" + "proportionaltoparent" "1" + "labelText" "Blue" + "textAlignment" "east" + "font" "Size 18 Blur" + "fgcolor" "Shadow" + "pin_to_sibling" "BlueLabel" + } } - "BlueShadow" - { - "ControlName" "CExLabel" - "fieldName" "BlueShadow" - "xpos" "-1" - "ypos" "-1" - "zpos" "6" - "wide" "80" - "tall" "50" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "labelText" "Blue" - "textAlignment" "east" - "font" "Size 18 Blur" - "fgcolor" "Shadow" - "pin_to_sibling" "Blue" - } - "BlueCount" { "ControlName" "CExLabel" "fieldName" "BlueCount" "xpos" "-5" "ypos" "0" - "zpos" "7" + "zpos" "52" "wide" "60" - "tall" "50" - "autoResize" "0" - "pinCorner" "0" + "tall" "40" "visible" "1" "enabled" "1" + "mouseinputenabled" "0" + "proportionaltoparent" "1" "labelText" "%bluecount%" "textAlignment" "center" "font" "Size 36" "fgcolor" "White" - "pin_to_sibling" "BlueFrame" + "pin_to_sibling" "BlueTeamButton" "pin_corner_to_sibling" "PIN_CENTER_LEFT" "pin_to_sibling_corner" "PIN_CENTER_LEFT" } @@ -156,13 +173,13 @@ "fieldName" "BlueCountShadow" "xpos" "-1" "ypos" "-1" - "zpos" "6" + "zpos" "51" "wide" "60" - "tall" "50" - "autoResize" "0" - "pinCorner" "0" + "tall" "40" "visible" "1" "enabled" "1" + "mouseinputenabled" "0" + "proportionaltoparent" "1" "labelText" "%bluecount%" "textAlignment" "center" "font" "Size 36 Blur" @@ -170,111 +187,103 @@ "pin_to_sibling" "BlueCount" } - "teambutton0" //TEAMBLUE - { - "ControlName" "CTFTeamButton" - "fieldName" "teambutton0" - "xpos" "0" - "ypos" "0" - "zpos" "20" - "wide" "140" - "tall" "50" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "labelText" "&3" - "textAlignment" "west" - "paintborder" "0" - "command" "jointeam blue" - "team" "3" - "associated_model" "bluedoor" - "hover" "2.0" - "font" "" - "fgcolor" "Blank" - - "pin_to_sibling" "BlueFrame" - } - - "RedFrame" + "RedTeamButton" { - "ControlName" "EditablePanel" - "fieldName" "RedFrame" + "ControlName" "EditablePanel" + "fieldname" "RedTeamButton" "xpos" "-2" "ypos" "0" - "zpos" "5" + "zpos" "50" "wide" "140" "tall" "50" "visible" "1" "enabled" "1" - "paintbackground" "0" - "border" "MaterialRed" "pin_to_sibling" "TeamsAnchor" "pin_corner_to_sibling" "PIN_BOTTOMLEFT" "pin_to_sibling_corner" "PIN_BOTTOMRIGHT" - } - "Red" - { - "ControlName" "CExLabel" - "fieldName" "Red" - "xpos" "-10" - "ypos" "0" - "zpos" "7" - "wide" "80" - "tall" "50" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "labelText" "Red" - "textAlignment" "west" - "font" "Size 18" - "fgcolor" "White" - - "pin_to_sibling" "RedFrame" - "pin_corner_to_sibling" "PIN_CENTER_LEFT" - "pin_to_sibling_corner" "PIN_CENTER_LEFT" - } - "RedShadow" - { - "ControlName" "CExLabel" - "fieldName" "RedShadow" - "xpos" "-1" - "ypos" "-1" - "zpos" "6" - "wide" "80" - "tall" "50" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "labelText" "Red" - "textAlignment" "west" - "font" "Size 18 Blur" - "fgcolor" "Shadow" - "pin_to_sibling" "Red" + "JoinButton" + { + "ControlName" "CExButton" + "fieldname" "JoinButton" + "xpos" "0" + "ypos" "0" + "zpos" "1" + "wide" "f0" + "tall" "f0" + "visible" "1" + "enabled" "1" + "proportionaltoparent" "1" + "labeltext" "" + "textAlignment" "center" + "font" "" + "command" "jointeam red" + "actionsignallevel" "2" + + "paintbackground" "0" + "paintborder" "1" + "border" "MaterialRed" + "border_default" "MaterialRed" + "border_armed" "MaterialRedDark" + } + "RedLabel" + { + "ControlName" "CExLabel" + "fieldName" "RedLabel" + "xpos" "12" + "ypos" "cs-0.5" + "zpos" "7" + "wide" "50" + "tall" "f10" + "visible" "1" + "enabled" "1" + "mouseinputenabled" "0" + "proportionaltoparent" "1" + "labelText" "Red" + "textAlignment" "west" + "font" "Size 18" + "fgcolor" "White" + } + "RedLabelShadow" + { + "ControlName" "CExLabel" + "fieldName" "RedLabelShadow" + "xpos" "-1" + "ypos" "-1" + "zpos" "6" + "wide" "50" + "tall" "f10" + "visible" "1" + "enabled" "1" + "mouseinputenabled" "0" + "proportionaltoparent" "1" + "labelText" "Red" + "textAlignment" "west" + "font" "Size 18 Blur" + "fgcolor" "Shadow" + "pin_to_sibling" "RedLabel" + } } - "RedCount" { "ControlName" "CExLabel" "fieldName" "RedCount" "xpos" "-5" "ypos" "0" - "zpos" "7" + "zpos" "52" "wide" "60" - "tall" "50" - "autoResize" "0" - "pinCorner" "0" + "tall" "40" "visible" "1" "enabled" "1" + "mouseinputenabled" "0" + "proportionaltoparent" "1" "labelText" "%redcount%" "textAlignment" "center" "font" "Size 36" "fgcolor" "White" - "pin_to_sibling" "RedFrame" + "pin_to_sibling" "RedTeamButton" "pin_corner_to_sibling" "PIN_CENTER_RIGHT" "pin_to_sibling_corner" "PIN_CENTER_RIGHT" } @@ -284,13 +293,13 @@ "fieldName" "RedCountShadow" "xpos" "-1" "ypos" "-1" - "zpos" "6" + "zpos" "51" "wide" "60" - "tall" "50" - "autoResize" "0" - "pinCorner" "0" + "tall" "40" "visible" "1" "enabled" "1" + "mouseinputenabled" "0" + "proportionaltoparent" "1" "labelText" "%redcount%" "textAlignment" "center" "font" "Size 36 Blur" @@ -298,36 +307,11 @@ "pin_to_sibling" "RedCount" } - "teambutton1" //TEAMRED - { - "ControlName" "CTFTeamButton" - "fieldName" "teambutton1" - "xpos" "0" - "ypos" "0" - "zpos" "20" - "wide" "140" - "tall" "50" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "labelText" "&4" - "textAlignment" "west" - "paintborder" "0" - "command" "jointeam red" - "team" "2" - "associated_model" "reddoor" - "hover" "2.0" - "font" "" - "fgcolor" "Blank" - "pin_to_sibling" "RedFrame" - } - - "RandomFrame" + "RandomTeamButton" { - "ControlName" "EditablePanel" - "fieldName" "RandomFrame" + "ControlName" "EditablePanel" + "fieldname" "RandomTeamButton" "xpos" "-1" "ypos" "0" "zpos" "5" @@ -335,123 +319,116 @@ "tall" "50" "visible" "1" "enabled" "1" - "paintbackground" "0" - "border" "MaterialTransparent70" "pin_to_sibling" "TeamsAnchor" "pin_corner_to_sibling" "PIN_BOTTOMRIGHT" "pin_to_sibling_corner" "PIN_BOTTOMLEFT" - } - "RandomIcon" + "JoinButton" + { + "ControlName" "CExButton" + "fieldname" "JoinButton" + "xpos" "0" + "ypos" "0" + "zpos" "1" + "wide" "f0" + "tall" "f0" + "visible" "1" + "enabled" "1" + "proportionaltoparent" "1" + "labeltext" "" + "textAlignment" "center" + "font" "" + "command" "jointeam auto" + "actionsignallevel" "2" + + "paintbackground" "0" + "paintborder" "1" + "border" "MaterialTransparent70" + "border_default" "MaterialTransparent70" + "border_armed" "MaterialBlackLight" + } + "RandomIcon" + { + "ControlName" "CExLabel" + "fieldName" "RandomIcon" + "xpos" "cs-0.5" + "ypos" "7" + "zpos" "7" + "wide" "f10" + "tall" "20" + "visible" "1" + "enabled" "1" + "mouseinputenabled" "0" + "proportionaltoparent" "1" + "labelText" "?" + "textAlignment" "center" + "font" "Symbols 24" + "fgcolor" "White" + } + "RandomIconShadow" + { + "ControlName" "CExLabel" + "fieldName" "RandomIconShadow" + "xpos" "-1" + "ypos" "-1" + "zpos" "6" + "wide" "f10" + "tall" "20" + "visible" "1" + "enabled" "1" + "mouseinputenabled" "0" + "proportionaltoparent" "1" + "labelText" "?" + "textAlignment" "center" + "font" "Symbols 24 Blur" + "fgcolor" "Shadow" + "pin_to_sibling" "RandomIcon" + } + + "Random" + { + "ControlName" "CExLabel" + "fieldName" "Random" + "xpos" "cs-0.5" + "ypos" "rs1-5" + "zpos" "7" + "wide" "f10" + "tall" "13" + "visible" "1" + "enabled" "1" + "mouseinputenabled" "0" + "proportionaltoparent" "1" + "labelText" "RANDOM" + "textAlignment" "center" + "font" "Size 12" + "fgcolor" "White" + } + "RandomShadow" + { + "ControlName" "CExLabel" + "fieldName" "RandomShadow" + "xpos" "-1" + "ypos" "-1" + "zpos" "6" + "wide" "f10" + "tall" "13" + "visible" "1" + "enabled" "1" + "mouseinputenabled" "0" + "proportionaltoparent" "1" + "labelText" "RANDOM" + "textAlignment" "center" + "font" "Size 12 Blur" + "fgcolor" "Shadow" + "pin_to_sibling" "Random" + } + } + + "SpectatorTeamButton" { - "ControlName" "CExLabel" - "fieldName" "RandomIcon" - "xpos" "0" - "ypos" "-7" - "zpos" "7" - "wide" "100" - "tall" "20" - "visible" "1" - "enabled" "1" - "labelText" "?" - "textAlignment" "center" - "font" "Symbols 24" - "fgcolor" "White" - - "pin_to_sibling" "RandomFrame" - "pin_corner_to_sibling" "PIN_CENTER_TOP" - "pin_to_sibling_corner" "PIN_CENTER_TOP" - } - "RandomIconShadow" - { - "ControlName" "CExLabel" - "fieldName" "RandomIconShadow" - "xpos" "-1" - "ypos" "-1" - "zpos" "6" - "wide" "100" - "tall" "20" - "visible" "1" - "enabled" "1" - "labelText" "?" - "textAlignment" "center" - "font" "Symbols 24 Blur" - "fgcolor" "Shadow" - "pin_to_sibling" "RandomIcon" - } - - "Random" - { - "ControlName" "CExLabel" - "fieldName" "Random" - "xpos" "0" - "ypos" "-2" - "zpos" "7" - "wide" "100" - "tall" "20" - "visible" "1" - "enabled" "1" - "autoResize" "0" - "pinCorner" "0" - "labelText" "RANDOM" - "AllCaps" "0" //cuts the label on 1 :( - "textAlignment" "center" - "font" "Size 12" - "fgcolor" "White" - - "pin_to_sibling" "RandomFrame" - "pin_corner_to_sibling" "PIN_CENTER_BOTTOM" - "pin_to_sibling_corner" "PIN_CENTER_BOTTOM" - } - "RandomShadow" - { - "ControlName" "CExLabel" - "fieldName" "RandomShadow" - "xpos" "-1" - "ypos" "-1" - "zpos" "6" - "wide" "100" - "tall" "20" - "visible" "1" - "enabled" "1" - "labelText" "RANDOM" - "AllCaps" "0" - "textAlignment" "center" - "font" "Size 12 Blur" - "fgcolor" "Shadow" - "pin_to_sibling" "Random" - } - - "teambutton2" //TEAMRANDOM - { - "ControlName" "CTFTeamButton" - "fieldName" "teambutton2" - "xpos" "0" - "ypos" "0" - "zpos" "20" - "wide" "100" - "tall" "50" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "labelText" "&1" - - "textAlignment" "center" - "paintborder" "0" - "command" "jointeam auto" - "associated_model" "autodoor" - "font" "" - "fgcolor" "Blank" - - "pin_to_sibling" "RandomFrame" - } - - "SpectateFrame" - { - "ControlName" "EditablePanel" - "fieldName" "SpectateFrame" + "ControlName" "EditablePanel" + "fieldname" "SpectatorTeamButton" "xpos" "-2" "ypos" "0" "zpos" "5" @@ -459,120 +436,114 @@ "tall" "50" "visible" "1" "enabled" "1" - "paintbackground" "0" - "border" "MaterialTransparent70" "pin_to_sibling" "TeamsAnchor" "pin_corner_to_sibling" "PIN_TOPLEFT" "pin_to_sibling_corner" "PIN_TOPRIGHT" - } - - "SpectateIcon" - { - "ControlName" "CExLabel" - "fieldName" "SpectateIcon" - "xpos" "0" - "ypos" "-7" - "zpos" "7" - "wide" "100" - "tall" "20" - "visible" "1" - "enabled" "1" - "labelText" "_" - "textAlignment" "center" - "font" "Symbols 24" - "fgcolor" "White" - - "pin_to_sibling" "SpectateFrame" - "pin_corner_to_sibling" "PIN_CENTER_TOP" - "pin_to_sibling_corner" "PIN_CENTER_TOP" - } - "SpectateIconShadow" - { - "ControlName" "CExLabel" - "fieldName" "SpectateIconShadow" - "xpos" "-1" - "ypos" "-1" - "zpos" "6" - "wide" "100" - "tall" "20" - "visible" "1" - "enabled" "1" - "labelText" "_" - "textAlignment" "center" - "font" "Symbols 24 Blur" - "fgcolor" "Shadow" - "pin_to_sibling" "SpectateIcon" - } - - "Spectate" - { - "ControlName" "CExLabel" - "fieldName" "Spectate" - "xpos" "0" - "ypos" "-2" - "zpos" "7" - "wide" "100" - "tall" "20" - "visible" "1" - "enabled" "1" - "labelText" "Spectate" - "AllCaps" "1" - "textAlignment" "center" - "font" "Size 12" - "fgcolor" "White" - - "pin_to_sibling" "SpectateFrame" - "pin_corner_to_sibling" "PIN_CENTER_BOTTOM" - "pin_to_sibling_corner" "PIN_CENTER_BOTTOM" - } - "SpectateShadow" - { - "ControlName" "CExLabel" - "fieldName" "SpectateShadow" - "xpos" "-1" - "ypos" "-1" - "zpos" "6" - "wide" "100" - "tall" "20" - "visible" "1" - "enabled" "1" - "labelText" "Spectate" - "AllCaps" "1" - "textAlignment" "center" - "font" "Size 12 Blur" - "fgcolor" "Shadow" - "pin_to_sibling" "Spectate" - } - - "teambutton3" //TEAMSPEC - { - "ControlName" "CTFTeamButton" - "fieldName" "teambutton3" - "xpos" "0" - "ypos" "0" - "zpos" "20" - "wide" "135" - "tall" "80" - "autoResize" "0" - "pinCorner" "0" - "visible" "1" - "enabled" "1" - "labelText" "&2" - "textAlignment" "center" - "paintborder" "0" - "command" "jointeam spectate" - "associated_model" "spectate" - "font" "" - "fgcolor" "Blank" - "pin_to_sibling" "SpectateFrame" + "JoinButton" + { + "ControlName" "CExButton" + "fieldname" "JoinButton" + "xpos" "0" + "ypos" "0" + "zpos" "1" + "wide" "f0" + "tall" "f0" + "visible" "1" + "enabled" "1" + "proportionaltoparent" "1" + "labeltext" "" + "textAlignment" "center" + "font" "" + "command" "jointeam spectate" + "actionsignallevel" "2" + + "paintbackground" "0" + "paintborder" "1" + "border" "MaterialTransparent70" + "border_default" "MaterialTransparent70" + "border_armed" "MaterialBlackLight" + } + "SpectatorIcon" + { + "ControlName" "CExLabel" + "fieldName" "SpectatorIcon" + "xpos" "cs-0.5" + "ypos" "7" + "zpos" "7" + "wide" "f10" + "tall" "20" + "visible" "1" + "enabled" "1" + "mouseinputenabled" "0" + "proportionaltoparent" "1" + "labelText" "_" + "textAlignment" "center" + "font" "Symbols 24" + "fgcolor" "White" + } + "SpectatorIconShadow" + { + "ControlName" "CExLabel" + "fieldName" "SpectatorIconShadow" + "xpos" "-1" + "ypos" "-1" + "zpos" "6" + "wide" "f10" + "tall" "20" + "visible" "1" + "enabled" "1" + "mouseinputenabled" "0" + "proportionaltoparent" "1" + "labelText" "_" + "textAlignment" "center" + "font" "Symbols 24 Blur" + "fgcolor" "Shadow" + "pin_to_sibling" "SpectatorIcon" + } + + "Spectator" + { + "ControlName" "CExLabel" + "fieldName" "Spectator" + "xpos" "cs-0.5" + "ypos" "rs1-5" + "zpos" "7" + "wide" "f10" + "tall" "13" + "visible" "1" + "enabled" "1" + "mouseinputenabled" "0" + "proportionaltoparent" "1" + "labelText" "SPECTATOR" + "textAlignment" "center" + "font" "Size 12" + "fgcolor" "White" + } + "SpectatorShadow" + { + "ControlName" "CExLabel" + "fieldName" "SpectatorShadow" + "xpos" "-1" + "ypos" "-1" + "zpos" "6" + "wide" "f10" + "tall" "13" + "visible" "1" + "enabled" "1" + "mouseinputenabled" "0" + "proportionaltoparent" "1" + "labelText" "SPECTATOR" + "textAlignment" "center" + "font" "Size 12 Blur" + "fgcolor" "Shadow" + "pin_to_sibling" "Spectator" + } } - - //REMOVED STUFF "MenuBG" { @@ -646,4 +617,89 @@ "fieldName" "MapInfo" "xpos" "9999" } + "teambutton0" //TEAMBLUE + { + "ControlName" "CTFTeamButton" + "fieldName" "teambutton0" + "xpos" "9999" + "ypos" "0" + "zpos" "0" + "wide" "0" + "tall" "0" + "visible" "1" + "enabled" "1" + "labelText" "&3" + "textAlignment" "west" + "paintborder" "0" + "command" "jointeam blue" + "team" "3" + "associated_model" "bluedoor" + "hover" "2.0" + "font" "" + "fgcolor" "Blank" + } + "teambutton1" //TEAMRED + { + "ControlName" "CTFTeamButton" + "fieldName" "teambutton1" + "xpos" "9999" + "ypos" "100" + "zpos" "0" + "wide" "0" + "tall" "0" + "visible" "1" + "enabled" "1" + "labelText" "&4" + "textAlignment" "west" + "paintborder" "0" + "command" "jointeam red" + "team" "2" + "associated_model" "reddoor" + "hover" "2.0" + "font" "" + "fgcolor" "Blank" + } + "teambutton2" //TEAMRANDOM + { + "ControlName" "CTFTeamButton" + "fieldName" "teambutton2" + "xpos" "9999" + "ypos" "200" + "zpos" "0" + "wide" "0" + "tall" "0" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "labelText" "&1" + + "textAlignment" "center" + "paintborder" "0" + "command" "jointeam auto" + "associated_model" "autodoor" + "font" "" + "fgcolor" "Blank" + } + "teambutton3" //TEAMSPEC + { + "ControlName" "CTFTeamButton" + "fieldName" "teambutton3" + "xpos" "9999" + "ypos" "300" + "zpos" "0" + "wide" "0" + "tall" "0" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + "labelText" "&2" + "textAlignment" "center" + "paintborder" "0" + "command" "jointeam spectate" + "associated_model" "spectate" + "font" "" + "fgcolor" "Blank" + } } \ No newline at end of file