Merge branch 'develop' into fix/unsigned-fastfiles

.github/release.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+sudo apt update >> /dev/null && sudo apt install zip -y >> /dev/null # Ensure zip is up to date.
+cd iw4x/
+cd iw4x_00/
+zip -r iw4x_00.iwd *
+mv iw4x_00.iwd ../
+cd .. 
+rm -rf iw4x_00/
+cd iw4x_01/
+zip -r iw4x_01.iwd *
+mv iw4x_01.iwd ../
+cd ..
+rm -rf iw4x_01/
+cd ..
+rm LICENSE
+rm README.md
+rm -rf .github
+zip -r release.zip *

.github/workflows/release.yml

@@ -0,0 +1,20 @@
+name: Release
+on:
+  push:
+    tags:
+      - "*"
+jobs:
+  create_release:
+    name: Create GitHub Release
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 1
+      - run: 'bash ${GITHUB_WORKSPACE}/.github/release.sh'
+      - uses: marvinpinto/action-automatic-releases@latest
+        with:
+          repo_token: '${{ secrets.GITHUB_TOKEN }}'
+          prerelease: false
+          files: |
+            release.zip

iw4x/iw4x_00/localizedstrings/iw4x_english.str

@@ -244,6 +244,18 @@ LANG_ENGLISH		"Chemical Plant"
 REFERENCE			MPUI_DESC_MAP_STORM_SPRING
 LANG_ENGLISH		"A modified version of Storm, snow covered instead of rainy."
 
+REFERENCE			MPUI_CARENTAN
+LANG_ENGLISH		"Chinatown"
+
+REFERENCE			MPUI_DESC_MAP_CARENTAN
+LANG_ENGLISH		"Small city at night. Great for any mode."
+
+REFERENCE			MPUI_CRASH_SNOW
+LANG_ENGLISH		"Winter Crash"
+
+REFERENCE			MPUI_DESC_MAP_CRASH_SNOW
+LANG_ENGLISH		"Dark and snowy holiday themed Crash. Beware the airstrikes..."
+
 REFERENCE			MPUI_CO_HUNTED
 LANG_ENGLISH		"Village"
 
@@ -538,8 +550,8 @@ LANG_ENGLISH		"Show FPS Labels"
 REFERENCE			MENU_NEWCOLORS
 LANG_ENGLISH		"Use new color codes"
 
-REFERENCE			MENU_NEWCOLORS
+REFERENCE			MENU_COLORBLIND_MODE
-LANG_ENGLISH		"Use new color codes"
+LANG_ENGLISH		"Colorblind mode"
 
 REFERENCE			MENU_CHANGELOG
 LANG_ENGLISH		"Changelog"
@@ -997,6 +1009,18 @@ LANG_ENGLISH        "Turn accepting inputs from gamepads on/off"
 REFERENCE           MPUI_DESC_LOOK_INVERSION
 LANG_ENGLISH        "Inverts the gamepad pitch axis (up/down)"
 
+REFERENCE           MENU_GPAD_STYLE
+LANG_ENGLISH        "Button Style"
+
+REFERENCE           MPUI_DESC_GPAD_STYLE
+LANG_ENGLISH        "Switch between Xbox and PlayStation HUDs."
+
+REFERENCE           MENU_GPAD_XBOX_CAPS
+LANG_ENGLISH        "Xbox"
+
+REFERENCE           MENU_GPAD_PS_CAPS
+LANG_ENGLISH        "PlayStation"
+
 REFERENCE           MENU_SLOWDOWN_ENABLED
 LANG_ENGLISH        "Enable slowdown aim assist"
 
@@ -1027,4 +1051,25 @@ LANG_ENGLISH        "(Very High) 7"
 REFERENCE           MENU_SENSITIVITY_INSANE_CAPS
 LANG_ENGLISH        "(Insane) 10"
 
+REFERENCE           FONT_ICON_SEARCH_START_WITH
+LANG_ENGLISH        "Font icons starting with ^2&&1^7:"
+
+REFERENCE           FONT_ICON_HINT_AUTO_COMPLETE
+LANG_ENGLISH        "Press ^3&&1 ^7for autocomplete"
+
+REFERENCE           FONT_ICON_HINT_MODIFIER
+LANG_ENGLISH        "Use ^3&&1 ^7for modifiers"
+
+REFERENCE           FONT_ICON_MODIFIER_LIST_HEADER
+LANG_ENGLISH        "The following modifiers are available:"
+
+REFERENCE           FONT_ICON_MODIFIER_LIST_FLIP_HORIZONTAL
+LANG_ENGLISH        "^2&&1  ^7Flip icon horizontally"
+
+REFERENCE           FONT_ICON_MODIFIER_LIST_FLIP_VERTICAL
+LANG_ENGLISH        "^2&&1  ^7Flip icon vertically"
+
+REFERENCE           FONT_ICON_MODIFIER_LIST_BIG
+LANG_ENGLISH        "^2&&1  ^7Bigger icon"
+
 ENDMARKER

iw4x/iw4x_00/maps/mp/killstreaks/_helicopter.gsc

@@ -390,6 +390,7 @@ heliRide( lifeId, chopper )
 	chopper VehicleTurretControlOn( self );
 	
 	self PlayerLinkWeaponviewToDelta( chopper, "tag_player", 1.0, 180, 180, 0, 180, true );
+	self setPlayerAngles( level.ac130 getTagAngles( "tag_player" ) );
 	
 	chopper.gunner = self;	
 
@@ -1369,6 +1370,20 @@ heli_explode( altStyle )
 
 	// give "death" notify time to process
 	wait ( 0.05 );
+	// g_getplayervieworigin fix
+	// we hide this helicopter then delete it
+
+	if (self.heliType == "minigun")
+	{
+		if (isDefined(self))
+			self hide();
+
+		wait 30;
+
+		if (isDefined(self))
+			self delete();
+	}
+	else
 		self delete();
 }
 
@@ -2043,6 +2058,15 @@ heli_leave()
 	
 	// give "death" notify time to process
 	wait ( 0.05 );
+	
+	// g_getplayervieworigin fix
+	// we hide this helicopter then delete it
+	if (isDefined(self))
+		self hide();
+
+	wait 30;
+
+	if (isDefined(self))
 		self delete();
 }
 

iw4x/iw4x_00/mp/basemaps.arena

@@ -587,3 +587,76 @@
     axischar    "opforce_composite"
     environment "desert"
 }
+
+
+{
+    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"
+    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"
+    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"
+    environment "urban"
+}
+
+{
+    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"
+    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"
+    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"
+    environment "urban"
+}

iw4x/iw4x_00/mp/fonticons.csv

