Merge pull request #6 from diamante0018/develop
fix(menus): Use OAT to track down mistakespull/8/head
commit
44e614a4fe
|
@ -34,7 +34,7 @@ itemDef
|
|||
forecolor 0 0 0 0.4
|
||||
background "white"
|
||||
textscale 0.55
|
||||
visible when ((dvarBool("cl_ingame") || dvarBool("sv_running")))
|
||||
visible when ( dvarBool("cl_ingame") || dvarBool("sv_running") )
|
||||
}
|
||||
itemDef
|
||||
{
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
style 1
|
||||
foreColor 1 1 1 1
|
||||
backColor 1 1 1 1
|
||||
background white
|
||||
background "white"
|
||||
exp rect Y ( localvarfloat( "ui_cac_popup_ypos" ) )
|
||||
exp rect H ( CALCULATED_HEIGHT )
|
||||
fadeCycle 1
|
||||
|
@ -66,7 +66,7 @@
|
|||
background white
|
||||
decoration
|
||||
visible 1
|
||||
exp rect H ( )
|
||||
exp rect H ( CALCULATED_HEIGHT )
|
||||
}
|
||||
itemDef
|
||||
{
|
||||
|
|
|
@ -258,7 +258,9 @@
|
|||
text "@MENU_INTEL"
|
||||
visible when ( dvarbool( "wideScreen" ) )
|
||||
}
|
||||
/*itemDef
|
||||
|
||||
#ifdef DRAW_IW_LOGO
|
||||
itemDef
|
||||
{
|
||||
//rect -104 -56 128 64 3 3
|
||||
rect -170 -66 128 64 3 3
|
||||
|
@ -280,6 +282,7 @@
|
|||
background "logo_iw"
|
||||
textscale 0.55
|
||||
visible when ( !dvarbool( "wideScreen" ) )
|
||||
}*/
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
|
@ -40,6 +40,7 @@
|
|||
#define ON_MENU_ESC \
|
||||
close self;
|
||||
|
||||
{
|
||||
menuDef
|
||||
{
|
||||
name MENU_NAME
|
||||
|
@ -71,3 +72,4 @@ menuDef
|
|||
|
||||
ITEM_BUTTON_BACK(ON_MENU_ESC)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -274,6 +274,7 @@
|
|||
open "settings_quick_gtnw"; \
|
||||
}
|
||||
|
||||
{
|
||||
menuDef
|
||||
{
|
||||
name MENU_NAME
|
||||
|
@ -320,3 +321,4 @@ menuDef
|
|||
|
||||
ITEM_BUTTON_FRIENDS(-120)
|
||||
}
|
||||
}
|
|
@ -42,7 +42,6 @@
|
|||
textScale 0.3333
|
||||
textStyle 3
|
||||
textFont 10
|
||||
feeder 0
|
||||
visible when ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) )
|
||||
}
|
||||
itemDef
|
||||
|
@ -67,7 +66,6 @@
|
|||
textScale 0.25
|
||||
textStyle 6
|
||||
textFont 6
|
||||
feeder 0
|
||||
visible 1
|
||||
exp text ( "^3" + keybinding( "+actionslot 1" ) )
|
||||
visible when ( ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) ) && actionslotusable( 1 ) )
|
||||
|
@ -93,7 +91,6 @@
|
|||
textScale 0.3333
|
||||
textStyle 3
|
||||
textFont 10
|
||||
feeder 0
|
||||
visible when ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) )
|
||||
}
|
||||
itemDef
|
||||
|
@ -118,7 +115,6 @@
|
|||
textScale 0.25
|
||||
textStyle 6
|
||||
textFont 6
|
||||
feeder 0
|
||||
visible 1
|
||||
exp text ( "^3" + keybinding( "+actionslot 3" ) )
|
||||
visible when ( ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) ) && actionslotusable( 3 ) )
|
||||
|
@ -144,7 +140,6 @@
|
|||
textScale 0.3333
|
||||
textStyle 3
|
||||
textFont 10
|
||||
feeder 0
|
||||
visible when ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) )
|
||||
}
|
||||
itemDef
|
||||
|
@ -169,7 +164,6 @@
|
|||
textScale 0.25
|
||||
textStyle 6
|
||||
textFont 6
|
||||
feeder 0
|
||||
visible 1
|
||||
exp text ( "^3" + keybinding( "+actionslot 4" ) )
|
||||
visible when ( ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) ) && actionslotusable( 4 ) )
|
||||
|
|
|
@ -92,6 +92,7 @@
|
|||
|
||||
#define MESSAGE_CREDITS "@IW4X_CREDITS"
|
||||
|
||||
{
|
||||
menuDef
|
||||
{
|
||||
name MENU_NAME
|
||||
|
@ -115,3 +116,4 @@ menuDef
|
|||
|
||||
ITEM_BUTTON_BACK(close self;)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -96,13 +96,11 @@
|
|||
MENU_CHOICE_BUTTON_VIS(7, button_7, "@MENU_MODS_CAPS", open mods_menu;, "@MPUI_DESC_MODS", 1)
|
||||
MENU_CHOICE_BUTTON_VIS(8, button_8, "@MENU_OPTIONS_CAPS", open pc_options_video;, "@MPUI_DESC_OPTIONS", 1)
|
||||
MENU_CHOICE_HORIZONTAL_LINE_VIS(9, 1)
|
||||
MENU_CHOICE_BUTTON_VIS(9, button_9, "@MENU_STORE_CAPS", uiScript "downloadDLC" 1, "@MPUI_DESC_STORE", 1)
|
||||
MENU_CHOICE_NEWICON_VIS(9, when(!dvarBool(isDlcInstalled_All)))
|
||||
MENU_CHOICE_BUTTON_VIS(10, button_10, "@MENU_SP_CREDITS_CAPS", open iw4x_credits;, "@NULL_EMPTY", 1)
|
||||
MENU_CHOICE_BUTTON_VIS(11, button_11, "@MENU_VISIT_WEBSITE_CAPS", uiScript "visitWebsite", "@NULL_EMPTY", 1)
|
||||
MENU_CHOICE_HORIZONTAL_LINE_VIS(12, 1)
|
||||
MENU_CHOICE_BUTTON_VIS(12, button_12, "@MENU_MAIN_MENU_CAPS", open single_popmenu;, "@MENU_SP_DESC_SINGLEPLAYER", 1)
|
||||
MENU_CHOICE_BUTTON_VIS(13, button_13, "@MENU_QUIT_CAPS", open quit_popmenu;, "@MPUI_DESC_QUIT", 1)
|
||||
MENU_CHOICE_BUTTON_VIS(9, button_9, "@MENU_SP_CREDITS_CAPS", open iw4x_credits;, "@NULL_EMPTY", 1)
|
||||
MENU_CHOICE_BUTTON_VIS(10, button_10, "@MENU_VISIT_WEBSITE_CAPS", uiScript "visitWebsite", "@NULL_EMPTY", 1)
|
||||
MENU_CHOICE_HORIZONTAL_LINE_VIS(11, 1)
|
||||
MENU_CHOICE_BUTTON_VIS(11, button_11, "@MENU_MAIN_MENU_CAPS", open single_popmenu;, "@MENU_SP_DESC_SINGLEPLAYER", 1)
|
||||
MENU_CHOICE_BUTTON_VIS(12, button_12, "@MENU_QUIT_CAPS", open quit_popmenu;, "@MPUI_DESC_QUIT", 1)
|
||||
|
||||
ITEM_BUTTON_FRIENDS(-250)
|
||||
|
||||
|
|
|
@ -73,6 +73,7 @@
|
|||
exp text (localvarstring("ui_hint_text")) \
|
||||
}
|
||||
|
||||
{
|
||||
menuDef
|
||||
{
|
||||
name MENU_NAME
|
||||
|
@ -230,3 +231,4 @@ menuDef
|
|||
ITEM_BUTTON_FRIENDS(-120)
|
||||
ITEM_BUTTON_BACK(close self;)
|
||||
}
|
||||
}
|
|
@ -156,6 +156,7 @@
|
|||
open "popup_summary"; \
|
||||
play CHOICE_CLICK_SOUND;
|
||||
|
||||
{
|
||||
menuDef
|
||||
{
|
||||
name MENU_NAME
|
||||
|
@ -261,3 +262,4 @@ menuDef
|
|||
ITEM_BUTTON_SUMMARY_VIS(1)
|
||||
ITEM_BUTTON_BACK(ON_MENU_ESC)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -9,3 +9,4 @@
|
|||
open "createserver";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
setLocalVarString ui_info_name ""; \
|
||||
setLocalVarString ui_info_desc ""; \
|
||||
setLocalVarString ui_info_icon ""; \
|
||||
uiScript "LoadMods";
|
||||
uiScript "LoadMods"; \
|
||||
setFocus "modlist";
|
||||
|
||||
#define MENU_MODS_BUTTON_VIS(nameArg, yPos, textArg, actionArg, visArg) \
|
||||
|
@ -71,6 +71,7 @@
|
|||
exp rect x (posX) \
|
||||
}
|
||||
|
||||
{
|
||||
menuDef
|
||||
{
|
||||
name MENU_NAME
|
||||
|
@ -125,3 +126,4 @@ menuDef
|
|||
|
||||
ITEM_BUTTON_BACK(close self;)
|
||||
}
|
||||
}
|
|
@ -30,6 +30,7 @@
|
|||
#define ON_MENU_KEY_ENTER \
|
||||
uiScript "JoinServer";
|
||||
|
||||
{
|
||||
menuDef
|
||||
{
|
||||
name MENU_NAME
|
||||
|
@ -62,3 +63,4 @@ menuDef
|
|||
BUTTON_FOOTER(86, 100, "serverinfo", "@MENU_SERVER_INFO_CAPS", open "serverinfo_popmenu";)
|
||||
BUTTON_FOOTER(206, 100, "joinserver", "@MENU_JOIN_SERVER_CAPS", uiScript "JoinServer";)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -43,6 +43,7 @@
|
|||
#define ON_GPAD_USED when(dvarBool("gpad_in_use") == 1)
|
||||
#define ON_GPAD_UNUSED when(dvarBool("gpad_in_use") == 0)
|
||||
|
||||
{
|
||||
menuDef
|
||||
{
|
||||
name MENU_NAME
|
||||
|
@ -89,3 +90,4 @@ menuDef
|
|||
|
||||
ITEM_BUTTON_BACK(ON_MENU_ESC)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -43,6 +43,7 @@
|
|||
#define ON_MENU_ESC \
|
||||
close self;
|
||||
|
||||
{
|
||||
menuDef
|
||||
{
|
||||
name MENU_NAME
|
||||
|
@ -89,3 +90,4 @@ menuDef
|
|||
|
||||
ITEM_BUTTON_BACK(ON_MENU_ESC)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -56,6 +56,7 @@
|
|||
execnow "profile_menuDvarsFinish; resetViewport"; \
|
||||
setLocalVarString ui_hint_text "@NULL_EMPTY";
|
||||
|
||||
{
|
||||
menuDef
|
||||
{
|
||||
name MENU_NAME
|
||||
|
@ -82,3 +83,4 @@ menuDef
|
|||
PC_OPTIONS_DVARYESNO(2, "@MPUI_ENABLE_VOICE_CHAT", "cl_voice", ;, when(0))
|
||||
PC_OPTIONS_KEYBINDING(3, "@MENU_VOICE_CHAT_BUTTON", "+talk")
|
||||
}
|
||||
}
|
||||
|
|
|
@ -56,6 +56,7 @@
|
|||
execnow "profile_menuDvarsFinish; resetViewport"; \
|
||||
setLocalVarString ui_hint_text "@NULL_EMPTY";
|
||||
|
||||
{
|
||||
menuDef
|
||||
{
|
||||
name MENU_NAME
|
||||
|
@ -120,3 +121,4 @@ menuDef
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -54,6 +54,7 @@
|
|||
execnow "profile_menuDvarsFinish; resetViewport"; \
|
||||
setLocalVarString ui_hint_text "@NULL_EMPTY";
|
||||
|
||||
{
|
||||
menuDef
|
||||
{
|
||||
name MENU_NAME
|
||||
|
@ -84,3 +85,4 @@ menuDef
|
|||
PC_OPTIONS_EDITFIELD_RAW(3, "@MENU_DEMOS_KEEP", "cl_demosKeep", 3, "@MPUI_DESC_DEMOS_KEEP", 1)
|
||||
PC_OPTIONS_DVARYESNO(4, "@MENU_COLORBLIND_MODE", "r_colorBlindTeams", ;, when(0))
|
||||
}
|
||||
}
|
||||
|
|
|
@ -80,6 +80,7 @@
|
|||
execnow "bindgpbuttonsconfigs"; \
|
||||
}
|
||||
|
||||
{
|
||||
menuDef
|
||||
{
|
||||
name MENU_NAME
|
||||
|
@ -130,3 +131,4 @@ menuDef
|
|||
"@MENU_SENSITIVITY_VERY_HIGH_CAPS" SENSITIVITY_7 "8" SENSITIVITY_8 "9" SENSITIVITY_9 "@MENU_SENSITIVITY_INSANE_CAPS" SENSITIVITY_10},
|
||||
;, ;, ON_GPAD_DISABLED, ON_GPAD_ENABLED)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -40,6 +40,7 @@
|
|||
#define ON_MENU_ESC \
|
||||
close self;
|
||||
|
||||
{
|
||||
menuDef
|
||||
{
|
||||
name MENU_NAME
|
||||
|
@ -90,3 +91,4 @@ menuDef
|
|||
|
||||
ITEM_BUTTON_BACK(ON_MENU_ESC)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -40,6 +40,7 @@
|
|||
#define ON_MENU_ESC \
|
||||
close self;
|
||||
|
||||
{
|
||||
menuDef
|
||||
{
|
||||
name MENU_NAME
|
||||
|
@ -86,3 +87,4 @@ menuDef
|
|||
|
||||
ITEM_BUTTON_BACK(ON_MENU_ESC)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -58,6 +58,7 @@
|
|||
execnow "profile_menuDvarsFinish; resetViewport"; \
|
||||
setLocalVarString ui_hint_text "@NULL_EMPTY";
|
||||
|
||||
{
|
||||
menuDef
|
||||
{
|
||||
name MENU_NAME
|
||||
|
@ -97,3 +98,4 @@ menuDef
|
|||
PC_OPTIONS_DVARYESNO_RAW(6, "@MENU_STREAMFRIENDLY_UI", "ui_streamFriendly", ;, "@MPUI_DESC_STREAM_FRIENDLY_UI", when(0), 1)
|
||||
PC_OPTIONS_FLOATLIST_RAW(7, "@MENU_FRIENDNOTIFY", "cl_notifyFriendState", {"Always" -1 "Never" 0 "in Menu" 1}, ;, "@MPUI_DESC_FRIENDNOTIFY", when(dvarBool("ui_streamFriendly")), 1)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -67,6 +67,7 @@
|
|||
execnow "profile_menuDvarsFinish; resetViewport"; \
|
||||
setLocalVarString ui_hint_text "@NULL_EMPTY";
|
||||
|
||||
{
|
||||
menuDef
|
||||
{
|
||||
name MENU_NAME
|
||||
|
@ -136,3 +137,4 @@ menuDef
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -47,6 +47,7 @@
|
|||
#define ON_MENU_ESC \
|
||||
close self;
|
||||
|
||||
{
|
||||
menuDef
|
||||
{
|
||||
name MENU_NAME
|
||||
|
@ -69,3 +70,4 @@ menuDef
|
|||
|
||||
POPUP_BUTTON_FOOTER(64, "@MENU_CLOSE", close self;)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -47,6 +47,7 @@
|
|||
#define ON_MENU_ESC \
|
||||
close self;
|
||||
|
||||
{
|
||||
menuDef
|
||||
{
|
||||
name MENU_NAME
|
||||
|
@ -69,3 +70,4 @@ menuDef
|
|||
|
||||
POPUP_BUTTON_FOOTER(64, "@MENU_CLOSE", close self;)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
#define ON_EXEC_KEY_F \
|
||||
escape self;
|
||||
|
||||
{
|
||||
menuDef
|
||||
{
|
||||
name MENU_NAME
|
||||
|
@ -71,3 +72,4 @@ menuDef
|
|||
}
|
||||
POPUP_BUTTON_FOOTER(350, "@MENU_CLOSE", close self;)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -47,6 +47,8 @@
|
|||
#define ON_MENU_ESC \
|
||||
close self;
|
||||
|
||||
|
||||
{
|
||||
menuDef
|
||||
{
|
||||
name MENU_NAME
|
||||
|
@ -69,3 +71,4 @@ menuDef
|
|||
|
||||
POPUP_BUTTON_FOOTER(64, "@MENU_OK", close self;)
|
||||
}
|
||||
}
|
|
@ -49,6 +49,7 @@
|
|||
#define ON_MENU_ESC \
|
||||
close self;
|
||||
|
||||
{
|
||||
menuDef
|
||||
{
|
||||
name MENU_NAME
|
||||
|
@ -71,3 +72,4 @@ menuDef
|
|||
|
||||
POPUP_BUTTON_FOOTER(64, "@MENU_CLOSE", exec "setfromdvar name ui_name"; close self;)
|
||||
}
|
||||
}
|
|
@ -49,6 +49,7 @@
|
|||
#define ON_MENU_ESC \
|
||||
close self;
|
||||
|
||||
{
|
||||
menuDef
|
||||
{
|
||||
name MENU_NAME
|
||||
|
@ -71,3 +72,4 @@ menuDef
|
|||
|
||||
POPUP_BUTTON_FOOTER(64, "@MENU_OK", close self;)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -81,7 +81,7 @@
|
|||
elementtype LISTBOX_TEXT
|
||||
elementwidth 120
|
||||
elementheight 24
|
||||
columns 1 2 190 25
|
||||
columns 1 2 190 25 0
|
||||
mouseEnter
|
||||
{
|
||||
setitemcolor "maplist2";
|
||||
|
|
|
@ -83,7 +83,7 @@
|
|||
bordercolor 1 1 1 0.15
|
||||
outlinecolor 1 1 1 0.2
|
||||
feeder FEEDER_ALLMAPS
|
||||
columns 1 2 190 25
|
||||
columns 1 2 190 25 0
|
||||
mouseEnter
|
||||
{
|
||||
setitemcolor "maplist";
|
||||
|
|
|
@ -80,7 +80,7 @@
|
|||
bordercolor 1 1 1 0.15
|
||||
outlinecolor 1 1 1 0.2
|
||||
feeder FEEDER_PLAYER_LIST
|
||||
columns 1 2 190 25
|
||||
columns 1 2 190 25 0
|
||||
mouseEnter
|
||||
{
|
||||
setitemcolor "maplist";
|
||||
|
|
|
@ -109,58 +109,6 @@
|
|||
#define SV_INFO_TABLE_WIDTH 496
|
||||
#define SV_INFO_TABLE_HEIGHT 160
|
||||
|
||||
#define SV_INFO_TABLE_HEADER \
|
||||
itemDef \
|
||||
{ \
|
||||
name "num" \
|
||||
rect (SV_INFO_TABLE_POS_X + 4) (SV_INFO_TABLE_POS_Y - 2) 30 18 0 0 \
|
||||
foreColor CHOICE_TEXTCOLOR \
|
||||
textFont UI_FONT_NORMAL \
|
||||
textScale 0.3 \
|
||||
textAlignX 4 \
|
||||
decoration \
|
||||
visible 1 \
|
||||
text "#" \
|
||||
} \
|
||||
itemDef \
|
||||
{ \
|
||||
name "name" \
|
||||
rect 88 (SV_INFO_TABLE_POS_Y - 2) 30 18 0 0 \
|
||||
foreColor CHOICE_TEXTCOLOR \
|
||||
textFont UI_FONT_NORMAL \
|
||||
textScale 0.3 \
|
||||
textAlignX 4 \
|
||||
decoration \
|
||||
visible 1 \
|
||||
text "@MENU_NAME" \
|
||||
} \
|
||||
itemDef \
|
||||
{ \
|
||||
name "score" \
|
||||
rect 353 (SV_INFO_TABLE_POS_Y - 2) 30 18 0 0 \
|
||||
foreColor CHOICE_TEXTCOLOR \
|
||||
textFont UI_FONT_NORMAL \
|
||||
textScale 0.3 \
|
||||
textAlignX 4 \
|
||||
decoration \
|
||||
visible 1 \
|
||||
text "@MPUI_SCORE" \
|
||||
} \
|
||||
itemDef \
|
||||
{ \
|
||||
name "ping" \
|
||||
rect 455 (SV_INFO_TABLE_POS_Y - 2) 30 18 0 0 \
|
||||
foreColor CHOICE_TEXTCOLOR \
|
||||
textFont UI_FONT_NORMAL \
|
||||
textScale 0.3 \
|
||||
textAlignX 4 \
|
||||
decoration \
|
||||
visible 1 \
|
||||
text "@MENU_PING" \
|
||||
}
|
||||
|
||||
#define MENU_NAME "serverinfo_popmenu"
|
||||
|
||||
#define KEYINT_F5 171
|
||||
|
||||
#define POPMENU_POS_X -250
|
||||
|
@ -184,9 +132,10 @@
|
|||
#define ON_KEY_PRESS_F5 \
|
||||
uiScript "ServerStatus";
|
||||
|
||||
{
|
||||
menuDef
|
||||
{
|
||||
name MENU_NAME
|
||||
name "serverinfo_popmenu"
|
||||
rect POPMENU_RECT
|
||||
popup
|
||||
legacySplitScreenScale
|
||||
|
@ -215,7 +164,53 @@ menuDef
|
|||
|
||||
SV_INFO_SECURITY_LEVEL_VIS(6, 1)
|
||||
|
||||
SV_INFO_TABLE_HEADER
|
||||
itemDef
|
||||
{
|
||||
name "num"
|
||||
rect (SV_INFO_TABLE_POS_X + 4) (SV_INFO_TABLE_POS_Y - 2) 30 18 0 0
|
||||
foreColor CHOICE_TEXTCOLOR
|
||||
textFont UI_FONT_NORMAL
|
||||
textScale 0.3
|
||||
textAlignX 4
|
||||
visible 1
|
||||
text "#"
|
||||
}
|
||||
|
||||
itemDef
|
||||
{
|
||||
name "name"
|
||||
rect 88 (SV_INFO_TABLE_POS_Y - 2) 30 18 0 0
|
||||
foreColor CHOICE_TEXTCOLOR
|
||||
textFont UI_FONT_NORMAL
|
||||
textScale 0.3
|
||||
textAlignX 4
|
||||
visible 1
|
||||
text "@MENU_NAME"
|
||||
}
|
||||
|
||||
itemDef
|
||||
{
|
||||
name "score"
|
||||
rect 353 (SV_INFO_TABLE_POS_Y - 2) 30 18 0 0
|
||||
foreColor CHOICE_TEXTCOLOR
|
||||
textFont UI_FONT_NORMAL
|
||||
textScale 0.3
|
||||
textAlignX 4
|
||||
visible 1
|
||||
text "@MPUI_SCORE"
|
||||
}
|
||||
|
||||
itemDef
|
||||
{
|
||||
name "ping"
|
||||
rect 455 (SV_INFO_TABLE_POS_Y - 2) 30 18 0 0
|
||||
foreColor CHOICE_TEXTCOLOR
|
||||
textFont UI_FONT_NORMAL
|
||||
textScale 0.3
|
||||
textAlignX 4
|
||||
visible 1
|
||||
text "@MENU_PING"
|
||||
}
|
||||
|
||||
itemDef
|
||||
{
|
||||
|
@ -244,3 +239,4 @@ menuDef
|
|||
POPUP_BUTTON_FOOTER(330, "@PLATFORM_REFRESH", uiScript "ServerStatus";)
|
||||
POPUP_BUTTON_FOOTER(350, "@MENU_CLOSE", close self;)
|
||||
}
|
||||
}
|
|
@ -56,7 +56,6 @@
|
|||
textScale 0.55
|
||||
textStyle 0
|
||||
textFont 0
|
||||
feeder 0
|
||||
visible 1
|
||||
}
|
||||
itemDef
|
||||
|
@ -81,7 +80,6 @@
|
|||
textScale 0.55
|
||||
textStyle 0
|
||||
textFont 0
|
||||
feeder 0
|
||||
visible 1
|
||||
exp rect x ( ( 0 - 107 ) - ( ( float( milliseconds( ) % 60000 ) / 60000 ) * ( 854 ) ) )
|
||||
}
|
||||
|
@ -107,7 +105,6 @@
|
|||
textScale 0.55
|
||||
textStyle 0
|
||||
textFont 0
|
||||
feeder 0
|
||||
visible 1
|
||||
exp rect x ( ( - 107 + 854 ) + ( ( float( milliseconds( ) % 50000 ) / 50000 ) * ( 854 ) ) )
|
||||
}
|
||||
|
@ -133,7 +130,6 @@
|
|||
textScale 0.55
|
||||
textStyle 0
|
||||
textFont 0
|
||||
feeder 0
|
||||
visible 1
|
||||
exp forecolor a ( ( ( ( sin milliseconds( ) / 1500 ) + 1 ) * 0.250000 ) + 0.250000 )
|
||||
}
|
||||
|
@ -159,7 +155,6 @@
|
|||
textScale 0.55
|
||||
textStyle 0
|
||||
textFont 0
|
||||
feeder 0
|
||||
visible 1
|
||||
exp forecolor a ( ( ( ( sin milliseconds( ) / 480 ) + 1 ) * 0.250000 ) + 0.250000 )
|
||||
}
|
||||
|
@ -184,7 +179,6 @@
|
|||
textScale 0.44
|
||||
textStyle 0
|
||||
textFont 9
|
||||
feeder 0
|
||||
text "@MENU_CHOOSE_GAME_MODE_CAP"
|
||||
visible 1
|
||||
}
|
||||
|
@ -210,7 +204,6 @@
|
|||
textScale 0.55
|
||||
textStyle 0
|
||||
textFont 0
|
||||
feeder 0
|
||||
visible 1
|
||||
}
|
||||
itemDef
|
||||
|
@ -235,7 +228,6 @@
|
|||
textScale 0.55
|
||||
textStyle 0
|
||||
textFont 0
|
||||
feeder 0
|
||||
visible 1
|
||||
}
|
||||
itemDef
|
||||
|
@ -260,7 +252,6 @@
|
|||
textScale 0.55
|
||||
textStyle 0
|
||||
textFont 0
|
||||
feeder 0
|
||||
visible 1
|
||||
}
|
||||
itemDef
|
||||
|
@ -285,7 +276,6 @@
|
|||
textScale 0.55
|
||||
textStyle 0
|
||||
textFont 0
|
||||
feeder 0
|
||||
visible 1
|
||||
}
|
||||
itemDef
|
||||
|
@ -310,7 +300,6 @@
|
|||
textScale 0.55
|
||||
textStyle 0
|
||||
textFont 0
|
||||
feeder 0
|
||||
visible 1
|
||||
}
|
||||
itemDef
|
||||
|
@ -335,7 +324,6 @@
|
|||
textScale 0.55
|
||||
textStyle 0
|
||||
textFont 0
|
||||
feeder 0
|
||||
visible 1
|
||||
}
|
||||
itemDef
|
||||
|
@ -360,7 +348,6 @@
|
|||
textScale 0.55
|
||||
textStyle 0
|
||||
textFont 0
|
||||
feeder 0
|
||||
visible 1
|
||||
}
|
||||
itemDef
|
||||
|
@ -385,7 +372,6 @@
|
|||
textScale 0.55
|
||||
textStyle 0
|
||||
textFont 0
|
||||
feeder 0
|
||||
visible 1
|
||||
}
|
||||
itemDef
|
||||
|
@ -410,7 +396,6 @@
|
|||
textScale 0.55
|
||||
textStyle 0
|
||||
textFont 0
|
||||
feeder 0
|
||||
visible 1
|
||||
}
|
||||
|
||||
|
@ -445,7 +430,6 @@
|
|||
textScale 0.375 \
|
||||
textStyle 0 \
|
||||
textFont 3 \
|
||||
feeder 0 \
|
||||
visible 1 \
|
||||
visible visArg \
|
||||
exp text ( "@" + tablelookup( "mp/gameTypesTable.csv" , 0 , textArg , 1 ) + "_CAPS" ) \
|
||||
|
@ -502,7 +486,6 @@
|
|||
textStyle 0 \
|
||||
textFont 3 \
|
||||
text textArg \
|
||||
feeder 0 \
|
||||
visible 1 \
|
||||
visible visArg \
|
||||
onFocus \
|
||||
|
@ -617,7 +600,6 @@
|
|||
textScale 0.375
|
||||
textStyle 0
|
||||
textFont 3
|
||||
feeder 0
|
||||
text "@PLATFORM_BACK_CAPS"
|
||||
visible 1
|
||||
onFocus
|
||||
|
@ -659,7 +641,6 @@
|
|||
textScale 0.55
|
||||
textStyle 0
|
||||
textFont 0
|
||||
feeder 0
|
||||
visible 1
|
||||
}
|
||||
itemDef
|
||||
|
@ -683,7 +664,6 @@
|
|||
textScale 0.375
|
||||
textStyle 0
|
||||
textFont 9
|
||||
feeder 0
|
||||
visible 1
|
||||
exp text ( localvarstring( "ui_info_name" ) )
|
||||
}
|
||||
|
@ -709,7 +689,6 @@
|
|||
textScale 0.375
|
||||
textStyle 0
|
||||
textFont 3
|
||||
feeder 0
|
||||
visible 1
|
||||
exp text ( localvarstring( "ui_info_desc" ) )
|
||||
}
|
||||
|
|
|
@ -211,6 +211,7 @@
|
|||
#define ON_MENU_ESC \
|
||||
close self;
|
||||
|
||||
{
|
||||
menuDef
|
||||
{
|
||||
name MENU_NAME
|
||||
|
@ -263,3 +264,4 @@ menuDef
|
|||
|
||||
ITEM_BUTTON_BACK(close self;)
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue