Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 FutureRave
|
38206c025e | ||
|
Diavolo
|
f21170657f | ||
  LouveandLouvenarde
|
baf2a1a412 | ||
|
Diavolo
|
04e8e63b5a | ||
|
Diavolo
|
638819ab60 | ||
|
Louveandlouve
|
c3e80edf72 | ||
|
|
dca7466e18 | ||
|
Edo
|
b1fcbc2c99 | ||
|
Edo
|
30603c9db3 | ||
|
Edo
|
84eedf0024 | ||
|
FutureRave
|
e185e7ad72 | ||
 JoelColbyandEdo
|
137bbc4b98 | ||
|
FutureRave
|
a78ddaf9fb |
No files matched your search
@@ -11,7 +11,10 @@ jobs:
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: 1
|
||||
- run: 'bash ${GITHUB_WORKSPACE}/scripts/release.sh'
|
||||
- name: Create ZIP archive
|
||||
run: './scripts/release.sh'
|
||||
shell: bash
|
||||
|
||||
- uses: marvinpinto/action-automatic-releases@latest
|
||||
with:
|
||||
repo_token: '${{ secrets.GITHUB_TOKEN }}'
|
||||
|
||||
@@ -13,7 +13,7 @@ main()
|
||||
game["attackers"] = "allies";
|
||||
game["defenders"] = "axis";
|
||||
|
||||
setdvar( "r_specularcolorscale", "5" );
|
||||
setdvar("r_specularcolorscale", 1.279588); // Set by iw3xport
|
||||
|
||||
setdvar("compassmaxrange","2000");
|
||||
}
|
||||
|
||||
+102
-60
@@ -613,79 +613,121 @@
|
||||
}
|
||||
|
||||
{
|
||||
map "mp_backlot"
|
||||
longname "MPUI_BACKLOT"
|
||||
gametype "dm war sab sab2 dom sd sd2 hc koth"
|
||||
description "MPUI_DESC_MAP_BACKLOT"
|
||||
mapimage "preview_mp_backlot"
|
||||
mapoverlay "compass_overlay_map_blank"
|
||||
allieschar "us_army"
|
||||
axischar "opforce_composite"
|
||||
useteamzones "true"
|
||||
environment "desert"
|
||||
map "mp_backlot"
|
||||
longname "MPUI_BACKLOT"
|
||||
gametype "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw"
|
||||
description "MPUI_DESC_MAP_BACKLOT"
|
||||
mapimage "preview_mp_backlot"
|
||||
mapoverlay "compass_overlay_map_blank "
|
||||
allieschar "us_army"
|
||||
axischar "opforce_composite"
|
||||
environment "desert"
|
||||
}
|
||||
|
||||
{
|
||||
map "mp_farm"
|
||||
longname "MPUI_FARM"
|
||||
gametype "dm war sab sab2 dom sd sd2 hc koth"
|
||||
description "MPUI_DESC_MAP_FARM"
|
||||
mapimage "preview_mp_farm"
|
||||
mapoverlay "compass_overlay_map_blank"
|
||||
allieschar "us_army"
|
||||
axischar "opforce_airborne"
|
||||
useteamzones "true"
|
||||
environment "forest"
|
||||
map "mp_farm"
|
||||
longname "MPUI_FARM"
|
||||
gametype "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw"
|
||||
description "MPUI_DESC_MAP_FARM"
|
||||
mapimage "preview_mp_farm"
|
||||
mapoverlay "compass_overlay_map_blank "
|
||||
allieschar "socom_141_forest"
|
||||
axischar "opforce_airborne"
|
||||
environment "forest"
|
||||
}
|
||||
|
||||
{
|
||||
map "mp_countdown"
|
||||
longname "MPUI_COUNTDOWN"
|
||||
gametype "dm war sab sab2 dom sd sd2 hc koth"
|
||||
description "MPUI_DESC_MAP_COUNTDOWN"
|
||||
mapimage "preview_mp_countdown"
|
||||
mapoverlay "compass_overlay_map_blank"
|
||||
allieschar "us_army"
|
||||
axischar "opforce_airborne"
|
||||
useteamzones "true"
|
||||
environment "urban"
|
||||
map "mp_countdown"
|
||||
longname "MPUI_COUNTDOWN"
|
||||
gametype "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw"
|
||||
description "MPUI_DESC_MAP_COUNTDOWN"
|
||||
mapimage "preview_mp_countdown"
|
||||
mapoverlay "compass_overlay_map_blank "
|
||||
allieschar "us_army"
|
||||
axischar "opforce_composite"
|
||||
environment "forest"
|
||||
}
|
||||
|
||||
{
|
||||
map "mp_pipeline"
|
||||
longname "MPUI_PIPELINE"
|
||||
gametype "dm war sab sab2 dom sd sd2 hc koth"
|
||||
description "MPUI_DESC_MAP_PIPELINE"
|
||||
mapimage "preview_mp_pipeline"
|
||||
mapoverlay "compass_overlay_map_blank"
|
||||
allieschar "us_army"
|
||||
axischar "opforce_airborne"
|
||||
useteamzones "true"
|
||||
environment "forest"
|
||||
map "mp_pipeline"
|
||||
longname "MPUI_PIPELINE"
|
||||
gametype "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw"
|
||||
description "MPUI_DESC_MAP_PIPELINE"
|
||||
mapimage "preview_mp_pipeline"
|
||||
mapoverlay "compass_overlay_map_blank "
|
||||
allieschar "socom_141_forest"
|
||||
axischar "opforce_airborne"
|
||||
environment "forest"
|
||||
}
|
||||
|
||||
{
|
||||
map "mp_crash_snow"
|
||||
longname "MPUI_CRASH_SNOW"
|
||||
gametype "dm war sab sab2 dom sd sd2 hc koth"
|
||||
description "MPUI_DESC_MAP_CRASH_SNOW"
|
||||
mapimage "preview_mp_crash_snow"
|
||||
mapoverlay "compass_overlay_map_blank"
|
||||
allieschar "socom_141_arctic"
|
||||
axischar "opforce_arctic"
|
||||
useteamzones "true"
|
||||
environment "arctic"
|
||||
map "mp_crash_snow"
|
||||
longname "MPUI_CRASH_SNOW"
|
||||
gametype "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw"
|
||||
description "MPUI_DESC_MAP_CRASH_SNOW"
|
||||
mapimage "preview_mp_crash_snow"
|
||||
mapoverlay "compass_overlay_map_blank "
|
||||
allieschar "socom_141_arctic"
|
||||
axischar "opforce_arctic"
|
||||
environment "arctic"
|
||||
}
|
||||
|
||||
{
|
||||
map "mp_carentan"
|
||||
longname "MPUI_CARENTAN"
|
||||
gametype "dm war sab sab2 dom sd sd2 hc koth"
|
||||
description "MPUI_DESC_MAP_CARENTAN"
|
||||
mapimage "preview_mp_carentan"
|
||||
mapoverlay "compass_overlay_map_blank"
|
||||
allieschar "us_army"
|
||||
axischar "opforce_airborne"
|
||||
useteamzones "true"
|
||||
environment "urban"
|
||||
map "mp_carentan"
|
||||
longname "MPUI_CARENTAN"
|
||||
gametype "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw"
|
||||
description "MPUI_DESC_MAP_CARENTAN"
|
||||
mapimage "preview_mp_carentan"
|
||||
mapoverlay "compass_overlay_map_blank "
|
||||
allieschar "seals_udt"
|
||||
axischar "opforce_airborne"
|
||||
environment "urban"
|
||||
}
|
||||
|
||||
{
|
||||
map "mp_showdown"
|
||||
longname "MPUI_SHOWDOWN"
|
||||
gametype "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw"
|
||||
description "MPUI_DESC_MAP_SHOWDOWN"
|
||||
mapimage "preview_mp_showdown"
|
||||
mapoverlay "compass_overlay_map_blank "
|
||||
allieschar "us_army"
|
||||
axischar "opforce_composite"
|
||||
environment "desert"
|
||||
}
|
||||
|
||||
{
|
||||
map "mp_convoy"
|
||||
longname "MPUI_CONVOY"
|
||||
gametype "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw"
|
||||
description "MPUI_DESC_MAP_CONVOY"
|
||||
mapimage "preview_mp_convoy"
|
||||
mapoverlay "compass_overlay_map_blank "
|
||||
allieschar "us_army"
|
||||
axischar "opforce_composite"
|
||||
environment "desert"
|
||||
}
|
||||
|
||||
{
|
||||
map "mp_citystreets"
|
||||
longname "MPUI_CITYSTREETS"
|
||||
gametype "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw"
|
||||
description "MPUI_DESC_MAP_CITYSTREETS"
|
||||
mapimage "preview_mp_citystreets"
|
||||
mapoverlay "compass_overlay_map_blank "
|
||||
allieschar "us_army"
|
||||
axischar "opforce_composite"
|
||||
environment "urban"
|
||||
}
|
||||
|
||||
{
|
||||
map "mp_broadcast"
|
||||
longname "MPUI_BROADCAST"
|
||||
gametype "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw"
|
||||
description "MPUI_DESC_MAP_BROADCAST"
|
||||
mapimage "preview_mp_broadcast"
|
||||
mapoverlay "compass_overlay_map_blank "
|
||||
allieschar "us_army"
|
||||
axischar "opforce_composite"
|
||||
environment "desert"
|
||||
}
|
||||
@@ -2,11 +2,11 @@
|
||||
#include "ui_mp/main.inc"
|
||||
#include "ui_mp/pc_options.inc"
|
||||
|
||||
#define MENU_NAME "controls_multi"
|
||||
#define MENU_TITLE "@MENU_CHAT"
|
||||
#define MENU_NAME "controls_multi"
|
||||
#define MENU_TITLE "@MENU_CHAT"
|
||||
|
||||
#undef CHOICE_GROUP
|
||||
#define CHOICE_GROUP MENU_NAME
|
||||
#define CHOICE_GROUP MENU_NAME
|
||||
|
||||
#define CLOSE_MENUS \
|
||||
close "main_controls"; \
|
||||
@@ -29,16 +29,16 @@
|
||||
close "pc_options_voice";
|
||||
|
||||
#define ON_MENU_OPEN \
|
||||
CLOSE_MENUS \
|
||||
setLocalVarBool "ui_hideBack" (1); \
|
||||
setLocalVarBool ui_hint_display 0;
|
||||
CLOSE_MENUS \
|
||||
setLocalVarBool "ui_hideBack" (1); \
|
||||
setLocalVarBool ui_hint_display 0;
|
||||
|
||||
#define ON_MENU_CLOSE \
|
||||
setLocalVarBool "ui_hideBack" (0); \
|
||||
open "pc_options_controls";
|
||||
setLocalVarBool "ui_hideBack" (0); \
|
||||
open "pc_options_controls";
|
||||
|
||||
#define ON_MENU_ESC \
|
||||
close self;
|
||||
close self;
|
||||
|
||||
menuDef
|
||||
{
|
||||
@@ -64,6 +64,9 @@ menuDef
|
||||
PC_OPTIONS_KEYBINDING(1, "@MENU_TEXT_TEAM_CHAT", "chatmodeteam")
|
||||
PC_OPTIONS_KEYBINDING(2, "@MENU_QUICK_CHAT", "mp_QuickMessage")
|
||||
|
||||
PC_OPTIONS_KEYBINDING(4, "@MENU_VOTE_YES", "vote yes")
|
||||
PC_OPTIONS_KEYBINDING(5, "@MENU_VOTE_NO", "vote no")
|
||||
|
||||
PC_OPTIONS_KEYBINDSTATUS
|
||||
|
||||
ITEM_BUTTON_BACK(ON_MENU_ESC)
|
||||
|
||||
@@ -0,0 +1,56 @@
|
||||
#include "ui/menudef.h"
|
||||
#include "ui_mp/main.inc"
|
||||
|
||||
#define MENU_NAME "callvote"
|
||||
#define MENU_TITLE "@MPUI_CALLVOTE"
|
||||
#define MENU_SECTION_TITLE ""
|
||||
|
||||
#undef CHOICE_GROUP
|
||||
#define CHOICE_GROUP MENU_NAME
|
||||
|
||||
{
|
||||
menuDef
|
||||
{
|
||||
name MENU_NAME
|
||||
rect 0 0 640 480
|
||||
foreColor CHOICE_TEXTCOLOR
|
||||
focusColor CHOICE_TEXTCOLOR
|
||||
blurWorld 7
|
||||
onEsc
|
||||
{
|
||||
close "self";
|
||||
open "class";
|
||||
}
|
||||
|
||||
#define BACKGROUND_PC_OPTIONS
|
||||
#define BACKGROUND_IW4
|
||||
#define SIDEBAR_RIGHT
|
||||
#include "ui_mp/bg.inc"
|
||||
|
||||
itemDef
|
||||
{
|
||||
rect 0 0 272 28 1 1
|
||||
decoration
|
||||
visible 1
|
||||
forecolor 1 1 1 1
|
||||
textfont 9
|
||||
textalign 6
|
||||
textalignx -60
|
||||
textscale 0.5
|
||||
text MENU_TITLE
|
||||
}
|
||||
|
||||
#define CHOICE_Y(i) (28 + (i * 20))
|
||||
#define CHOICE_ORIGIN(i) -64 CHOICE_Y(i)
|
||||
#define CHOICE_RECT(i) CHOICE_ORIGIN(i) 336 20 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP
|
||||
|
||||
#define HR_ORIGIN(i) 0 (CHOICE_Y(i) - 0.5)
|
||||
#define HR_RECT(i) HR_ORIGIN(i) 216 1 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP
|
||||
|
||||
MENU_CHOICE_BUTTON_VIS(0, "button_1", "@MP_VOTE_MAPRESTART", exec "cmd callvote map_restart"; close self;, ;, 1)
|
||||
MENU_CHOICE_BUTTON_VIS(1, "button_2", "@MP_VOTE_NEXTMAP", exec "cmd callvote map_rotate"; close self;, ;, 1)
|
||||
MENU_CHOICE_BUTTON_VIS(2, "button_3", "@MPUI_KICK_PLAYER", open "kickplayer"; close "changemap"; close "changegametype"; close self;, ;, 1)
|
||||
|
||||
ITEM_BUTTON_BACK(close "self")
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,125 @@
|
||||
#include "ui/menudef.h"
|
||||
#include "ui_mp/main.inc"
|
||||
|
||||
#define MENU_NAME "changegametype"
|
||||
#define MENU_TITLE "@MPUI_CALLVOTE"
|
||||
#define MENU_SECTION_TITLE ""
|
||||
|
||||
#undef CHOICE_GROUP
|
||||
#define CHOICE_GROUP MENU_NAME
|
||||
{
|
||||
menuDef
|
||||
{
|
||||
name MENU_NAME
|
||||
rect 0 0 640 480
|
||||
foreColor CHOICE_TEXTCOLOR
|
||||
focusColor CHOICE_TEXTCOLOR
|
||||
blurWorld 7
|
||||
onEsc
|
||||
{
|
||||
close "self";
|
||||
open "class";
|
||||
}
|
||||
|
||||
#define BACKGROUND_PC_OPTIONS
|
||||
#define BACKGROUND_IW4
|
||||
#define SIDEBAR_RIGHT
|
||||
#include "ui_mp/bg.inc"
|
||||
|
||||
itemDef
|
||||
{
|
||||
rect 0 0 272 28 1 1
|
||||
decoration
|
||||
visible 1
|
||||
forecolor 1 1 1 1
|
||||
textfont 9
|
||||
textalign 6
|
||||
textalignx -60
|
||||
textscale 0.5
|
||||
text MENU_TITLE
|
||||
}
|
||||
|
||||
#define CHOICE_Y(i) (28 + (i * 20))
|
||||
#define CHOICE_ORIGIN(i) -64 CHOICE_Y(i)
|
||||
#define CHOICE_RECT(i) CHOICE_ORIGIN(i) 336 20 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP
|
||||
|
||||
#define HR_ORIGIN(i) 0 (CHOICE_Y(i) - 0.5)
|
||||
#define HR_RECT(i) HR_ORIGIN(i) 216 1 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP
|
||||
|
||||
MENU_CHOICE_BUTTON_VIS(0, "button_1", "@MP_VOTE_MAPRESTART", exec "cmd callvote map_restart"; close self;, ;, 1)
|
||||
MENU_CHOICE_BUTTON_VIS(1, "button_2", "@MP_VOTE_NEXTMAP", exec "cmd callvote map_rotate"; close self;, ;, 1)
|
||||
MENU_CHOICE_BUTTON_VIS(2, "button_3", "@MENU_CHANGE_MAP", open "changemap"; close "changegametype"; close "kickplayer"; close "callvote";, ;, 1)
|
||||
MENU_CHOICE_BUTTON_VIS(3, "button_4", "Change Gametype", open "changegametype"; close "changemap"; close "kickplayer"; close "callvote";, ;, 1)
|
||||
MENU_CHOICE_BUTTON_VIS(4, "button_5", "@MPUI_KICK_PLAYER", open "kickplayer"; close "changemap"; close "changegametype"; close "callvote";, ;, 1)
|
||||
|
||||
#undef CHOICE_Y
|
||||
#undef CHOICE_ORIGIN
|
||||
#undef CHOICE_RECT
|
||||
|
||||
#include "ui_mp/pc_options.inc"
|
||||
|
||||
PC_OPTIONS_SECTION_TITLE("Change Gametype")
|
||||
|
||||
ITEM_BUTTON_BACK(close "self")
|
||||
|
||||
itemDef
|
||||
{
|
||||
name "maplist2"
|
||||
rect 275 42 300 270 1 1
|
||||
forecolor 1 1 1 1
|
||||
style 1
|
||||
type ITEM_TYPE_LISTBOX
|
||||
border 1
|
||||
bordersize 1
|
||||
bordercolor 1 1 1 0.15
|
||||
outlinecolor 1 1 1 0.2
|
||||
textscale 0.375
|
||||
textfont 3
|
||||
textalignx 6
|
||||
visible 1
|
||||
feeder FEEDER_GAMEMODES
|
||||
elementtype LISTBOX_TEXT
|
||||
elementwidth 120
|
||||
elementheight 24
|
||||
columns 1 2 190 25
|
||||
mouseEnter
|
||||
{
|
||||
setitemcolor "maplist2";
|
||||
bordercolor 1 1 1 0.55;
|
||||
}
|
||||
mouseExit
|
||||
{
|
||||
setitemcolor "maplist2";
|
||||
bordercolor 1 1 1 0.15;
|
||||
}
|
||||
}
|
||||
itemDef
|
||||
{
|
||||
rect 275 312 320 20 1 1
|
||||
style 1
|
||||
forecolor 1 1 1 1
|
||||
background "menu_setting_selection_bar"
|
||||
type 1
|
||||
textfont 3
|
||||
textalign 6
|
||||
textalignx -55
|
||||
textscale 0.375
|
||||
text "@MPUI_CALL_VOTE"
|
||||
visible 1
|
||||
onFocus
|
||||
{
|
||||
play "mouse_over";
|
||||
setItemColor self backcolor 0 0 0 1;
|
||||
}
|
||||
leaveFocus
|
||||
{
|
||||
setItemColor self backcolor 0 0 0 0;
|
||||
}
|
||||
action
|
||||
{
|
||||
close "self";
|
||||
uiScript "voteGame";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,127 @@
|
||||
#include "ui/menudef.h"
|
||||
#include "ui_mp/main.inc"
|
||||
|
||||
#define MENU_NAME "changemap"
|
||||
#define MENU_TITLE "@MPUI_CALLVOTE"
|
||||
#define MENU_SECTION_TITLE ""
|
||||
|
||||
#undef CHOICE_GROUP
|
||||
#define CHOICE_GROUP MENU_NAME
|
||||
{
|
||||
menuDef
|
||||
{
|
||||
name MENU_NAME
|
||||
rect 0 0 640 480
|
||||
foreColor CHOICE_TEXTCOLOR
|
||||
focusColor CHOICE_TEXTCOLOR
|
||||
blurWorld 7
|
||||
onEsc
|
||||
{
|
||||
close "self";
|
||||
open "class";
|
||||
}
|
||||
|
||||
#define BACKGROUND_PC_OPTIONS
|
||||
#define BACKGROUND_IW4
|
||||
#define SIDEBAR_RIGHT
|
||||
#include "ui_mp/bg.inc"
|
||||
|
||||
itemDef
|
||||
{
|
||||
rect 0 0 272 28 1 1
|
||||
decoration
|
||||
visible 1
|
||||
forecolor 1 1 1 1
|
||||
textfont 9
|
||||
textalign 6
|
||||
textalignx -60
|
||||
textscale 0.5
|
||||
text MENU_TITLE
|
||||
}
|
||||
|
||||
#define CHOICE_Y(i) (28 + (i * 20))
|
||||
#define CHOICE_ORIGIN(i) -64 CHOICE_Y(i)
|
||||
#define CHOICE_RECT(i) CHOICE_ORIGIN(i) 336 20 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP
|
||||
|
||||
#define HR_ORIGIN(i) 0 (CHOICE_Y(i) - 0.5)
|
||||
#define HR_RECT(i) HR_ORIGIN(i) 216 1 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP
|
||||
|
||||
MENU_CHOICE_BUTTON_VIS(0, "button_1", "@MP_VOTE_MAPRESTART", exec "cmd callvote map_restart"; close self;, ;, 1)
|
||||
MENU_CHOICE_BUTTON_VIS(1, "button_2", "@MP_VOTE_NEXTMAP", exec "cmd callvote map_rotate"; close self;, ;, 1)
|
||||
MENU_CHOICE_BUTTON_VIS(2, "button_3", "@MENU_CHANGE_MAP", open "changemap"; close "changegametype"; close "kickplayer"; close "callvote";, ;, 1)
|
||||
MENU_CHOICE_BUTTON_VIS(3, "button_4", "Change Gametype", open "changegametype"; close "changemap"; close "kickplayer"; close "callvote";, ;, 1)
|
||||
MENU_CHOICE_BUTTON_VIS(4, "button_5", "@MPUI_KICK_PLAYER", open "kickplayer"; close "changemap"; close "changegametype"; close "callvote";, ;, 1)
|
||||
|
||||
#undef CHOICE_Y
|
||||
#undef CHOICE_ORIGIN
|
||||
#undef CHOICE_RECT
|
||||
|
||||
#include "ui_mp/pc_options.inc"
|
||||
|
||||
PC_OPTIONS_SECTION_TITLE("@MENU_CHANGE_MAP")
|
||||
|
||||
ITEM_BUTTON_BACK(close "self")
|
||||
|
||||
itemDef
|
||||
{
|
||||
name "maplist"
|
||||
visible 1
|
||||
rect 275 42 300 270 1 1
|
||||
forecolor 1 1 1 1
|
||||
style 1
|
||||
type ITEM_TYPE_LISTBOX
|
||||
textscale 0.375
|
||||
textfont 3
|
||||
elementtype LISTBOX_TEXT
|
||||
elementwidth 120
|
||||
elementheight 24
|
||||
textalignx 6
|
||||
textaligny -1
|
||||
forecolor 1 1 1 1
|
||||
border 1
|
||||
bordersize 1
|
||||
bordercolor 1 1 1 0.15
|
||||
outlinecolor 1 1 1 0.2
|
||||
feeder FEEDER_ALLMAPS
|
||||
columns 1 2 190 25
|
||||
mouseEnter
|
||||
{
|
||||
setitemcolor "maplist";
|
||||
bordercolor 1 1 1 0.55;
|
||||
}
|
||||
mouseExit
|
||||
{
|
||||
setitemcolor "maplist";
|
||||
bordercolor 1 1 1 0.15;
|
||||
}
|
||||
}
|
||||
itemDef
|
||||
{
|
||||
rect 275 312 320 20 1 1
|
||||
style 1
|
||||
forecolor 1 1 1 1
|
||||
background "menu_setting_selection_bar"
|
||||
type 1
|
||||
textfont 3
|
||||
textalign 6
|
||||
textalignx -55
|
||||
textscale 0.375
|
||||
text "@MPUI_CALL_VOTE"
|
||||
visible 1
|
||||
onFocus
|
||||
{
|
||||
play "mouse_over";
|
||||
setItemColor self backcolor 0 0 0 1;
|
||||
}
|
||||
leaveFocus
|
||||
{
|
||||
setItemColor self backcolor 0 0 0 0;
|
||||
}
|
||||
action
|
||||
{
|
||||
close "self";
|
||||
uiScript "voteMap";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -450,6 +450,16 @@
|
||||
}
|
||||
}
|
||||
itemDef
|
||||
{
|
||||
rect 0 68 216 1 1 1
|
||||
decoration
|
||||
visible 1
|
||||
style 3
|
||||
forecolor 1 1 1 0.65
|
||||
background "gradient_fadein"
|
||||
textscale 0.55
|
||||
}
|
||||
itemDef
|
||||
{
|
||||
name "game_options"
|
||||
rect -64 68 336 20 1 1
|
||||
@@ -490,16 +500,6 @@
|
||||
}
|
||||
}
|
||||
itemDef
|
||||
{
|
||||
rect 0 88 216 1 1 1
|
||||
decoration
|
||||
visible 1
|
||||
style 3
|
||||
forecolor 1 1 1 0.65
|
||||
background "gradient_fadein"
|
||||
textscale 0.55
|
||||
}
|
||||
itemDef
|
||||
{
|
||||
name "game_options"
|
||||
rect -64 88 336 20 1 1
|
||||
@@ -561,6 +561,7 @@
|
||||
{
|
||||
play "mouse_click";
|
||||
close self;
|
||||
open "muteplayer";
|
||||
uiScript "CreateCurrentServerFavorite";
|
||||
}
|
||||
onFocus
|
||||
@@ -583,7 +584,7 @@
|
||||
}
|
||||
itemDef
|
||||
{
|
||||
name "game_endgame"
|
||||
name "game_callvote"
|
||||
rect -64 128 336 20 1 1
|
||||
visible 1
|
||||
group "mw2_button"
|
||||
@@ -596,6 +597,47 @@
|
||||
textalign 6
|
||||
textalignx -60
|
||||
textscale 0.375
|
||||
disabled when(!dvarBool("g_allowvote"))
|
||||
text "@MPUI_CALL_VOTE"
|
||||
action
|
||||
{
|
||||
play "mouse_click";
|
||||
close self;
|
||||
open "callvote";
|
||||
}
|
||||
onFocus
|
||||
{
|
||||
play "mouse_over";
|
||||
if ( dvarstring( "gameMode" ) != "mp" )
|
||||
{
|
||||
setItemColor "mw2_button" backcolor 0 0 0 0;
|
||||
}
|
||||
setItemColor self backcolor 0 0 0 1;
|
||||
setLocalVarBool "ui_menuAButton" ( 1 );
|
||||
setLocalVarFloat "ui_popupYPos" ( getfocuseditemy( ) );
|
||||
}
|
||||
leaveFocus
|
||||
{
|
||||
setItemColor self backcolor 0 0 0 "0.0";
|
||||
setLocalVarString "ui_hint_text" ( "@NULL_EMPTY" );
|
||||
setLocalVarBool "ui_menuAButton" ( 0 );
|
||||
}
|
||||
}
|
||||
itemDef
|
||||
{
|
||||
name "game_endgame"
|
||||
rect -64 148 336 20 1 1
|
||||
visible 1
|
||||
group "mw2_button"
|
||||
style 1
|
||||
forecolor 1 1 1 1
|
||||
disablecolor 0.6 0.55 0.55 1
|
||||
background "menu_button_selection_bar"
|
||||
type 1
|
||||
textfont 3
|
||||
textalign 6
|
||||
textalignx -60
|
||||
textscale 0.375
|
||||
text "@MENU_END_GAME"
|
||||
visible when ( !( dvarbool( "onlinegame" ) && !dvarbool( "xblive_privatematch" ) ) && ( dvarbool( "sv_running" ) ) )
|
||||
action
|
||||
@@ -624,7 +666,7 @@
|
||||
itemDef
|
||||
{
|
||||
name "game_leavegame"
|
||||
rect -64 128 336 20 1 1
|
||||
rect -64 148 336 20 1 1
|
||||
visible 1
|
||||
group "mw2_button"
|
||||
style 1
|
||||
|
||||
@@ -0,0 +1,124 @@
|
||||
#include "ui/menudef.h"
|
||||
#include "ui_mp/main.inc"
|
||||
|
||||
#define MENU_NAME "kickplayer"
|
||||
#define MENU_TITLE "@MPUI_CALLVOTE"
|
||||
#define MENU_SECTION_TITLE ""
|
||||
|
||||
#undef CHOICE_GROUP
|
||||
#define CHOICE_GROUP MENU_NAME
|
||||
|
||||
{
|
||||
menuDef
|
||||
{
|
||||
name MENU_NAME
|
||||
rect 0 0 640 480
|
||||
foreColor CHOICE_TEXTCOLOR
|
||||
focusColor CHOICE_TEXTCOLOR
|
||||
blurWorld 7
|
||||
onEsc
|
||||
{
|
||||
close "self";
|
||||
open "class";
|
||||
}
|
||||
|
||||
#define BACKGROUND_PC_OPTIONS
|
||||
#define BACKGROUND_IW4
|
||||
#define SIDEBAR_RIGHT
|
||||
#include "ui_mp/bg.inc"
|
||||
|
||||
itemDef
|
||||
{
|
||||
rect 0 0 272 28 1 1
|
||||
decoration
|
||||
visible 1
|
||||
forecolor 1 1 1 1
|
||||
textfont 9
|
||||
textalign 6
|
||||
textalignx -60
|
||||
textscale 0.5
|
||||
text MENU_TITLE
|
||||
}
|
||||
|
||||
#define CHOICE_Y(i) (28 + (i * 20))
|
||||
#define CHOICE_ORIGIN(i) -64 CHOICE_Y(i)
|
||||
#define CHOICE_RECT(i) CHOICE_ORIGIN(i) 336 20 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP
|
||||
|
||||
#define HR_ORIGIN(i) 0 (CHOICE_Y(i) - 0.5)
|
||||
#define HR_RECT(i) HR_ORIGIN(i) 216 1 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP
|
||||
|
||||
MENU_CHOICE_BUTTON_VIS(0, "button_1", "@MP_VOTE_MAPRESTART", exec "cmd callvote map_restart"; close self;, ;, 1)
|
||||
MENU_CHOICE_BUTTON_VIS(1, "button_2", "@MP_VOTE_NEXTMAP", exec "cmd callvote map_rotate"; close self;, ;, 1)
|
||||
MENU_CHOICE_BUTTON_VIS(2, "button_3", "@MPUI_KICK_PLAYER", open "kickplayer"; close "changemap"; close "changegametype"; close self;, ;, 1)
|
||||
|
||||
#undef CHOICE_Y
|
||||
#undef CHOICE_ORIGIN
|
||||
#undef CHOICE_RECT
|
||||
|
||||
#include "ui_mp/pc_options.inc"
|
||||
|
||||
PC_OPTIONS_SECTION_TITLE("@MPUI_KICK_PLAYER")
|
||||
|
||||
ITEM_BUTTON_BACK(close "self")
|
||||
|
||||
itemDef
|
||||
{
|
||||
name "maplist"
|
||||
visible 1
|
||||
rect 275 42 300 270 1 1
|
||||
forecolor 1 1 1 1
|
||||
style 1
|
||||
type ITEM_TYPE_LISTBOX
|
||||
textscale 0.375
|
||||
textfont 3
|
||||
elementtype LISTBOX_TEXT
|
||||
elementwidth 120
|
||||
elementheight 24
|
||||
textalignx 6
|
||||
border 1
|
||||
bordersize 1
|
||||
bordercolor 1 1 1 0.15
|
||||
outlinecolor 1 1 1 0.2
|
||||
feeder FEEDER_PLAYER_LIST
|
||||
columns 1 2 190 25
|
||||
mouseEnter
|
||||
{
|
||||
setitemcolor "maplist";
|
||||
bordercolor 1 1 1 0.55;
|
||||
}
|
||||
mouseExit
|
||||
{
|
||||
setitemcolor "maplist";
|
||||
bordercolor 1 1 1 0.15;
|
||||
}
|
||||
}
|
||||
itemDef
|
||||
{
|
||||
rect 275 312 320 20 1 1
|
||||
style 1
|
||||
forecolor 1 1 1 1
|
||||
background "menu_setting_selection_bar"
|
||||
type 1
|
||||
textfont 3
|
||||
textalign 6
|
||||
textalignx -55
|
||||
textscale 0.375
|
||||
text "@MPUI_CALL_VOTE"
|
||||
visible 1
|
||||
onFocus
|
||||
{
|
||||
play "mouse_over";
|
||||
setItemColor self backcolor 0 0 0 1;
|
||||
}
|
||||
leaveFocus
|
||||
{
|
||||
setItemColor self backcolor 0 0 0 0;
|
||||
}
|
||||
action
|
||||
{
|
||||
close "self";
|
||||
uiScript "voteKick";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
r_glow "0"
|
||||
r_glowRadius0 "5"
|
||||
r_glowRadius1 "12"
|
||||
r_glowBloomCutoff "0.9"
|
||||
r_glowBloomDesaturation "0.75"
|
||||
r_glowBloomIntensity0 "1"
|
||||
r_glowBloomIntensity1 "1"
|
||||
r_glowSkyBleedIntensity0 "0.5"
|
||||
r_glowSkyBleedIntensity1 "0"
|
||||
|
||||
r_filmEnable "1"
|
||||
r_filmContrast "1.5"
|
||||
r_filmBrightness "0.2298"
|
||||
r_filmDesaturation "0.1"
|
||||
r_filmInvert "0"
|
||||
r_filmLightTint "1.179 1.086 1.024"
|
||||
r_filmDarkTint "0.7 1.0215 1.265"
|
||||
@@ -0,0 +1,19 @@
|
||||
r_glow "1"
|
||||
r_glowRadius0 "0"
|
||||
r_glowBloomCutoff "0"
|
||||
r_glowBloomDesaturation "0"
|
||||
r_glowBloomIntensity0 "0"
|
||||
|
||||
r_filmEnable "1"
|
||||
r_filmContrast "1.15843"
|
||||
r_filmBrightness "0.0355033"
|
||||
r_filmDesaturation "0.40242"
|
||||
r_filmDesaturationDark "0.402416"
|
||||
r_filmInvert "0"
|
||||
r_filmLightTint "1.25 1.28 0.71"
|
||||
r_filmDarkTint "0.49 0.50 0.465"
|
||||
r_filmMediumTint "1.19992 1.16455 1.16903"
|
||||
|
||||
r_primaryLightUseTweaks "1"
|
||||
r_primaryLightTweakDiffuseStrength "1.5"
|
||||
r_primaryLightTweakSpecularStrength "1.2"
|
||||
@@ -0,0 +1,19 @@
|
||||
r_glow "1"
|
||||
r_glowRadius0 "0"
|
||||
r_glowBloomCutoff "0.000359348"
|
||||
r_glowBloomDesaturation "0"
|
||||
r_glowBloomIntensity0 "0"␍
|
||||
␍
|
||||
r_filmEnable "1"
|
||||
r_filmContrast "0.78"
|
||||
r_filmBrightness "-0.069"
|
||||
r_filmDesaturation "0.28"
|
||||
r_filmDesaturationDark "0.58"
|
||||
r_filmInvert "0"␍
|
||||
r_filmMediumTint "1 1 1"
|
||||
r_filmLightTint "1.17604 1.16347 1.12133"
|
||||
r_filmDarkTint "0.853149 0.782718 1.0015"
|
||||
␍
|
||||
r_primaryLightUseTweaks "1"
|
||||
r_primaryLightTweakDiffuseStrength "1.125"
|
||||
r_primaryLightTweakSpecularStrength "1.5"␍
|
||||
@@ -2,11 +2,11 @@ r_glow "1"
|
||||
r_glowRadius0 "7.15348"
|
||||
r_glowBloomCutoff "0.749243"
|
||||
r_glowBloomDesaturation "1"
|
||||
r_glowBloomIntensity0 "0.3"
|
||||
r_glowBloomIntensity0 "0.6"
|
||||
|
||||
r_filmEnable "1"
|
||||
r_filmContrast "1.068"
|
||||
r_filmBrightness "0.01177428"
|
||||
r_filmBrightness "-0.01177428"
|
||||
r_filmDesaturation "0.060000"
|
||||
r_filmDesaturationDark "0.188197"
|
||||
r_filmInvert "0"
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
r_glow "1"
|
||||
r_glowRadius0 "2.73322"
|
||||
r_glowRadius1 "4.4"
|
||||
r_glowBloomCutoff "0.269427"
|
||||
r_glowBloomDesaturation "0.75"
|
||||
r_glowBloomIntensity0 "0.37154"
|
||||
r_glowBloomIntensity1 ".375"
|
||||
r_glowSkyBleedIntensity0 "0"
|
||||
r_glowSkyBleedIntensity1 "0"
|
||||
|
||||
r_filmEnable "1"
|
||||
r_filmContrast "1.2"
|
||||
r_filmBrightness "0.055"
|
||||
r_filmDesaturation "0.386669"
|
||||
r_filmInvert "0"
|
||||
r_filmLightTint "1.09 1.20125 0.891854"
|
||||
r_filmMediumTint "1.05654 1.05654 0.994713"
|
||||
r_filmDarkTint "1.13153 0.80991 1.19249"
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,79 @@
|
||||
# Window Title
|
||||
(Get-Host).UI.RawUI.WindowTitle = "Release Script: iw4x-rawfiles"
|
||||
|
||||
# Set the progress preference so that no blue progress bars appear in the console when running Compress-Archive cmdlets.
|
||||
${global:ProgressPreference} = "SilentlyContinue"
|
||||
|
||||
# Grab the parent directory of the .ps1 script, regardless of the working directory you run the script from. This should
|
||||
# grab the full path to the iw4x-rawfiles directory, assuming this script is in the iw4x-rawfiles\scripts directory.
|
||||
${rawFilesPath} = (Get-Item ${PSScriptRoot}).parent.FullName
|
||||
|
||||
# Create folders used for the release.
|
||||
if (!(Test-Path -Path "${rawFilesPath}\release")) {
|
||||
[void](New-Item "${rawFilesPath}\release" -ItemType Directory)
|
||||
}
|
||||
|
||||
if (Test-Path -Path "${rawFilesPath}\release\temp") {
|
||||
Remove-Item -Recurse -Force "${rawFilesPath}\release\temp"
|
||||
}
|
||||
|
||||
[void](New-Item "${rawFilesPath}\release\temp" -ItemType Directory)
|
||||
|
||||
# Copy executables, iw4x files, and zone files to the temp folder.
|
||||
Write-Host "Copying executables to ${rawFilesPath}\release\temp..."
|
||||
Copy-Item -Path "${rawFilesPath}\iw4sp.exe" -Destination "${rawFilesPath}\release\temp\iw4sp.exe"
|
||||
Copy-Item -Path "${rawFilesPath}\iw4x.exe" -Destination "${rawFilesPath}\release\temp\iw4x.exe"
|
||||
Write-Host "Done copying executable files.`n"
|
||||
|
||||
Write-Host "Copying files to ${rawFilesPath}\release\temp\iw4x..."
|
||||
Copy-Item -Path "${rawFilesPath}\iw4x" -Destination "${rawFilesPath}\release\temp\iw4x" -Recurse
|
||||
Write-Host "Done copying iw4x files.`n"
|
||||
|
||||
Write-Host "Copying files to ${rawFilesPath}\release\temp\zone..."
|
||||
Copy-Item -Path "${rawFilesPath}\zone" -Destination "${rawFilesPath}\release\temp\zone" -Recurse
|
||||
Write-Host "Done copying zone files.`n"
|
||||
|
||||
# Create iw4x_00.iwd
|
||||
Write-Host "Compressing iw4x_00.zip..."
|
||||
Compress-Archive -Path "${rawFilesPath}\release\temp\iw4x\iw4x_00\*" -DestinationPath "${rawFilesPath}\release\temp\iw4x\iw4x_00.zip"
|
||||
Write-Host "Renaming iw4x_00.zip to iw4x_00.iwd..."
|
||||
Move-Item -Path "${rawFilesPath}\release\temp\iw4x\iw4x_00.zip" -Destination "${rawFilesPath}\release\temp\iw4x\iw4x_00.iwd"
|
||||
Write-Host "Cleaning up iw4x_00 directory..."
|
||||
Remove-Item -Recurse "${rawFilesPath}\release\temp\iw4x\iw4x_00"
|
||||
Write-Host "Finished compressing iw4x_00.iwd`n"
|
||||
|
||||
# Create iw4x_01.iwd
|
||||
Write-Host "Compressing iw4x_01.zip..."
|
||||
Compress-Archive -Path "${rawFilesPath}\release\temp\iw4x\iw4x_01\*" -DestinationPath "${rawFilesPath}\release\temp\iw4x\iw4x_01.zip"
|
||||
Write-Host "Renaming iw4x_01.zip to iw4x_01.iwd..."
|
||||
Move-Item -Path "${rawFilesPath}\release\temp\iw4x\iw4x_01.zip" -Destination "${rawFilesPath}\release\temp\iw4x\iw4x_01.iwd"
|
||||
Write-Host "Cleaning up iw4x_01 directory..."
|
||||
Remove-Item -Recurse "${rawFilesPath}\release\temp\iw4x\iw4x_01"
|
||||
Write-Host "Finished compressing iw4x_01.iwd`n"
|
||||
|
||||
# Create iw4x_02.iwd
|
||||
Write-Host "Compressing iw4x_02.zip..."
|
||||
Compress-Archive -Path "${rawFilesPath}\release\temp\iw4x\iw4x_02\*" -DestinationPath "${rawFilesPath}\release\temp\iw4x\iw4x_02.zip"
|
||||
Write-Host "Renaming iw4x_02.zip to iw4x_02.iwd..."
|
||||
Move-Item -Path "${rawFilesPath}\release\temp\iw4x\iw4x_02.zip" -Destination "${rawFilesPath}\release\temp\iw4x\iw4x_02.iwd"
|
||||
Write-Host "Cleaning up iw4x_02 directory..."
|
||||
Remove-Item -Recurse "${rawFilesPath}\release\temp\iw4x\iw4x_02"
|
||||
Write-Host "Finished compressing iw4x_02.iwd`n"
|
||||
|
||||
# Create release.zip
|
||||
if (Test-Path -Path "${rawFilesPath}\release\release.zip") {
|
||||
Write-Host "Cleaning up old release.zip..."
|
||||
Remove-Item "${rawFilesPath}\release\release.zip"
|
||||
}
|
||||
|
||||
Write-Host "Compressing release.zip..."
|
||||
Compress-Archive -Path "${rawFilesPath}\release\temp\*" -DestinationPath "${rawFilesPath}\release\release.zip"
|
||||
Write-Host "Finished compressing release.zip`n"
|
||||
|
||||
# Clean up temp directory
|
||||
Write-Host "Cleaning up temp directory..."
|
||||
Remove-Item -Recurse "${rawFilesPath}\release\temp"
|
||||
Write-Host "Removed temp directory.`n"
|
||||
|
||||
# Output path for the release file generated
|
||||
Write-Host "iw4x-rawfiles release script finished. File generated: ${rawFilesPath}\release\release.zip"
|
||||
Regular → Executable
File mode changed.
@@ -0,0 +1 @@
|
||||
powershell.exe -ExecutionPolicy Bypass ./release.ps1
|
||||
Binary file not shown.
Binary file not shown.
Reference in new issue
Block a user