@@ -0,0 +1,881 @@
+# Fonticon Name,# Fonticon Material
+airdropcrate,airdrop_crate_icon
+airdrop,airdrop_icon
+gametype,award_gametype
+knife,award_weapon_knife
+black,black
+xboxa,button_a
+xboxb,button_b
+xboxback,button_back
+xboxleftshoulder,button_lshldr
+xboxleftstick,button_lstick
+xboxlefttrigger,button_ltrig
+xboxrightshoulder,button_rshldr
+xboxrightstick,button_rstick
+xboxrighttrigger,button_rtrig
+xboxstart,button_start
+xboxx,button_x
+xboxy,button_y
+eightball,cardicon_8ball
+price_8bit,cardicon_8bit_price
+abduction,cardicon_abduction
+abrams,cardicon_abrams
+angelflare,cardicon_ac130_angelflare
+aircraft,cardicon_aircraft_01
+animals,cardicon_animals
+assad,cardicon_assad
+award_jets,cardicon_award_jets
+b2,cardicon_b2
+baseball,cardicon_ball_baseball_1
+volleyball,cardicon_ball_volleyball_1
+bear,cardicon_bear
+binoculars,cardicon_binoculars_1
+biohazard,cardicon_biohazard
+birdbrain,cardicon_birdbrain
+booniehat,cardicon_booniehat
+boot,cardicon_boot
+boots1,cardicon_boots_01
+boots2,cardicon_boots_02
+brassknuckles,cardicon_brassknuckles
+brit_beret,cardicon_brit_beret
+bulb,cardicon_bulb
+bulletcase,cardicon_bulletcase
+bullets,cardicon_bullets_50cal
+burgertown,cardicon_burgertown
+car,cardicon_car
+chicken,cardicon_chicken
+circuit,cardicon_circuit
+claw,cardicon_claw
+cod4,cardicon_cod4
+price_comic,cardicon_comic_price
+shepherd_comic,cardicon_comic_shepherd
+compass,cardicon_compass
+devilfinger,cardicon_devilfinger
+dogtags,cardicon_dogtags_1
+doubletap,cardicon_doubletap
+eagle,cardicon_eagle
+electro,cardicon_electro
+aa12_master,cardicon_expert_aa12
+ak47_master,cardicon_expert_ak47
+aug_master,cardicon_expert_aug
+barrett_master,cardicon_expert_barrett
+m9_master,cardicon_expert_beretta
+raffica_master,cardicon_expert_beretta393
+intervention_master,cardicon_expert_cheytac
+magnum_master,cardicon_expert_coltanaconda
+deserteagle_master,cardicon_expert_deserteagle
+fal_master,cardicon_expert_fal
+famas_master,cardicon_expert_famas
+fn2000_master,cardicon_expert_fn2000
+g18_master,cardicon_expert_glock
+vector_master,cardicon_expert_kriss
+m1014_master,cardicon_expert_m1014
+m16a4_master,cardicon_expert_m16
+m21_master,cardicon_expert_m21
+m240_master,cardicon_expert_m240
+m4a1_master,cardicon_expert_m4
+acr_master,cardicon_expert_masada
+mg4_master,cardicon_expert_mg4
+model1887_master,cardicon_expert_model1887
+mp5k_master,cardicon_expert_mp5k
+p90_master,cardicon_expert_p90
+pp2000_master,cardicon_expert_pp2000
+ranger_master,cardicon_expert_ranger
+rpd_master,cardicon_expert_rpd
+l86lsw_master,cardicon_expert_sa80
+scar_master,cardicon_expert_scar
+spas12_master,cardicon_expert_spas12
+striker_master,cardicon_expert_striker
+tar21_master,cardicon_expert_tavor
+tmp_master,cardicon_expert_tmp
+ump45_master,cardicon_expert_ump45
+usp_master,cardicon_expert_usp
+uzi_master,cardicon_expert_uzi
+wa2000_master,cardicon_expert_wa2000
+f15,cardicon_f15
+gasmask,cardicon_gasmask
+gears,cardicon_gears
+ghillie,cardicon_ghillie
+ghost_bust,cardicon_ghost_bust
+ghostmic,cardicon_ghost_mic
+ghostskull,cardicon_ghost_skull
+girlskull,cardicon_girlskull
+gloss_grenade,cardicon_gloss_grenade
+gold,cardicon_gold
+grigsby,cardicon_grigsby
+aa12_expert,cardicon_gun_aa12
+ak47_expert,cardicon_gun_ak47
+aug_expert,cardicon_gun_aug
+barrett_expert,cardicon_gun_barrett
+m9_expert,cardicon_gun_beretta
+raffica_expert,cardicon_gun_beretta393
+intervention_expert,cardicon_gun_cheytac
+magnum_expert,cardicon_gun_coltanaconda
+deserteagle_expert,cardicon_gun_deserteagle
+fal_expert,cardicon_gun_fal
+famas_expert,cardicon_gun_famas
+fn2000_expert,cardicon_gun_fn2000
+g18_expert,cardicon_gun_glock
+vector_expert,cardicon_gun_kriss
+m1014_expert,cardicon_gun_m1014
+m16a4_expert,cardicon_gun_m16
+m21_expert,cardicon_gun_m21
+m240_expert,cardicon_gun_m240
+m4a1_expert,cardicon_gun_m4
+acr_expert,cardicon_gun_masada
+mg4_expert,cardicon_gun_mg4
+model1887_expert,cardicon_gun_model1887
+mp5k_expert,cardicon_gun_mp5k
+p90_expert,cardicon_gun_p90
+pp2000_expert,cardicon_gun_pp2000
+ranger_expert,cardicon_gun_ranger
+rpd_expert,cardicon_gun_rpd
+l86lsw_expert,cardicon_gun_sa80
+scar_expert,cardicon_gun_scar
+spas12_expert,cardicon_gun_spas12
+striker_expert,cardicon_gun_striker
+tar21_expert,cardicon_gun_tavor
+tmp_expert,cardicon_gun_tmp
+ump45_expert,cardicon_gun_ump45
+usp_expert,cardicon_gun_usp
+uzi_expert,cardicon_gun_uzi
+wa2000_expert,cardicon_gun_wa2000
+harrier_aircraft,cardicon_harrier
+hatnknife,cardicon_hat_n_knife
+hazard,cardicon_hazard
+headshot,cardicon_headshot
+heartbeatsensor,cardicon_heartbeatsensor
+helmet_army,cardicon_helmet_army
+helmet_brit_ww2,cardicon_helmet_brit_ww2
+helmet_medic,cardicon_helmet_medic
+helmet_pilot,cardicon_helmet_pilot
+helmet_ranger,cardicon_helmet_ranger
+helmet_samurai,cardicon_helmet_samurai
+hipflask,cardicon_hipflask
+honeybadger,cardicon_honeybadger01
+humantrophy,cardicon_humantrophy
+hummer,cardicon_hummer
+hyena,cardicon_hyena
+illuminati,cardicon_illuminati
+iss,cardicon_iss
+greenstar,cardicon_iw
+iw,cardicon_iwlogo
+joystick,cardicon_joystick
+juggernaut1,cardicon_juggernaut_1
+juggernaut2,cardicon_juggernaut_2
+kinggorilla,cardicon_kinggorilla
+knife_logo,cardicon_knife_logo
+launcher,cardicon_launcher
+league_grenade,cardicon_league_grenade
+loadedfinger,cardicon_loadedfinger
+icon_locked,cardicon_locked
+makarov,cardicon_makarov
+mexicanblue,cardicon_mexican_blue
+mexicanred,cardicon_mexican_red
+mig,cardicon_mig
+minigun,cardicon_minigun
+missile,cardicon_missile_1
+moon,cardicon_moon
+motorcycle,cardicon_motorcycle
+nightvision1,cardicon_nightvision_1
+nightvision2,cardicon_nightvision_2
+noseart,cardicon_noseart1
+pacifierblue,cardicon_pacifier_blue
+pacifierpink,cardicon_pacifier_pink
+paratrooper,cardicon_paratrooper
+patch,cardicon_patch
+pavelow_aircraft,cardicon_pavelow
+pirate,cardicon_pirate1
+pirateflag,cardicon_pirateflag
+porterjustice,cardicon_porterjustice
+goldcross,cardicon_prestige10
+prestige10medal,cardicon_prestige10_02
+prestige_classic_1,cardicon_prestige_classic1
+prestige_classic_2,cardicon_prestige_classic2
+prestige_classic_3,cardicon_prestige_classic3
+prestige_classic_4,cardicon_prestige_classic4
+prestige_classic_5,cardicon_prestige_classic5
+prestige_classic_6,cardicon_prestige_classic6
+prestige_classic_7,cardicon_prestige_classic7
+prestige_classic_8,cardicon_prestige_classic8
+prestige_classic_9,cardicon_prestige_classic9
+price_ww2,cardicon_price_ww2
+price_arctic,cardicon_pricearctic
+price_woodland,cardicon_pricewoodland
+daisies,cardicon_pushingupdaisies
+radiation,cardicon_radiation
+redhead,cardicon_readhead
+reddevil,cardicon_red_devil
+redhand,cardicon_redhand
+rhino,cardicon_rhino
+riot_shield_icon,cardicon_riot_shield
+rtrolling,cardicon_rtrolling
+russian_beret,cardicon_russian_beret
+sami,cardicon_sami
+seasnipers,cardicon_seasnipers
+shotgun_shells,cardicon_shotgun_shells
+shuriken,cardicon_shuriken
+simplegun,cardicon_simplegun
+skull,cardicon_skull
+skullblack,cardicon_skull_black
+skullaward,cardicon_skullaward
+skullnbones,cardicon_skullnbones
+snakeeyes,cardicon_snakeeyes
+sniper,cardicon_sniper
+sniperscope,cardicon_sniperscope
+snowmobile,cardicon_snowmobile
+soapbar,cardicon_soap_bar
+stop,cardicon_stop
+stryker,cardicon_stryker
+sugarglider,cardicon_sugarglider
+tank,cardicon_tank_01
+taskforcearmy,cardicon_taskforcearmy01
+tf141,cardicon_tf141
+bomb,cardicon_thebomb
+cow,cardicon_thecow
+tictacboom,cardicon_tictacboom
+tiger,cardicon_tiger
+tire,cardicon_tire
+price_toon,cardicon_toon_price_1
+treasurechest,cardicon_treasurechest
+treasuremap,cardicon_treasuremap
+tsunami,cardicon_tsunami
+umbracatervae,cardicon_umbracatervae
+vest,cardicon_vest_1
+veteran,cardicon_veteran
+warpig,cardicon_warpig
+weed,cardicon_weed
+xray,cardicon_xray
+title_4thofjuly,cardtitle_4thofjuly_1
+title_abstract,cardtitle_abstract3
+title_ac130,cardtitle_ac130_1
+title_carriers,cardtitle_aircraft_carriers
+title_angrydragon,cardtitle_angry_dragon
+title_apocalypse,cardtitle_apocalypse
+title_assaultexpert,cardtitle_assault_expert
+title_assaultmarksman,cardtitle_assault_marksman
+title_assaultmaster,cardtitle_assault_master
+title_assaultsharpshooter,cardtitle_assault_sharpshooter
+title_assaultveteran,cardtitle_assault_veteran
+title_at4,cardtitle_at4_rocket
+title_bandaid,cardtitle_bandaid
+title_benjamins,cardtitle_benjamins
+title_blackcat,cardtitle_blackcat
+title_blimp,cardtitle_blimp
+title_bloodsplat,cardtitle_bloodsplat
+title_bloodysword,cardtitle_bloodysword
+title_pinupgirl,cardtitle_bomber_pinup_girl
+title_bombs,cardtitle_bombs2
+title_buckshot,cardtitle_buckshot
+title_buggy,cardtitle_buggy
+title_bullet,cardtitle_bullet
+title_butterfly1,cardtitle_butterfly_1
+title_butterfly2,cardtitle_butterfly_2
+title_camo_arctic,cardtitle_camo_arctic
+title_camo_bluetiger,cardtitle_camo_bluetiger
+title_camo_desert,cardtitle_camo_desert
+title_camo_digital,cardtitle_camo_digital
+title_camo_fall,cardtitle_camo_fall
+title_camo_redtiger,cardtitle_camo_redtiger
+title_camo_urban,cardtitle_camo_urban
+title_camo_woodland,cardtitle_camo_woodland
+title_cemetary,cardtitle_cemetary
+title_cheese,cardtitle_cheese
+title_chicken,cardtitle_chicken
+title_cobra,cardtitle_cobra
+title_cowboy,cardtitle_cowboy
+title_cripple,cardtitle_cripple
+title_cutegreen1,cardtitle_cute_green_1
+title_cutegreen2,cardtitle_cute_green_2
+title_cutegreen3,cardtitle_cute_green_3
+title_cutepink1,cardtitle_cute_pink_1
+title_cutepink2,cardtitle_cute_pink_2
+title_cutepink3,cardtitle_cute_pink_3
+title_dragonkick,cardtitle_dragon_kick
+title_drifting,cardtitle_drifting
+title_dynamite,cardtitle_dynamite
+title_endofline,cardtitle_endofline_red
+title_explosion,cardtitle_explosion
+title_eyeball,cardtitle_eyeball_3
+flag_australia,cardtitle_flag_australia
+flag_austria,cardtitle_flag_austria
+flag_belgium,cardtitle_flag_belgium
+flag_brazil,cardtitle_flag_brazil
+flag_canada,cardtitle_flag_canada
+flag_china,cardtitle_flag_china
+flag_czech,cardtitle_flag_czech
+flag_denmark,cardtitle_flag_denmark
+flag_elsalvador,cardtitle_flag_elsalvador
+flag_finland,cardtitle_flag_finland
+flag_france,cardtitle_flag_france
+flag_germany,cardtitle_flag_germany
+flag_greece,cardtitle_flag_greece
+flag_hongkong,cardtitle_flag_hongkong
+flag_india,cardtitle_flag_india
+flag_iran,cardtitle_flag_iran
+flag_ireland,cardtitle_flag_ireland
+flag_italy,cardtitle_flag_italy
+flag_japan,cardtitle_flag_japan
+flag_luxemburg,cardtitle_flag_luxemburg
+flag_mexico,cardtitle_flag_mexico
+flag_netherlands,cardtitle_flag_netherlands
+flag_newzealand,cardtitle_flag_newzealand
+flag_norway,cardtitle_flag_norway
+flag_philippines,cardtitle_flag_philippines
+flag_poland,cardtitle_flag_poland
+flag_portugal,cardtitle_flag_portugal
+flag_russia,cardtitle_flag_russia
+flag_saudiarabia,cardtitle_flag_saudiarabia
+flag_singapore,cardtitle_flag_singapore
+flag_southafrica,cardtitle_flag_southafrica
+flag_southkorea,cardtitle_flag_southkorea
+flag_spain,cardtitle_flag_spain
+flag_sweden,cardtitle_flag_sweden
+flag_swiss,cardtitle_flag_swiss
+flag_taiwan,cardtitle_flag_taiwan
+flag_turkey,cardtitle_flag_turkey
+flag_uk,cardtitle_flag_uk
+flag_uae,cardtitle_flag_united_arab_emirates
+flag_us,cardtitle_flag_united_states
+title_flames,cardtitle_flames_1
+title_flower,cardtitle_flower_3
+title_gears,cardtitle_gears_3
+title_general,cardtitle_general
+title_ghillie,cardtitle_ghillie
+title_glass,cardtitle_glass_hispeed
+title_graffiti3,cardtitle_graff
+title_graffiti1,cardtitle_graffiti_01
+title_graffiti2,cardtitle_graffiti_02
+title_harrier,cardtitle_harrier
+title_hazard,cardtitle_hazard_3
+title_heartbeat,cardtitle_heartbeat
+title_helicopters,cardtitle_helicopters_1
+title_hello,cardtitle_hello
+title_horsemen,cardtitle_horsemen
+title_death,cardtitle_horsemen_death
+title_famine,cardtitle_horsemen_famine
+title_war,cardtitle_horsemen_war
+title_hotdog,cardtitle_hotdog
+title_jason,cardtitle_jason_nvg
+title_joint,cardtitle_joint
+title_kingsnake,cardtitle_kingsnake
+title_lingerie1,cardtitle_lingerie_1
+title_lingerie2,cardtitle_lingerie_2
+title_machinegun,cardtitle_machinegun
+title_magic,cardtitle_magic
+title_mig15,cardtitle_mig15
+title_moab,cardtitle_moab
+title_money,cardtitle_money01
+title_mw2,cardtitle_mw2_black
+title_nvg,cardtitle_nvg_high
+title_operations,cardtitle_operations
+title_pavelow,cardtitle_pavelow
+title_pavelowside,cardtitle_pavelow_side
+title_pinkscar,cardtitle_pinkscar
+title_daisies,cardtitle_pushingupdaisies
+title_racerricerocket,cardtitle_racer_rice_rocket
+title_rainbows,cardtitle_rainbows_3
+title_rollhardsix,cardtitle_roll_hard_six
+title_rpg,cardtitle_rpg
+title_samurai,cardtitle_samurai_lv3
+title_satellite,cardtitle_satellite
+title_schooled,cardtitle_schooled
+title_shark,cardtitle_shark
+title_silencer,cardtitle_silencer
+title_skateboard,cardtitle_skateboard
+title_smokeem,cardtitle_smoke_em
+title_sniper1,cardtitle_sniper_1
+title_sniper2,cardtitle_sniper_2
+title_sniper3,cardtitle_sniper_3
+title_sniper4,cardtitle_sniper_4
+title_snowmobile,cardtitle_snowmobile
+title_snubnose,cardtitle_snubnose
+title_iss,cardtitle_space_iss01
+title_spankpaddle,cardtitle_spankpaddle
+title_spiderweb,cardtitle_spiderweb_hispeed
+title_spy,cardtitle_spy_1
+title_stpatricks,cardtitle_stpatricks_3
+title_straightblast,cardtitle_straight_blast
+title_sunbather,cardtitle_sunbather
+title_sword1,cardtitle_sword_1
+title_sword2,cardtitle_sword_2
+title_sword3,cardtitle_sword_3
+title_tank,cardtitle_tank
+title_bomb,cardtitle_thebomb
+title_tiger,cardtitle_tiger
+title_tomahawk,cardtitle_tomahawk
+title_tsunami,cardtitle_tsuenami
+title_weed,cardtitle_weed_3
+title_zero,cardtitle_zero
+title_zombie,cardtitle_zombie_3
+code_breakpoint,code_breakpoint
+code_warning_bandwidth,code_warning_bandwidth
+code_warning_bandwidthlimited,code_warning_bandwidthlimited
+code_warning_file,code_warning_file
+code_warning_fps,code_warning_fps
+code_warning_gamestate,code_warning_gamestate
+code_warning_maxeffects,code_warning_maxeffects
+code_warning_models,code_warning_models
+code_warning_scripterrors,code_warning_scripterrors
+code_warning_serverfps,code_warning_serverfps
+code_warning_snapshotents,code_warning_snapshotents
+code_warning_soundcpu,code_warning_soundcpu
+flagneutral,compass_flag_neutral
+ac130_enemy,compass_objpoint_ac130_enemy
+ac130_friendly,compass_objpoint_ac130_friendly
+airstrike_enemy,compass_objpoint_airstrike_busy
+airstrike_friendly,compass_objpoint_airstrike_friendly
+ammo_enemy,compass_objpoint_ammo_enemy
+ammo_friendly,compass_objpoint_ammo_friendly
+stealthbomber_friendly,compass_objpoint_b2_airstrike_friendly
+stealthbomber_enemy,compass_objpoint_b2_airstrike_enemy
+c130_enemy,compass_objpoint_c130_enemy
+c130_friendly,compass_objpoint_c130_friendly
+helicopter_enemy,compass_objpoint_helicopter_busy
+helicopter_friendly,compass_objpoint_helicopter_friendly
+littlebird_enemy,compass_objpoint_littlebird_busy
+littlebird_friendly,compass_objpoint_littlebird_friendly
+explosion,compassping_explosion
+player_friendly,compassping_friendly_mp
+player_party,compassping_friendly_party_mp
+player_friendlyfiring,compassping_friendlyfiring_mp
+player_partyfiring,compassping_friendlyfiring_party_mp
+player_friendlyyelling,compassping_friendlyyelling_mp
+player_partyyelling,compassping_friendlyyelling_party_mp
+grenade,compassping_grenade
+player,compassping_player
+sentry_enemy,compassping_sentry_enemy
+sentry_enemyfiring,compassping_sentry_enemyfiring
+sentry_friendly,compassping_sentry_friendly
+sentry_friendlyfiring,compassping_sentry_friendlyfiring
+crosshair_red,crosshair_red
+death_airstrike,death_airstrike
+death_car,death_car
+death_harrier,death_harrier
+death_helicopter,death_helicopter
+death_nuke,death_nuke
+death_pavelow,death_pavelow
+death_riot_shield,death_riot_shield
+defusebomb,defusebomb
+dpad_40mm_grenade,dpad_40mm_grenade
+dpad_down,dpad_down
+ac130,dpad_killstreak_ac130
+carepackage,dpad_killstreak_carepackage
+chopper,dpad_killstreak_cobra_gunner
+counteruav,dpad_killstreak_counter_uav
+emergencyairdrop,dpad_killstreak_emergency_airdrop
+emp,dpad_killstreak_emp
+harrier,dpad_killstreak_harrier
+pavelow,dpad_killstreak_helicopter_flares
+helicopter,dpad_killstreak_helicopter_support
+predatormissile,dpad_killstreak_hellfire_missile
+nuke,dpad_killstreak_nuke
+airstrike,dpad_killstreak_precision_airstrike
+sentry,dpad_killstreak_sentry
+sentryairdrop,dpad_killstreak_sentry_airdrop
+stealthbomber,dpad_killstreak_stealth_bomber
+uav,dpad_killstreak_uav
+dpad_left,dpad_left
+dpad_right,dpad_right
+tacticalinsert,dpad_tacticalinsert
+underbarrelshotgun,dpad_underbarrel_shotgun
+dpad_up,dpad_up
+blastshield,equipment_blast_shield
+c4_detonator,equipment_c4
+cac_claymore,equipment_claymore
+flare,equipment_flare
+fraggrenade,equipment_frag
+semtexgrenade,equipment_semtex
+throwingknife,equipment_throwing_knife
+sas,faction_128_sas
+health,hint_health
+mantle,hint_mantle
+usable,hint_usable
+ak74u,hud_akd74u
+burningbarrel,hud_burningbarrelicon
+dpad_arrow,hud_dpad_arrow
+dpad_xbox360,hud_dpad_xbox360
+flashbang,hud_flashbangicon
+fofbox_hostile,hud_fofbox_hostile
+fofbox_hostilevehicle,hud_fofbox_hostile_vehicle
+fofbox_self,hud_fofbox_self
+grenade,hud_grenadeicon
+grenadethrowback,hud_grenadethrowback
+40mm_grenade,hud_icon_40mm_grenade
+aa12,hud_icon_aa12
+ac130_hud,hud_icon_ac130
+ak47,hud_icon_ak47
+ak47classic,hud_icon_ak47_classic
+artillery,hud_icon_artillery
+at4,hud_icon_at4
+barrett,hud_icon_barrett50cal
+m1014,hud_icon_benelli_m4
+raffica,hud_icon_beretta393
+c4,hud_icon_c4
+intervention,hud_icon_cheytac
+claymore,hud_icon_claymore
+magnum,hud_icon_colt_anaconda
+deserteagle,hud_icon_desert_eagle
+deserteaglegold,hud_icon_desert_eagle_gold
+dragunov,hud_icon_dragunov
+famas,hud_icon_famas
+fn2000,hud_icon_fn2000
+fal,hud_icon_fnfal
+g18,hud_icon_glock
+javelin,hud_icon_javelin
+vector,hud_icon_kriss
+m21_scoped,hud_icon_m14_scoped
+m21,hud_icon_m14ebr
+m16a4,hud_icon_m16a4
+m16a4_grenade,hud_icon_m16a4_grenade
+m240,hud_icon_m240
+m249saw,hud_icon_m249saw
+m249saw_mounted,hud_icon_m249saw_mounted
+m40a3,hud_icon_m40a3
+m4a1,hud_icon_m4carbine
+m79,hud_icon_m79
+m9,hud_icon_m9beretta
+acr,hud_icon_masada
+mg4,hud_icon_mg4
+uzi,hud_icon_mini_uzi
+model1887,hud_icon_model1887
+mp44,hud_icon_mp44
+mp5,hud_icon_mp5
+mp5_silencer,hud_icon_mp5_silencer
+mp5k,hud_icon_mp5k
+tmp,hud_icon_mp9
+nvg,hud_icon_nvg
+p90,hud_icon_p90
+pistol,hud_icon_pistol
+pp2000,hud_icon_pp2000
+remote_missile,hud_icon_remote_missile
+riotshield,hud_icon_riot_shield
+rpd,hud_icon_rpd
+rpg,hud_icon_rpg
+rpg_dpad,hud_icon_rpg_dpad
+l86lsw,hud_icon_sa80
+l86lsw_lmg,hud_icon_sa80_lmg
+ranger,hud_icon_sawed_off
+scar,hud_icon_scar_h
+sentry_hud,hud_icon_sentrygun
+shotgun,hud_icon_shotgun
+sniperrifle,hud_icon_sniperrifle
+spas12,hud_icon_spas12
+aug,hud_icon_steyr
+stinger,hud_icon_stinger
+striker,hud_icon_striker
+tavor,hud_icon_tavor
+ump45,hud_icon_ump45
+undermountedshotgun,hud_icon_undermounted_shotgun
+usp,hud_icon_usp_45
+wa2000,hud_icon_wa2000
+javelin_clu_on,hud_javelin_clu_on
+javelin_dir_on,hud_javelin_dir_on
+javelin_lock_on,hud_javelin_lock_on
+javelin_norocket_on,hud_javelin_norocket_on
+javelin_rocket_on,hud_javelin_rocket_on
+javelin_top_on,hud_javelin_top_on
+chopper_friendly,hud_minimap_cobra_green
+chopper_enemy,hud_minimap_cobra_red
+harrier_friendly,hud_minimap_harrier_green
+harrier_enemy,hud_minimap_harrier_red
+pavelow_friendly,hud_minimap_pavelow_green
+pavelow_enemy,hud_minimap_pavelow_red
+peacekeeper,hud_peacekeeper
+connecting,hud_status_connecting
+dead,hud_status_dead
+suitcase_bomb,hud_suitcase_bomb
+teamcaret,hud_teamcaret
+flashgrenade,hud_us_flashgrenade
+frag,hud_us_grenade
+semtex,hud_us_semtex
+smokegrenade,hud_us_smokegrenade
+stungrenade,hud_us_stungrenade
+questionmark,hudicon_neutral
+downarrow,hudscoreboardscroll_downarrow
+pagedown,hudscoreboardscroll_downkey
+uparrow,hudscoreboardscroll_uparrow
+pageup,hudscoreboardscroll_upkey
+stopwatch,hudstopwatch
+title_lollipopgirl,iw5_cardtitle_lollipop_girl
+killiconcrush,killiconcrush
+killicondied,killicondied
+killiconfalling,killiconfalling
+killiconheadshot,killiconheadshot
+killiconimpact,killiconimpact
+killiconimpale,killiconimpale
+killiconmelee,killiconmelee
+iw_logo,logo_iw
+net_disconnect,net_disconnect
+nottalking,nottalkingicon
+objective,objective
+exclamationmarkred,objective_friendly_chat
+exclamationmarkblue,objective_friendly_party_chat
+objectivea,objectivea
+objectiveb,objectiveb
+flag_arab,objpoint_flag_arab
+flag_opfor,objpoint_flag_opfor
+flag_taskforce,objpoint_flag_taskforce
+plantbomb,plantbomb
+rank_1stlt1,rank_1stlt1
+rank_1stsgt1,rank_1stsgt1
+rank_2ndlt1,rank_2ndlt1
+rank_bgen1,rank_bgen1
+rank_capt1,rank_capt1
+rank_cmdsgtmaj1,rank_cmdsgtmaj1
+rank_col1,rank_col1
+rank_comm1,rank_comm1
+rank_cpl1,rank_cpl1
+rank_gen1,rank_gen1
+rank_ltcol1,rank_ltcol1
+rank_ltgen1,rank_ltgen1
+rank_maj1,rank_maj1
+rank_majgen1,rank_majgen1
+rank_msgt1,rank_msgt1
+rank_pfc1,rank_pfc1
+prestige1,rank_prestige1
+prestige10,rank_prestige10
+prestige2,rank_prestige2
+prestige3,rank_prestige3
+prestige4,rank_prestige4
+prestige5,rank_prestige5
+prestige6,rank_prestige6
+prestige7,rank_prestige7
+prestige8,rank_prestige8
+prestige9,rank_prestige9
+rank_pvt1,rank_pvt1
+rank_sfc1,rank_sfc1
+rank_sgt1,rank_sgt1
+rank_sgtmaj1,rank_sgtmaj1
+rank_spc1,rank_spc1
+rank_ssgt1,rank_ssgt1
+predatorfriendly,remotemissile_target_friendly
+predatorenemy,remotemissile_target_hostile
+reticle_c4,reticle_center_c4
+reticle_claymore,reticle_center_claymore
+reticle_cross,reticle_center_cross
+reticle_semtex,reticle_center_semtex
+reticle_tacticalinsertion,reticle_center_tacticalinsertion
+reticle_throwingknife,reticle_center_throwingknife
+reticle_flechette,reticle_flechette
+scavenger_pickup,scavenger_pickup
+dedicated_linux,server_hardware_linux_dedicated
+dedicated_unknown,server_hardware_unknown
+dedicated_win,server_hardware_win_dedicated
+ac130_streak,specialty_ac130
+ac130_crate,specialty_ac130_crate
+emergencyairdrop_streak,specialty_airdrop_emergency
+emergencyairdrop_crate,specialty_airdrop_emergency_crate
+sentry_streak,specialty_airdrop_sentry_minigun
+sentry_crate,specialty_airdrop_sentry_minigun_crate
+cac_blastshield,specialty_blastshield
+bling,specialty_bling
+blingpro,specialty_bling_upgrade
+sitrep,specialty_bombsquad
+sitrep_pro,specialty_bombsquad_upgrade
+stoppingpower,specialty_bulletdamage
+stoppingpowerpro,specialty_bulletdamage_upgrade
+carepackage_streak,specialty_carepackage
+carepackage_crate,specialty_carepackage_crate
+chopper_streak,specialty_cobra_gunner
+chopper_crate,specialty_cobra_gunner_crate
+coldblooded,specialty_coldblooded
+coldbloodedpro,specialty_coldblooded_upgrade
+commando,specialty_commando
+commandopro,specialty_commando_upgrade
+copycat,specialty_copycat
+counteruav_streak,specialty_counter_uav
+counteruav_crate,specialty_counter_uav_crate
+dangerclose,specialty_dangerclose
+dangerclosepro,specialty_dangerclose_upgrade
+emp_streak,specialty_emp
+emp_crate,specialty_emp_crate
+sleightofhand,specialty_fastreload
+sleightofhandpro,specialty_fastreload_upgrade
+finalstand,specialty_finalstand
+martyrdom,specialty_grenadepulldeath
+hardline,specialty_hardline
+hardlinepro,specialty_hardline_upgrade
+harrier_streak,specialty_harrier_strike
+harrier_crate,specialty_harrier_strike_crate
+pavelow_streak,specialty_helicopter_flares
+pavelow_create,specialty_helicopter_flares_crate
+helicopter_streak,specialty_helicopter_support
+helicopter_crate,specialty_helicopter_support_crate
+streak_null,specialty_ks_null
+lightweight,specialty_lightweight
+lightweightpro,specialty_lightweight_upgrade
+scrambler,specialty_localjammer
+scramblerpro,specialty_localjammer_upgrade
+marathon,specialty_marathon
+marathonpro,specialty_marathon_upgrade
+nuke_streak,specialty_nuke
+nuke_crate,specialty_nuke_crate
+perk_null,specialty_null
+perk_nullpro,specialty_null_upgrade
+onemanarmy,specialty_onemanarmy
+onemanarmypro,specialty_onemanarmy_upgrade
+painkiller,specialty_painkiller
+laststand,specialty_pistoldeath
+laststandpro,specialty_pistoldeath_upgrade
+airstrike_streak,specialty_precision_airstrike
+airstrike_crate,specialty_precision_airstrike_crate
+predator_streak,specialty_predator_missile
+predator_crate,specialty_predator_missile_crate
+ninja,specialty_quieter
+ninjapro,specialty_quieter_upgrade
+scavenger,specialty_scavenger
+scavengerpro,specialty_scavenger_upgrade
+steadyaim,specialty_steadyaim
+steadyaimpro,specialty_steadyaim_upgrade
+stealthbomber_streak,specialty_stealth_bomber
+stealthbomber_crate,specialty_stealth_bomber_crate
+tacticalinsertion,specialty_tacticalinsertion
+uav_streak,specialty_uav
+uav_crate,specialty_uav_crate
+statmon_warning_tris,statmon_warning_tris
+talking,talkingicon
+camo_arctic,ui_camoskin_arctic
+camo_blue_tiger,ui_camoskin_blue_tiger
+camo_desert,ui_camoskin_desert
+camo_digital,ui_camoskin_digital
+camo_gold,ui_camoskin_gold
+camo_orangefall,ui_camoskin_orange_fall
+camo_prestige,ui_camoskin_prestige
+camo_redtiger,ui_camoskin_red_tiger
+camo_redurban,ui_camoskin_red_urban
+camo_woodland,ui_camoskin_woodland
+cursor,ui_cursor
+host,ui_host
+voice_off,voice_off
+voice_on,voice_on
+ammofriendly,waypoint_ammo_friendly
+bombfriendly,waypoint_bomb
+waypoint_bombenemy,waypoint_bomb_enemy
+capture,waypoint_capture
+capturea,waypoint_capture_a
+captureb,waypoint_capture_b
+capturec,waypoint_capture_c
+captured,waypoint_capture_d
+capturee,waypoint_capture_e
+captureflag,waypoint_capture_flag
+captureneutral,waypoint_captureneutral
+captureneutrala,waypoint_captureneutral_a
+captureneutralb,waypoint_captureneutral_b
+captureneutralc,waypoint_captureneutral_c
+captureneutrald,waypoint_captureneutral_d
+captureneutrale,waypoint_captureneutral_e
+defend,waypoint_defend
+defenda,waypoint_defend_a
+defendb,waypoint_defend_b
+defendc,waypoint_defend_c
+defendd,waypoint_defend_d
+defende,waypoint_defend_e
+defendflag,waypoint_defend_flag
+defendtimera,waypoint_defend_timer_a
+defendtimerb,waypoint_defend_timer_b
+defuse,waypoint_defuse
+defusea,waypoint_defuse_a
+defuseb,waypoint_defuse_b
+defusetimera,waypoint_defuse_timer_a
+defusetimerb,waypoint_defuse_timer_b
+escort,waypoint_escort
+flagenemy,waypoint_flag_enemy
+flagfriendly,waypoint_flag_friendly
+kill,waypoint_kill
+returnflag,waypoint_return_flag
+revive,waypoint_revive
+target,waypoint_target
+targeta,waypoint_target_a
+targetb,waypoint_target_b
+targetneutral,waypoint_targetneutral
+waitforflag,waypoint_waitfor_flag
+aa12_cac,weapon_aa12
+ak47_cac,weapon_ak47
+ak47classic_cac,weapon_ak47_classic
+ak74u_cac,weapon_aks74u
+at4_cac,weapon_at4
+acog,weapon_attachment_acog
+akimbo,weapon_attachment_akimbo
+holo,weapon_attachment_eotech
+fmj,weapon_attachment_fmj
+grip,weapon_attachment_grip
+heartbeat,weapon_attachment_heartbeat
+m203,weapon_attachment_m203
+reddot,weapon_attachment_reflex
+rapidfire,weapon_attachment_rof
+underbarrelshotgun,weapon_attachment_shotgun
+silencer,weapon_attachment_suppressor
+tacticalknife,weapon_attachment_tactical
+thermal,weapon_attachment_thermal
+xmags,weapon_attachment_xmags
+aug_cac,weapon_aug
+barrett_cac,weapon_barrett50cal
+m1014_cac,weapon_benelli_m4
+raffica_cac,weapon_beretta393
+c4_cac,weapon_c4
+intervention_cac,weapon_cheytac
+claymore_cac,weapon_claymore
+colt45_cac,weapon_colt_45
+colt45_silencer,weapon_colt_45_silencer
+magnum_cac,weapon_colt_anaconda
+concgrenade_cac,weapon_concgrenade
+deserteagle_cac,weapon_desert_eagle
+deserteaglegold_cac,weapon_desert_eagle_gold
+dragunov_cac,weapon_dragunov
+dragunovsvd_cac,weapon_dragunovsvd
+famas_cac,weapon_famas
+flashbang_cac,weapon_flashbang
+fn2000_cac,weapon_fn2000
+fal_cac,weapon_fnfal
+fraggrenade_cac,weapon_fraggrenade
+g3_cac,weapon_g3
+g36c_cac,weapon_g36c
+g18_cac,weapon_glock
+gp25_cac,weapon_gp25
+javelin_cac,weapon_javelin
+vector_cac,weapon_kriss
+m1014_cac,weapon_m1014
+m14scoped_cac,weapon_m14_scoped
+m21_cac,weapon_m14ebr
+m16a4_cac,weapon_m16a4
+m240_cac,weapon_m240
+m249saw_cac,weapon_m249saw
+m40a3_cac,weapon_m40a3
+m4a1_cac,weapon_m4carbine
+m60e4_cac,weapon_m60e4
+m79_cac,weapon_m79
+m9_cac,weapon_m9beretta
+m9_silencer_cac,weapon_m9beretta_silencer
+acr_cac,weapon_masada
+mg4_cac,weapon_mg4
+uzi_cac,weapon_mini_uzi
+model1887_cac,weapon_model1887
+mp44_cac,weapon_mp44
+mp5_cac,weapon_mp5
+mp5k_cac,weapon_mp5k
+onemanarmy_cac,weapon_onemanarmy
+p90_cac,weapon_p90
+peacekeeper_cac,weapon_peacekeeper
+pp2000_cac,weapon_pp2000
+ranger_cac,weapon_ranger
+remington700_cac,weapon_remington700
+riotshield_cac,weapon_riotshield
+rpd_cac,weapon_rpd
+rpg_cac,weapon_rpg7
+l86lsw_cac,weapon_sa80
+scar_cac,weapon_scar_h
+skorpion_cac,weapon_skorpion
+smokegrenade_cac,weapon_smokegrenade
+spas12_cac,weapon_spas12
+stinger_cac,weapon_stinger
+striker_cac,weapon_striker
+tar21_cac,weapon_tavor
+tmp_cac,weapon_tmp
+ump45_cac,weapon_ump45
+usp_cac,weapon_usp_45
+usp45akimbo_cac,weapon_usp_45_akimbo
+usp45silencer_cac,weapon_usp_45_silencer
+wa2000_cac,weapon_wa2000
+winchester1200_cac,weapon_winchester1200
+white,white

