Skip to content

Commit

Permalink
Merge branch 'main' into cavTagging
Browse files Browse the repository at this point in the history
  • Loading branch information
AndreasBrostrom authored Jul 11, 2024
2 parents 34846ef + 47d1f82 commit e60ede6
Show file tree
Hide file tree
Showing 31 changed files with 130 additions and 168 deletions.
8 changes: 1 addition & 7 deletions addons/optionsmenu/gui/mainMenu.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class RscDisplayMain : RscStandardDisplay {
class Controls;
};
class GroupMultiplayer: GroupSingleplayer {
h = "(9 * 1.5) * (pixelH * pixelGrid * 2)";
h = "(8 * 1.5) * (pixelH * pixelGrid * 2)";
class Controls : Controls {
class Campaigns;
class joinTac2 : Campaigns {
Expand Down Expand Up @@ -36,12 +36,6 @@ class RscDisplayMain : RscStandardDisplay {
y = "(6 * 1.5) * (pixelH * pixelGrid * 2) + (pixelH)";
onbuttonclick = "connectToServer ['75.6.53.50', 2602, ''];";
};
class joinTSE : joinTS1 {
text = CSTRING(joinTSE_text);
tooltip = CSTRING(joinTSE_tooltip);
y = "(7 * 1.5) * (pixelH * pixelGrid * 2) + (pixelH)";
onbuttonclick = "connectToServer ['75.6.53.50', 2902, ''];";
};
};
};

Expand Down
6 changes: 0 additions & 6 deletions addons/optionsmenu/stringtable.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@
<Key ID="STR_cav_optionsmenu_joinTS3_text">
<English>Join Training Server 3</English>
</Key>
<Key ID="STR_cav_optionsmenu_joinTSE_text">
<English>Join Event Server</English>
</Key>
<Key ID="STR_cav_optionsmenu_joinTSE_tooltip">
<English>Join the 7Cav Event Server!</English>
</Key>

<Key ID="STR_cav_optionsmenu_CavJoin_tooltip">
<English>Enlist Today!</English>
Expand Down
156 changes: 1 addition & 155 deletions addons/textures/CfgVehicles.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2812,161 +2812,7 @@ class CfgVehicles {


//-----Arlington-----//


class Cav_Arlington_Left: UserTexture_1x2_F {
scope = 2;
scopeCurator = 2;
displayName = "Arlington Left"; //CSTRING(Arlington);
author = ECSTRING(main,cavmodteam);
editorPreview = QPATHTOF(data\arlington\Arlington_Left.paa);

editorSubcategory = "Cav_EdSubcat_Arlington";

hiddenSelectionsTextures[] = {
QPATHTOF(data\arlington\Arlington_Left.paa)
};
};

class Cav_Arlington_Right: UserTexture_1x2_F {
scope = 2;
scopeCurator = 2;
displayName = "Arlington Right"; //CSTRING(Arlington);
author = ECSTRING(main,cavmodteam);
editorPreview = QPATHTOF(data\arlington\Arlington_Right.paa);

editorSubcategory = "Cav_EdSubcat_Arlington";

hiddenSelectionsTextures[] = {
QPATHTOF(data\arlington\Arlington_Right.paa)
};
};

class Cav_Arlington_Britton: UserTexture1m_F {
scope = 2;
scopeCurator = 2;
displayName = "Britton"; //CSTRING(Arlington);
author = ECSTRING(main,cavmodteam);
editorPreview = QPATHTOF(data\arlington\Arlington_Britton.paa);

editorSubcategory = "Cav_EdSubcat_Arlington";

hiddenSelectionsTextures[] = {
QPATHTOF(data\arlington\Arlington_Britton.paa)
};
};

class Cav_Arlington_Carter: UserTexture1m_F {
scope = 2;
scopeCurator = 2;
displayName = "Carter"; //CSTRING(Arlington);
author = ECSTRING(main,cavmodteam);
editorPreview = QPATHTOF(data\arlington\Arlington_Carter.paa);

editorSubcategory = "Cav_EdSubcat_Arlington";

hiddenSelectionsTextures[] = {
QPATHTOF(data\arlington\Arlington_Carter.paa)
};
};

class Cav_Arlington_Krazee: UserTexture1m_F {
scope = 2;
scopeCurator = 2;
displayName = "Krazee"; //CSTRING(Arlington);
author = ECSTRING(main,cavmodteam);
editorPreview = QPATHTOF(data\arlington\Arlington_Krazee.paa);

editorSubcategory = "Cav_EdSubcat_Arlington";

hiddenSelectionsTextures[] = {
QPATHTOF(data\arlington\Arlington_Krazee.paa)
};
};

class Cav_Arlington_Mcgehee: UserTexture1m_F {
scope = 2;
scopeCurator = 2;
displayName = "Mcgehee"; //CSTRING(Arlington);
author = ECSTRING(main,cavmodteam);
editorPreview = QPATHTOF(data\arlington\Arlington_Mcgehee.paa);

editorSubcategory = "Cav_EdSubcat_Arlington";

hiddenSelectionsTextures[] = {
QPATHTOF(data\arlington\Arlington_Mcgehee.paa)
};
};

class Cav_Arlington_Novak: UserTexture1m_F {
scope = 2;
scopeCurator = 2;
displayName = "Novak"; //CSTRING(Arlington);
author = ECSTRING(main,cavmodteam);
editorPreview = QPATHTOF(data\arlington\Arlington_Novak.paa);

editorSubcategory = "Cav_EdSubcat_Arlington";

hiddenSelectionsTextures[] = {
QPATHTOF(data\arlington\Arlington_Novak.paa)
};
};

class Cav_Arlington_Raven: UserTexture1m_F {
scope = 2;
scopeCurator = 2;
displayName = "Raven"; //CSTRING(Arlington);
author = ECSTRING(main,cavmodteam);
editorPreview = QPATHTOF(data\arlington\Arlington_Raven.paa);

editorSubcategory = "Cav_EdSubcat_Arlington";

hiddenSelectionsTextures[] = {
QPATHTOF(data\arlington\Arlington_Raven.paa)
};
};

class Cav_Arlington_Ronnie: UserTexture1m_F {
scope = 2;
scopeCurator = 2;
displayName = "Ronnie"; //CSTRING(Arlington);
author = ECSTRING(main,cavmodteam);
editorPreview = QPATHTOF(data\arlington\Arlington_Ronnie.paa);

editorSubcategory = "Cav_EdSubcat_Arlington";

hiddenSelectionsTextures[] = {
QPATHTOF(data\arlington\Arlington_Ronnie.paa)
};
};

class Cav_Arlington_Tarkas: UserTexture1m_F {
scope = 2;
scopeCurator = 2;
displayName = "Tarkas"; //CSTRING(Arlington);
author = ECSTRING(main,cavmodteam);
editorPreview = QPATHTOF(data\arlington\Arlington_Tarkas.paa);

editorSubcategory = "Cav_EdSubcat_Arlington";

hiddenSelectionsTextures[] = {
QPATHTOF(data\arlington\Arlington_Tarkas.paa)
};
};

class Cav_Arlington_Traycer: UserTexture1m_F {
scope = 2;
scopeCurator = 2;
displayName = "Traycer"; //CSTRING(Arlington);
author = ECSTRING(main,cavmodteam);
editorPreview = QPATHTOF(data\arlington\Arlington_Traycer.paa);

editorSubcategory = "Cav_EdSubcat_Arlington";

hiddenSelectionsTextures[] = {
QPATHTOF(data\arlington\Arlington_Traycer.paa)
};
};
#include "data/arlington/CfgVehicles.inc.hpp"


//-----Vehicle Labels-----//
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed addons/textures/data/arlington/Arlington_Carter.paa
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed addons/textures/data/arlington/Arlington_Krazee.paa
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 removed addons/textures/data/arlington/Arlington_Novak.paa
Binary file not shown.
Binary file not shown.
Binary file removed addons/textures/data/arlington/Arlington_Raven.paa
Binary file not shown.
Binary file not shown.
Binary file removed addons/textures/data/arlington/Arlington_Ronnie.paa
Binary file not shown.
Binary file not shown.
Binary file removed addons/textures/data/arlington/Arlington_Tarkas.paa
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
73 changes: 73 additions & 0 deletions addons/textures/data/arlington/CfgVehicles.inc.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
#define MACRO_ARLINGTON(var1,var2) \
class var1: UserTexture1m_F { \
_generalMacro = QUOTE(var1); \
scope = 2; \
scopeCurator = 2; \
displayName = CSTRING(var1); \
author = ECSTRING(main,modteam); \
editorPreview = QPATHTOF(data\arlington\var2.paa); \
\
hiddenSelectionsTextures[] = { \
QPATHTOF(data\arlington\var2.paa) \
};\
}

// Side Labels
class Cav_Arlington_Left_F: UserTexture_1x2_F {
scope = 2;
scopeCurator = 2;
displayName = CSTRING(Cav_Arlington_Left_F);
author = ECSTRING(main,modteam);
editorPreview = QPATHTOF(data\arlington\Arlington_Left.paa);

editorSubcategory = "Cav_EdSubcat_Arlington";

hiddenSelectionsTextures[] = {
QPATHTOF(data\arlington\Arlington_Left.paa)
};
};
class Cav_Arlington_Right_F: UserTexture_1x2_F {
scope = 2;
scopeCurator = 2;
displayName = CSTRING(Cav_Arlington_Right_F);
author = ECSTRING(main,modteam);
editorPreview = QPATHTOF(data\arlington\Arlington_Right.paa);

editorSubcategory = "Cav_EdSubcat_Arlington";

hiddenSelectionsTextures[] = {
QPATHTOF(data\arlington\Arlington_Right.paa)
};
};

// Arlington Textures
MACRO_ARLINGTON(Cav_Arlington_Bowman_F,Arlington_Bowman_ca.paa);
MACRO_ARLINGTON(Cav_Arlington_Britton_F,Arlington_Britton_ca.paa);
MACRO_ARLINGTON(Cav_Arlington_Carter_F,Arlington_Carter_ca.paa);
MACRO_ARLINGTON(Cav_Arlington_Cooper_F,Arlington_Cooper_ca.paa);
MACRO_ARLINGTON(Cav_Arlington_Dornbierer_F,Arlington_Dornbierer_ca.paa);
MACRO_ARLINGTON(Cav_Arlington_Krazee_F,Arlington_Krazee_ca.paa);
MACRO_ARLINGTON(Cav_Arlington_Long_F,Arlington_Long_ca.paa);
MACRO_ARLINGTON(Cav_Arlington_Mcgehee_F,Arlington_Mcgehee_ca.paa);
MACRO_ARLINGTON(Cav_Arlington_MillerDC_F,Arlington_MillerDC_ca.paa);
MACRO_ARLINGTON(Cav_Arlington_Muska_F,Arlington_Muska_ca.paa);
MACRO_ARLINGTON(Cav_Arlington_Novak_F,Arlington_Novak_ca.paa);
MACRO_ARLINGTON(Cav_Arlington_Raven_F,Arlington_Raven_ca.paa);
MACRO_ARLINGTON(Cav_Arlington_Ronnie_F,Arlington_Ronnie_ca.paa);
MACRO_ARLINGTON(Cav_Arlington_Tarkas_F,Arlington_Tarkas_ca.paa);
MACRO_ARLINGTON(Cav_Arlington_Traycer_F,Arlington_Traycer_ca.paa);


// Backwards compatability
class Cav_Arlington_Left: Cav_Arlington_Left_F { scope = 1; scopeCurator = 1; };
class Cav_Arlington_Right: Cav_Arlington_Right_F { scope = 1; scopeCurator = 1; };

class Cav_Arlington_Britton: Cav_Arlington_Britton_F { scope = 1; scopeCurator = 1; };
class Cav_Arlington_Carter: Cav_Arlington_Carter_F { scope = 1; scopeCurator = 1; };
class Cav_Arlington_Krazee: Cav_Arlington_Krazee_F { scope = 1; scopeCurator = 1; };
class Cav_Arlington_Mcgehee: Cav_Arlington_Mcgehee_F { scope = 1; scopeCurator = 1; };
class Cav_Arlington_Novak: Cav_Arlington_Novak_F { scope = 1; scopeCurator = 1; };
class Cav_Arlington_Raven: Cav_Arlington_Raven_F { scope = 1; scopeCurator = 1; };
class Cav_Arlington_Ronnie: Cav_Arlington_Ronnie_F { scope = 1; scopeCurator = 1; };
class Cav_Arlington_Tarkas: Cav_Arlington_Tarkas_F { scope = 1; scopeCurator = 1; };
class Cav_Arlington_Traycer: Cav_Arlington_Traycer_F { scope = 1; scopeCurator = 1; };
55 changes: 55 additions & 0 deletions addons/textures/stringtable.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,60 @@
<Key ID="STR_Cav_Textures_Cat_Vehicle_Labels">
<English>7th Cavalry Vehicle Labels</English>
</Key>

<!-- Arlington Textures -->
<Key ID="STR_Cav_Textures_Cav_Arlington_Left_F">
<English>Arlington Label (Left)</English>
</Key>
<Key ID="STR_Cav_Textures_Cav_Arlington_Right_F">
<English>Arlington Label (Right)</English>
</Key>

<Key ID="STR_Cav_Textures_Cav_Arlington_Bowman_F">
<English>Bowman</English>
</Key>
<Key ID="STR_Cav_Textures_Cav_Arlington_Britton_F">
<English>Britton</English>
</Key>
<Key ID="STR_Cav_Textures_Cav_Arlington_Carter_F">
<English>Carter</English>
</Key>
<Key ID="STR_Cav_Textures_Cav_Arlington_Cooper_F">
<English>Cooper</English>
</Key>
<Key ID="STR_Cav_Textures_Cav_Arlington_Dornbierer_F">
<English>Dornbierer</English>
</Key>
<Key ID="STR_Cav_Textures_Cav_Arlington_Krazee_F">
<English>Krazee</English>
</Key>
<Key ID="STR_Cav_Textures_Cav_Arlington_Long_F">
<English>Long</English>
</Key>
<Key ID="STR_Cav_Textures_Cav_Arlington_Mcgehee_F">
<English>Mcgehee</English>
</Key>
<Key ID="STR_Cav_Textures_Cav_Arlington_MillerDC_F">
<English>MillerDC</English>
</Key>
<Key ID="STR_Cav_Textures_Cav_Arlington_Muska_F">
<English>Muska</English>
</Key>
<Key ID="STR_Cav_Textures_Cav_Arlington_Novak_F">
<English>Novak</English>
</Key>
<Key ID="STR_Cav_Textures_Cav_Arlington_Raven_F">
<English>Raven</English>
</Key>
<Key ID="STR_Cav_Textures_Cav_Arlington_Ronnie_F">
<English>Ronnie</English>
</Key>
<Key ID="STR_Cav_Textures_Cav_Arlington_Tarkas_F">
<English>Tarkas</English>
</Key>
<Key ID="STR_Cav_Textures_Cav_Arlington_Traycer_F">
<English>Traycer</English>
</Key>

</Package>
</Project>

0 comments on commit e60ede6

Please sign in to comment.