fix perms of script

Co-authored-by: Louvenarde <louve@louve.systems>

.github/workflows/release.yml

@@ -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 }}'

iw4x/iw4x_00/default_mp.cfg

@@ -7,18 +7,5 @@ exec default_mp_gamesettings.cfg
 
 exec default_filter.cfg
 
-
-
-// ==== all of below should be moved to code ====
-
-set cl_voice 0
-
 // PC - default server settings:
 set scr_game_allowkillcam	1
-
-// disabled - why is this different on PC?
-
-//set ui_buildLocation -60 460 
-// looks better than default
-//set ui_buildLocation -30 20
-set ui_buildLocation -20 15

iw4x/iw4x_00/default_mp_controls.cfg

@@ -58,10 +58,13 @@ bind `			"toggleconsole"
 bind t	"chatmodepublic"
 bind b "mp_QuickMessage" //nightvision is on n now
 bind y	"chatmodeteam"
-//bind z	"+talk"
+bind z	"+talk"
 //bind x	"openscriptmenu ingame changeweapon"
 
 // CLIENT ENVIRONMENT COMMANDS
+bind F1		"vote yes"
+bind F2		"vote no"
+bind F4		"+scores"
 bind F12	"screenshotJPEG"
 
 // Default controller bindings

iw4x/iw4x_00/localizedstrings/iw4x_english.str

@@ -322,6 +322,9 @@ LANG_ENGLISH		"When should the friend status notifications be displayed?"
 REFERENCE			MPUI_DESC_OPTIONS
 LANG_ENGLISH		"Set your game options."
 
+REFERENCE			MPUI_ENABLE_VOICE_CHAT
+LANG_ENGLISH		"Enable Voice Chat"
+
 REFERENCE			MPUI_DESC_QUIT
 LANG_ENGLISH		"Quit the game."
 
@@ -472,6 +475,12 @@ LANG_ENGLISH		"FOV: "
 REFERENCE			MENU_FOV_HINT_PC
 LANG_ENGLISH		"An increased Field of View (FOV), may result in poor performance on older computers."
 
+REFERENCE			MPUI_RULES_AIMASSIST
+LANG_ENGLISH		"Aim Assist"
+
+REFERENCE			MPUI_RULES_VOICECHAT
+LANG_ENGLISH		"Voice Chat"
+
 REFERENCE			MENU_8X
 LANG_ENGLISH		"8x"
 
@@ -955,6 +964,9 @@ LANG_ENGLISH		"Juiced"
 REFERENCE			SPLASHES_COMBATHIGH_DESC
 LANG_ENGLISH		"Move faster for a few seconds after spawning."
 
+REFERENCE			MENU_CHANGE_GAMETYPE
+LANG_ENGLISH		"Change Gametype"
+
 REFERENCE			MENU_GAMEPAD
 LANG_ENGLISH		"Gamepad"
 
@@ -1030,4 +1042,7 @@ LANG_ENGLISH		"^2&&1  ^7Flip icon vertically"
 REFERENCE			FONT_ICON_MODIFIER_LIST_BIG
 LANG_ENGLISH		"^2&&1  ^7Bigger icon"
 
+REFERENCE			GAME_NOTONROTATION
+LANG_ENGLISH		"This map or gamemode is not part of the server rotation"
+
 ENDMARKER

iw4x/iw4x_00/maps/mp/mp_farm.gsc

@@ -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");
 }

iw4x/iw4x_00/maps/mp/mp_strike.gsc

@@ -0,0 +1,30 @@
+main()
+{
+	maps\mp\mp_strike_precache::main();
+	maps\mp\mp_strike_fx::main();
+	maps\createart\mp_strike_art::main();
+	maps\mp\_load::main();
+	
+	maps\mp\_compass::setupMiniMap( "compass_map_mp_strike" );
+
+	AmbientPlay( "ambient_mp_strike" );
+
+	game["attackers"] = "allies";
+	game["defenders"] = "axis";
+
+	SetDvar( "compassmaxrange", "1900" );
+	SetDvar( "r_specularcolorscale", "1.86" );
+	
+	thread BreakGlass();
+}
+
+BreakGlass()
+{
+	level waittill( "connected" );
+	glass = getGlassArray( "brokenglass01" );
+	
+	foreach( piece in glass )
+	{
+		destroyGlass( piece );
+	}
+}

iw4x/iw4x_00/mp/basemaps.arena

@@ -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"
+}

iw4x/iw4x_00/ui_mp/controls_multi.menu

@@ -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,7 +64,10 @@ 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)
-}
+}

iw4x/iw4x_00/ui_mp/joinserver.inc

@@ -244,9 +244,11 @@ itemDef
 
 #define TAB_BORDER_COLOR											0.1 0.1 0.12 0.5
 
-#define PASSWORD_WIDTH												20
-#define MATCHTYPE_WIDTH												PASSWORD_WIDTH
-#define	SERVER_WIDTH												208
+#define PASSWORD_WIDTH												30
+#define MATCHTYPE_WIDTH												20
+#define AIMASSIST_WIDTH												20
+#define VOICECHAT_WIDTH												20
+#define SERVER_WIDTH												208
 #define MAP_WIDTH													70
 #define PLAYERS_WIDTH												50
 #define TYPE_WIDTH													102
@@ -262,9 +264,11 @@ itemDef
 #define TABLE_POS_X													0
 #define TABLE_POS_Y													42
 
-#define PASSWORD_POS_X												TABLE_POS_X
+#define PASSWORD_POS_X												(TABLE_POS_X + 5)
 #define MATCHTYPE_POS_X												(TABLE_POS_X + PASSWORD_WIDTH + 2)
-#define SERVER_POS_X												(MATCHTYPE_POS_X + MATCHTYPE_WIDTH + 2)
+#define AIMASSIST_POS_X												(MATCHTYPE_POS_X + MATCHTYPE_WIDTH + 2)
+#define VOICECHAT_POS_X												(AIMASSIST_POS_X + AIMASSIST_WIDTH + 2)
+#define SERVER_POS_X												(VOICECHAT_POS_X + VOICECHAT_WIDTH + 2)
 #define MAP_POS_X													(SERVER_POS_X + SERVER_WIDTH + 2)
 #define PLAYERS_POS_X												(MAP_POS_X + MAP_WIDTH + 2)
 #define TYPE_POS_X													(PLAYERS_POS_X + PLAYERS_WIDTH + 2)
@@ -319,6 +323,8 @@ itemDef
 
 #define PASSWORD_ORIGIN												PASSWORD_POS_X			(TABLE_POS_Y + 2)
 #define MATCHTYPE_ORIGIN											MATCHTYPE_POS_X			(TABLE_POS_Y + 2)
+#define AIMASSIST_ORIGIN											AIMASSIST_POS_X			(TABLE_POS_Y + 2)
+#define VOICECHAT_ORIGIN											VOICECHAT_POS_X			(TABLE_POS_Y + 2)
 #define SERVER_ORIGIN												SERVER_POS_X			(TABLE_POS_Y + 2)
 #define MAP_ORIGIN													MAP_POS_X				(TABLE_POS_Y + 2)
 #define PLAYERS_ORIGIN												PLAYERS_POS_X			(TABLE_POS_Y + 2)
@@ -328,6 +334,8 @@ itemDef
 
 #define PASSWORD_RECT												PASSWORD_ORIGIN			PASSWORD_WIDTH		TABLE_HEIGHT		HORIZONTAL_ALIGN_SUBLEFT VERTICAL_ALIGN_TOP
 #define MATCHTYPE_RECT												MATCHTYPE_ORIGIN		MATCHTYPE_WIDTH		TABLE_HEIGHT		HORIZONTAL_ALIGN_SUBLEFT VERTICAL_ALIGN_TOP
+#define AIMASSIST_RECT												AIMASSIST_ORIGIN		AIMASSIST_WIDTH		TABLE_HEIGHT		HORIZONTAL_ALIGN_SUBLEFT VERTICAL_ALIGN_TOP
+#define VOICECHAT_RECT												VOICECHAT_ORIGIN		VOICECHAT_WIDTH		TABLE_HEIGHT		HORIZONTAL_ALIGN_SUBLEFT VERTICAL_ALIGN_TOP
 #define SERVER_RECT													SERVER_ORIGIN			SERVER_WIDTH		TABLE_HEIGHT		HORIZONTAL_ALIGN_SUBLEFT VERTICAL_ALIGN_TOP
 #define MAP_RECT													MAP_ORIGIN				MAP_WIDTH			TABLE_HEIGHT		HORIZONTAL_ALIGN_SUBLEFT VERTICAL_ALIGN_TOP
 #define PLAYERS_RECT												PLAYERS_ORIGIN			PLAYERS_WIDTH		TABLE_HEIGHT		HORIZONTAL_ALIGN_SUBLEFT VERTICAL_ALIGN_TOP
@@ -355,6 +363,8 @@ MENU_BACKGROUND_FRAME_DROP_SHADOW(TABLE_POS_X, (TABLE_POS_Y + TABLE_HEIGHT), TAB
 	}
 
 PREPROC_COLUMN_SEPERATOR_LINE("lineMatchtype", (MATCHTYPE_POS_X - 2) (TABLE_POS_Y + 2))
+PREPROC_COLUMN_SEPERATOR_LINE("lineAimAssist", (AIMASSIST_POS_X - 2) (TABLE_POS_Y + 2))
+PREPROC_COLUMN_SEPERATOR_LINE("lineVoiceChat", (VOICECHAT_POS_X - 2) (TABLE_POS_Y + 2))
 PREPROC_COLUMN_SEPERATOR_LINE("lineServer", (SERVER_POS_X - 2) (TABLE_POS_Y + 2))
 PREPROC_COLUMN_SEPERATOR_LINE("lineMap", (MAP_POS_X - 2) (TABLE_POS_Y + 2))
 PREPROC_COLUMN_SEPERATOR_LINE("linePlayers", (PLAYERS_POS_X - 2) (TABLE_POS_Y + 2))
@@ -378,8 +388,10 @@ itemDef
 	elementWidth													120
 	elementHeight													16
 //	numcols			xpos							xwidth					textlen			alignment
-	columns 8		(PASSWORD_POS_X + 1)			16						20				1
+	columns 10		(PASSWORD_POS_X + 1)			16						10				1
 					(MATCHTYPE_POS_X - 2)			16						10				1
+					(AIMASSIST_POS_X - 2)			16						10				1
+					(VOICECHAT_POS_X - 2)			16						10				1
 					(SERVER_POS_X + 1)				SERVER_WIDTH			38				0
 					(MAP_POS_X + 1)					MAP_WIDTH				25				0
 					(PLAYERS_POS_X + 1)				PLAYERS_WIDTH			10				0
@@ -412,6 +424,8 @@ itemDef
 		setItemColor												grpTabs foreColor 1 0.8 0.4 1;
 		setItemColor												passwordicon foreColor 1 1.0 0.5 1;
 		setItemColor												matchtypeicon foreColor 1 1 1 1;
+		setItemColor												aimassisticon foreColor 1 1 1 1;
+		setItemColor												voicechaticon foreColor 1 1 1 1;
 	}
 }
 itemDef
@@ -420,7 +434,7 @@ itemDef
 	rect															PASSWORD_ORIGIN 16 16 HORIZONTAL_ALIGN_SUBLEFT VERTICAL_ALIGN_TOP
 	origin															2 2
 	style															WINDOW_STYLE_SHADER
-	background														"hud_server_locked"
+	background														"cardicon_locked"
 	decoration
 	visible															1
 }
@@ -441,6 +455,8 @@ itemDef
 		setItemColor												grpTabs foreColor 1 0.8 0.4 1;
 		setItemColor												matchtypeicon foreColor 1 1.0 0.5 1;
 		setItemColor												passwordicon foreColor 1 1 1 1;
+		setItemColor												aimassisticon foreColor 1 1 1 1;
+		setItemColor												voicechaticon foreColor 1 1 1 1;
 	}
 }
 itemDef
@@ -454,6 +470,68 @@ itemDef
 	visible															1
 }
 
+itemDef
+{
+	name															"aimassist"
+	group															grpTabs
+	rect															AIMASSIST_RECT
+	type															ITEM_TYPE_BUTTON
+	style															WINDOW_STYLE_FILLED
+	foreColor														1 0.8 0.4 1
+	visible															1
+	action
+	{
+		play														CHOICE_CLICK_SOUND;
+		uiScript													"ServerSort" 2;
+		setItemColor												grpTabs foreColor 1 0.8 0.4 1;
+		setItemColor												aimassisticon foreColor 1 1.0 0.5 1;
+		setItemColor												passwordicon foreColor 1 1 1 1;
+		setItemColor												matchtypeicon foreColor 1 1 1 1;
+		setItemColor												voicechaticon foreColor 1 1 1 1;
+	}
+}
+itemDef
+{
+	name															"aimassisticon"
+	rect															AIMASSIST_ORIGIN 16 16 HORIZONTAL_ALIGN_SUBLEFT VERTICAL_ALIGN_TOP
+	origin															0 2
+	style															WINDOW_STYLE_SHADER
+	background														"cardicon_headshot"
+	decoration
+	visible															1
+}
+
+itemDef
+{
+	name															"voicechat"
+	group															grpTabs
+	rect															VOICECHAT_RECT
+	type															ITEM_TYPE_BUTTON
+	style															WINDOW_STYLE_FILLED
+	foreColor														1 0.8 0.4 1
+	visible															1
+	action
+	{
+		play														CHOICE_CLICK_SOUND;
+		uiScript													"ServerSort" 3;
+		setItemColor												grpTabs foreColor 1 0.8 0.4 1;
+		setItemColor												voicechaticon foreColor 1 1.0 0.5 1;
+		setItemColor												passwordicon foreColor 1 1 1 1;
+		setItemColor												matchtypeicon foreColor 1 1 1 1;
+		setItemColor												aimassisticon foreColor 1 1 1 1;
+	}
+}
+itemDef
+{
+	name															"voicechaticon"
+	rect															VOICECHAT_ORIGIN 16 16 HORIZONTAL_ALIGN_SUBLEFT VERTICAL_ALIGN_TOP
+	origin															0 2
+	style															WINDOW_STYLE_SHADER
+	background														"talkingicon"
+	decoration
+	visible															1
+}
+
 itemDef
 {
 	name															"server"
@@ -470,10 +548,12 @@ itemDef
 	action
 	{
 		play														CHOICE_CLICK_SOUND;
-		uiScript													"ServerSort" 2;
+		uiScript													"ServerSort" 4;
 		setItemColor												grpTabs foreColor 1 0.8 0.4 1;
 		setItemColor												matchtypeicon foreColor 1 1 1 1;
 		setItemColor												passwordicon foreColor 1 1 1 1;
+		setItemColor												aimassisticon foreColor 1 1 1 1;
+		setItemColor												voicechaticon foreColor 1 1 1 1;
 		setitemColor												self foreColor 1 1.0 0.5 1;
 	}
 }
@@ -494,10 +574,12 @@ itemDef
 	action
 	{
 		play														CHOICE_CLICK_SOUND;
-		uiScript													"ServerSort" 3;
+		uiScript													"ServerSort" 5;
 		setItemColor												grpTabs foreColor 1 0.8 0.4 1;
 		setItemColor												matchtypeicon foreColor 1 1 1 1;
 		setItemColor												passwordicon foreColor 1 1 1 1;
+		setItemColor												aimassisticon foreColor 1 1 1 1;
+		setItemColor												voicechaticon foreColor 1 1 1 1;
 		setitemColor												self foreColor 1 1.0 0.5 1;
 	}
 }
@@ -518,10 +600,12 @@ itemDef
 	action
 	{
 		play														CHOICE_CLICK_SOUND;
-		uiScript													"ServerSort" 4;
+		uiScript													"ServerSort" 6;
 		setItemColor												grpTabs foreColor 1 0.8 0.4 1;
 		setItemColor												matchtypeicon foreColor 1 1 1 1;
 		setItemColor												passwordicon foreColor 1 1 1 1;
+		setItemColor												aimassisticon foreColor 1 1 1 1;
+		setItemColor												voicechaticon foreColor 1 1 1 1;
 		setitemColor												self foreColor 1 1.0 0.5 1;
 	}
 }
@@ -542,10 +626,12 @@ itemDef
 	action
 	{
 		play														CHOICE_CLICK_SOUND;
-		uiScript													"ServerSort" 5;
+		uiScript													"ServerSort" 7;
 		setItemColor												grpTabs foreColor 1 0.8 0.4 1;
 		setItemColor												matchtypeicon foreColor 1 1 1 1;
 		setItemColor												passwordicon foreColor 1 1 1 1;
+		setItemColor												aimassisticon foreColor 1 1 1 1;
+		setItemColor												voicechaticon foreColor 1 1 1 1;
 		setitemColor												self foreColor 1 1.0 0.5 1;
 	}
 }
@@ -566,10 +652,12 @@ itemDef
 	action
 	{
 		play														CHOICE_CLICK_SOUND;
-		uiScript													"ServerSort" 6;
+		uiScript													"ServerSort" 8;
 		setItemColor												grpTabs foreColor 1 0.8 0.4 1;
 		setItemColor												matchtypeicon foreColor 1 1 1 1;
 		setItemColor												passwordicon foreColor 1 1 1 1;
+		setItemColor												aimassisticon foreColor 1 1 1 1;
+		setItemColor												voicechaticon foreColor 1 1 1 1;
 		setitemColor												self foreColor 1 1.0 0.5 1;
 	}
 }
@@ -590,10 +678,12 @@ itemDef
 	action
 	{
 		play														CHOICE_CLICK_SOUND;
-		uiScript													"ServerSort" 7;
+		uiScript													"ServerSort" 9;
 		setItemColor												grpTabs foreColor 1 0.8 0.4 1;
 		setItemColor												matchtypeicon foreColor 1 1 1 1;
 		setItemColor												passwordicon foreColor 1 1 1 1;
+		setItemColor												aimassisticon foreColor 1 1 1 1;
+		setItemColor												voicechaticon foreColor 1 1 1 1;
 		setitemColor												self foreColor 1 1.0 0.5 1;
 	}
 }

iw4x/iw4x_00/ui_mp/main_text.menu

@@ -101,7 +101,8 @@
 		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_QUIT_CAPS", open quit_popmenu;, "@MPUI_DESC_QUIT", 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)
 
 		ITEM_BUTTON_FRIENDS(-250)
 
@@ -143,7 +144,7 @@
 		itemDef
 		{
 			name					"hint_area"
-			rect					0 400 215 18 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP
+			rect					0 380 215 18 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP
 			foreColor				1 1 1 0.65
 			textAlign				6
 			textScale				CHOICE_TEXTSIZE

iw4x/iw4x_00/ui_mp/pc_options_audio.menu

@@ -78,4 +78,7 @@ menuDef
 
 	PC_OPTIONS_DVARSLIDER_RAW(0, "@MENU_MASTER_VOLUME", "snd_volume", 0, 1, 0, ;, ;, ;, when(0), 1, 1)
 	PC_OPTIONS_STRLIST_RAW(1, "@MENU_SPEAKER_CONFIG", "ui_outputConfig", {"@MENU_WINDOWS_DEFAULT"; "Windows default"; "@MENU_MONO"; "Mono"; "@MENU_STEREO"; "Stereo"; "@MENU_FOUR_SPEAKERS"; "4 speakers"; "@MENU_FIVE_ONE_SPEAKERS"; "5.1 speakers"}, setLocalVarBool "ui_showAudioApply" (1);, ;, when((dvarBool("cl_ingame") || dvarBool("sv_running") || inlobby())), 1)
+	PC_OPTIONS_SEPERATOR(1)
+	PC_OPTIONS_DVARYESNO(2, "@MPUI_ENABLE_VOICE_CHAT", "cl_voice", ;, when(0))
+	PC_OPTIONS_KEYBINDING(3, "@MENU_VOICE_CHAT_BUTTON", "+talk")
 }

iw4x/iw4x_00/ui_mp/scriptmenus/callvote.menu

@@ -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")
+	}
+}

iw4x/iw4x_00/ui_mp/scriptmenus/changegametype.menu

@@ -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";
+			}
+		}
+	}
+}

iw4x/iw4x_00/ui_mp/scriptmenus/changemap.menu

@@ -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";
+			}
+		}
+	}
+}

iw4x/iw4x_00/ui_mp/scriptmenus/class.menu

@@ -474,13 +474,12 @@
 			textalign 6
 			textalignx -60
 			textscale 0.375
-			text "@MENU_OPTIONS"
+			text "@MPUI_MUTE_PLAYERS"
 			action
 			{
 				play "mouse_click";
 				close self;
-				open "pc_options_video";
-				execnow "set ui_allow_graphic_change 0";
+				open "muteplayer";
 			}
 			onFocus
 			{
@@ -515,14 +514,54 @@
 			textalign 6
 			textalignx -60
 			textscale 0.375
-			//text "@MPUI_MUTE_PLAYERS"
+			text "@MENU_OPTIONS"
+			action
+			{
+				play "mouse_click";
+				close self;
+				open "pc_options_video";
+				execnow "set ui_allow_graphic_change 0";
+			}
+			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_options"
+			rect -64 108 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
 			disabled when(dvarBool("party_host"))
 			text "@MENU_ADD_TO_FAVORITES"
 			action
 			{
 				play "mouse_click";
 				close self;
-				//open "muteplayer";
+				open "muteplayer";
 				uiScript "CreateCurrentServerFavorite";
 			}
 			onFocus
@@ -544,9 +583,50 @@
 			}
 		}
 		itemDef
+		{
+			name "game_callvote"
+			rect -64 128 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
+			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 108 336 20 1 1
+			rect -64 148 336 20 1 1
 			visible 1
 			group "mw2_button"
 			style 1
@@ -586,7 +666,7 @@
 		itemDef
 		{
 			name "game_leavegame"
-			rect -64 108 336 20 1 1
+			rect -64 148 336 20 1 1
 			visible 1
 			group "mw2_button"
 			style 1
@@ -758,4 +838,4 @@
 			}
 		}
 	}
-}
+}

iw4x/iw4x_00/ui_mp/scriptmenus/kickplayer.menu

@@ -0,0 +1,126 @@
+#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", "@MENU_CHANGE_MAP", open "changemap"; close "changegametype"; close "kickplayer"; close self;, ;, 1)
+		MENU_CHOICE_BUTTON_VIS(3, "button_4", "Change Gametype", open "changegametype"; close "changemap"; close "kickplayer"; close self;, ;, 1)
+		MENU_CHOICE_BUTTON_VIS(4, "button_5", "@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";
+			}
+		}
+	}
+}

iw4x/iw4x_00/ui_mp/serverinfo_popmenu.menu

@@ -206,8 +206,8 @@ menuDef
 	SV_INFO_FIELD(1, "@MPUI_MAX_CLIENTS", dvarString("uiSi_MaxClients"))
 	SV_INFO_FIELD(2, "@MPUI_IS_PRIVATE", dvarString("uiSi_isPrivate"))
 	SV_INFO_FIELD(3, "@MPUI_RULES_HARDCORE", dvarString("uiSi_Hardcore"))
-	SV_INFO_FIELD(4, "@MPUI_RULES_KILLCAM", dvarString("uiSi_KillCam"))
-	SV_INFO_FIELD(5, "@MPUI_RULES_FRIENDLY_FIRE", dvarString("uiSi_ffType"))
+	SV_INFO_FIELD(4, "@MPUI_RULES_AIMASSIST", dvarString("uiSi_aimAssist"))
+	SV_INFO_FIELD(5, "@MPUI_RULES_VOICECHAT", dvarString("uiSi_voiceChat"))
 	SV_INFO_FIELD(6, "@MPUI_MOD", dvarString("uiSi_ModName"))
 
 	SV_INFO_MAP_PREVIEW_VIS(("loadscreen_mp_bonusmaps"), when(dvarString("uiSi_MapName") == ""))

iw4x/iw4x_00/vision/mp_broadcast.vision

@@ -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"

iw4x/iw4x_00/vision/mp_citystreets.vision

@@ -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"

iw4x/iw4x_00/vision/mp_convoy.vision

@@ -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"␍

iw4x/iw4x_00/vision/mp_pipeline.vision

@@ -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"

iw4x/iw4x_00/vision/mp_showdown.vision

@@ -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"

scripts/release.ps1

@@ -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"

scripts/run_release.bat

@@ -0,0 +1 @@
+powershell.exe -ExecutionPolicy Bypass ./release.ps1