iw4x/iw4x_00/ui_mp/dpad_hd.menu

@@ -43,7 +43,7 @@
 			textStyle 3
 			textFont 10
 			feeder 0
-			visible 1
+			visible when ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) )
 		}
 		itemDef
 		{
@@ -70,7 +70,7 @@
 			feeder 0
 			visible 1
 			exp text ( "^3" + keybinding( "+actionslot 1" )  )
-			visible when ( actionslotusable( 1 )  )
+			visible when ( ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) ) && actionslotusable( 1 ) )
 		}
 		itemDef
 		{
@@ -94,7 +94,7 @@
 			textStyle 3
 			textFont 10
 			feeder 0
-			visible 1
+			visible when ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) )
 		}
 		itemDef
 		{
@@ -121,7 +121,7 @@
 			feeder 0
 			visible 1
 			exp text ( "^3" + keybinding( "+actionslot 3" )  )
-			visible when ( actionslotusable( 3 )  )
+			visible when ( ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) ) && actionslotusable( 3 ) )
 		}
 		itemDef
 		{
@@ -145,7 +145,7 @@
 			textStyle 3
 			textFont 10
 			feeder 0
-			visible 1
+			visible when ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) )
 		}
 		itemDef
 		{
@@ -172,7 +172,80 @@
 			feeder 0
 			visible 1
 			exp text ( "^3" + keybinding( "+actionslot 4" )  )
-			visible when ( actionslotusable( 4 )  )
+			visible when ( ( !dvarbool( "gpad_enabled" ) || !dvarint( "gpad_in_use" ) ) && actionslotusable( 4 ) )
+		}
+		itemDef
+		{
+			rect -68.6667 -42.3333 42.6667 42.6667 10 10
+			style 3
+			decoration
+			visible 1
+			foreColor 1 1 1 0.65
+			background "hud_dpad_xbox360"
+			textScale 0.55
+			visible when ( dvarbool( "gpad_enabled" ) && dvarint( "gpad_in_use" ) && !dvarbool( "gpad_style" ) )
+		}
+		itemDef
+		{
+			rect -68.6667 -42.3333 42.6667 42.6667 10 10
+			style 3
+			decoration
+			visible 1
+			foreColor 1 1 1 0.65
+			background "hud_dpad_ps3"
+			textScale 0.55
+			visible when ( dvarbool( "gpad_enabled" ) && dvarint( "gpad_in_use" ) && dvarbool( "gpad_style" ) )
+		}
+		itemDef
+		{
+			rect -68.6667 -42 42.6667 42.6667 10 10
+			style 3
+			decoration
+			visible 1
+			foreColor 1 0.9 0.5 1
+			background "hud_dpad_arrow_left"
+			textScale 0.55
+			visible when ( ( dvarbool( "gpad_enabled" ) && dvarint( "gpad_in_use" ) ) && actionslotusable( 3 ) )
+		}
+		itemDef
+		{
+			rect -93 -33 32 32 10 10
+			ownerdraw 173
+			visible 1
+			foreColor 1 1 1 1
+			type 8
+			textFont 10
+			textAlign 2
+			textAlignX -21
+			textAlignY -3
+			textScale 0.3333
+			textStyle 3
+			visible when ( dvarbool( "gpad_enabled" ) && dvarint( "gpad_in_use" ) )
+		}
+		itemDef
+		{
+			rect -68.6667 -42 42.6667 42.6667 10 10
+			style 3
+			decoration
+			visible 0
+			foreColor 1 0.9 0.5 1
+			background "hud_dpad_arrow_right"
+			textScale 0.55
+			exp foreColor a ( 0.25 + ( sin( milliseconds( ) / 200 ) + 1 ) )
+			visible when ( ( dvarbool( "gpad_enabled" ) && dvarint( "gpad_in_use" ) ) && actionslotusable( 4 ) )
+		}
+		itemDef
+		{
+			rect -30 -36 32 32 10 10
+			ownerdraw 174
+			visible 1
+			foreColor 1 1 1 1
+			type 8
+			textFont 10
+			textAlignX -40
+			textScale 0.3333
+			textStyle 3
+			visible when ( dvarbool( "gpad_enabled" ) && dvarint( "gpad_in_use" ) )
 		}
 	}
 }

iw4x/iw4x_00/ui_mp/pc_options_game.menu

@@ -82,4 +82,5 @@ menuDef
 
 	PC_OPTIONS_DVARYESNO_RAW(2, "@MENU_AUTORECORD", "cl_autoRecord", ;, "@MPUI_DESC_AUTORECORD", when(0), 1)
 	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))
 }

iw4x/iw4x_00/ui_mp/pc_options_gamepad.menu

@@ -119,11 +119,12 @@ menuDef
 		"@MENU_TACTICAL_ALT"; "buttons_tactical_alt"; 
 		"@MENU_LEFTY_ALT"; "buttons_lefty_alt"; 
 		"@MENU_NOMAD_ALT"; "buttons_nomad_alt"}, execNow "bindgpbuttonsconfigs";, ;, ON_GPAD_DISABLED, ON_GPAD_ENABLED)
-	PC_OPTIONS_DVARYESNO_RAW(4, "@MENU_SLOWDOWN_ENABLED", "gpad_slowdown_enabled", ;, "@MPUI_DESC_SLOWDOWN_ENABLED", ON_GPAD_DISABLED, ON_GPAD_ENABLED)
+	PC_OPTIONS_FLOATLIST_RAW(4, "@MENU_GPAD_STYLE", "gpad_style", {"@MENU_GPAD_XBOX_CAPS" 0 "@MENU_GPAD_PS_CAPS" 1}, ;, "@MPUI_DESC_GPAD_STYLE", ON_GPAD_DISABLED, ON_GPAD_ENABLED)
-	PC_OPTIONS_DVARYESNO_RAW(5, "@MENU_LOCKON_ENABLED", "gpad_lockon_enabled", ;, "@MPUI_DESC_LOCKON_ENABLED", ON_GPAD_DISABLED, ON_GPAD_ENABLED)
+	PC_OPTIONS_DVARYESNO_RAW(5, "@MENU_SLOWDOWN_ENABLED", "gpad_slowdown_enabled", ;, "@MPUI_DESC_SLOWDOWN_ENABLED", ON_GPAD_DISABLED, ON_GPAD_ENABLED)
-	PC_OPTIONS_SEPERATOR(5)
+	PC_OPTIONS_DVARYESNO_RAW(6, "@MENU_LOCKON_ENABLED", "gpad_lockon_enabled", ;, "@MPUI_DESC_LOCKON_ENABLED", ON_GPAD_DISABLED, ON_GPAD_ENABLED)
-	PC_OPTIONS_DVARSLIDER_RAW(6, "@MENU_LOOK_SENSITIVITY", "input_viewSensitivity", 0.5, 4, 1.0, ;, ;, ;, ON_GPAD_DISABLED, ON_GPAD_ENABLED, ON_GPAD_ENABLED)
+	PC_OPTIONS_SEPERATOR(6)
-	PC_OPTIONS_FLOATLIST_RAW(7, "@MENU_LOOK_SENSITIVITY_PRESET", "input_viewSensitivity", 
+	PC_OPTIONS_DVARSLIDER_RAW(7, "@MENU_LOOK_SENSITIVITY", "input_viewSensitivity", 0.5, 4, 1.0, ;, ;, ;, ON_GPAD_DISABLED, ON_GPAD_ENABLED, ON_GPAD_ENABLED)
+	PC_OPTIONS_FLOATLIST_RAW(8, "@MENU_LOOK_SENSITIVITY_PRESET", "input_viewSensitivity", 
 		{"@MENU_SENSITIVITY_LOW_CAPS" SENSITIVITY_1 "@MENU_SENSITIVITY_MEDIUM_CAPS" SENSITIVITY_2 "3" SENSITIVITY_3
 		"@MENU_SENSITIVITY_HIGH_CAPS" SENSITIVITY_4 "5" SENSITIVITY_5 "6" SENSITIVITY_6
 		"@MENU_SENSITIVITY_VERY_HIGH_CAPS" SENSITIVITY_7 "8" SENSITIVITY_8 "9" SENSITIVITY_9 "@MENU_SENSITIVITY_INSANE_CAPS" SENSITIVITY_10}, 

iw4x/iw4x_00/vision/mp_backlot.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.671"
+r_filmBrightness          "0.198"
+r_filmDesaturation        "0.26"
+r_filmInvert              "0"
+r_filmLightTint           "1.051 0.966 0.821"
+r_filmDarkTint            "0.71 0.63 0.56"

iw4x/iw4x_00/vision/mp_carentan.vision

@@ -0,0 +1,17 @@
+r_glow                    "1"
+r_glowRadius0             "7"
+r_glowRadius1             "7"
+r_glowBloomCutoff         "0.136422"
+r_glowBloomDesaturation   "0.65"
+r_glowBloomIntensity0     "0.36"
+r_glowBloomIntensity1     "0.36"
+r_glowSkyBleedIntensity0  "0.29"
+r_glowSkyBleedIntensity1  "0.29"
+ 
+r_filmEnable              "1"
+r_filmContrast            "1.13"
+r_filmBrightness          "-0.04"
+r_filmDesaturation        "-0.14"
+r_filmInvert              "0"
+r_filmLightTint           ".792 1 1.1"
+r_filmDarkTint            "1.11 1.07 .76"

iw4x/iw4x_00/vision/mp_countdown.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.1"
+r_filmBrightness          "-0.055"
+r_filmDesaturation        "0.63"
+r_filmInvert              "0"
+r_filmLightTint           "1.545 1.394 1.315"
+r_filmDarkTint            "1.184 1.492 1.381"

iw4x/iw4x_00/vision/mp_crash_snow.vision

@@ -0,0 +1,17 @@
+r_glow                    "1"
+r_glowRadius0             "7"
+r_glowRadius1             "7"
+r_glowBloomCutoff         "0.479084"
+r_glowBloomDesaturation   "0.0885241"
+r_glowBloomIntensity0     "0.611"
+r_glowBloomIntensity1     "0.36"
+r_glowSkyBleedIntensity0  "0.29"
+r_glowSkyBleedIntensity1  "0.29"
+ 
+r_filmEnable              "1"
+r_filmContrast            "1.00428"
+r_filmBrightness          "-0.000226622"
+r_filmDesaturation        "0"
+r_filmInvert              "0"
+r_filmLightTint           "1.0007 0.999576 0.998998"
+r_filmDarkTint            "1.00843 1.00304 1.0043"

iw4x/iw4x_00/vision/mp_farm.vision

@@ -0,0 +1,19 @@
+r_glow                    "1"
+r_glowRadius0             "22.8241"
+r_glowBloomCutoff         "0.688944"
+r_glowBloomDesaturation   "0.394041"
+r_glowBloomIntensity0     "0.432837"
+ 
+r_filmEnable              "1"
+r_filmContrast            "0.735453"
+r_filmBrightness          "-0.121954"
+r_filmDesaturation        "-0.580499"
+r_filmDesaturationDark    "0.0281353"
+r_filmInvert              "0"
+r_filmLightTint           "1.29 1.22 1.3"
+r_filmMediumTint          "0.998473 0.992456 0.94803"
+r_filmDarkTint            "0.972549 1.14719 1.13132"
+ 
+r_primaryLightUseTweaks              "1"
+r_primaryLightTweakDiffuseStrength   ".9"
+r_primaryLightTweakSpecularStrength  "1.34"

iw4x/iw4x_00/vision/mp_pipeline.vision

@@ -0,0 +1,19 @@
+r_glow                    "1"
+r_glowRadius0             "7.15348"
+r_glowBloomCutoff         "0.749243"
+r_glowBloomDesaturation   "1"
+r_glowBloomIntensity0     "0.3"
+ 
+r_filmEnable              "1"
+r_filmContrast            "1.068"
+r_filmBrightness          "0.01177428"
+r_filmDesaturation        "0.060000"
+r_filmDesaturationDark    "0.188197"
+r_filmInvert              "0"
+r_filmLightTint           "2.29494 2.23528 2.09839"
+r_filmMediumTint          "1.0067 1.0067 1.0067"
+r_filmDarkTint            "0.719654 1.03563 1.16738"
+ 
+r_primaryLightUseTweaks              "1"
+r_primaryLightTweakDiffuseStrength   "1.2"
+r_primaryLightTweakSpecularStrength  "1.6"