Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Template optre #2

Merged
merged 8 commits into from
Aug 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
*.bat
AntistasiBuilder.cfg

build/@A3A-Plus

#Ignore mission files that have been copied to A3-Antistasi
A3-Antistasi/description.ext
A3-Antistasi/mission.sqm
Expand All @@ -24,4 +22,5 @@ Antistasi-Plus.biprivatekey

#Ignore Python bytecode files and bytecode-cache folder
__pycache__/
build/
*.py[cod]
82 changes: 48 additions & 34 deletions A3A/addons/core/CfgMarkers.hpp
Original file line number Diff line number Diff line change
@@ -1,37 +1,51 @@
class CfgMarkers {
class flag_NATO;
class CfgMarkers
{
class flag_NATO;

class a3a_flag_cdf: flag_NATO {
name = "CDF";
icon = QPATHTOFOLDER(Pictures\Markers\cdf_ca.paa);
texture = QPATHTOFOLDER(Pictures\Markers\cdf_ca.paa);
};
class a3a_flag_cdf: flag_NATO
{
name = "CDF";
icon = QPATHTOFOLDER(Pictures\Markers\cdf_ca.paa);
texture = QPATHTOFOLDER(Pictures\Markers\cdf_ca.paa);
};

class a3a_flag_napa: flag_NATO {
name = "NAPA";
icon = QPATHTOFOLDER(Pictures\Markers\napa_ca.paa);
texture = QPATHTOFOLDER(Pictures\Markers\napa_ca.paa);
};
class a3a_flag_napa: flag_NATO
{
name = "NAPA";
icon = QPATHTOFOLDER(Pictures\Markers\napa_ca.paa);
texture = QPATHTOFOLDER(Pictures\Markers\napa_ca.paa);
};

class a3a_flag_serbia: flag_NATO {
name = "Serbia";
icon = QPATHTOFOLDER(Pictures\Markers\serbia_ca.paa);
texture = QPATHTOFOLDER(Pictures\Markers\serbia_ca.paa);
};
class a3a_flag_chdkz: flag_NATO {
name = "ChDKZ";
icon = QPATHTOFOLDER(Pictures\Markers\chdkz_co.paa);
texture = QPATHTOFOLDER(Pictures\Markers\chdkz_co.paa);
};

class loc_MilAdministration {
color[] = {1,1,1,1};
icon = QPATHTOFOLDER(Pictures\Markers\milAdministration_CA.paa);
markerClass = "Locations";
name = "Military Administration";
scope = 1;
shadow = 0;
showEditorMarkerColor = 0;
size = 24;
};
};
class a3a_flag_serbia: flag_NATO
{
name = "Serbia";
icon = QPATHTOFOLDER(Pictures\Markers\serbia_ca.paa);
texture = QPATHTOFOLDER(Pictures\Markers\serbia_ca.paa);
};

class a3a_flag_chdkz: flag_NATO
{
name = "ChDKZ";
icon = QPATHTOFOLDER(Pictures\Markers\chdkz_co.paa);
texture = QPATHTOFOLDER(Pictures\Markers\chdkz_co.paa);
};

class a3u_flag_optre_unsc: flag_NATO
{
name = "UNSC";
icon = QPATHTOFOLDER(Pictures\Markers\marker_unsc_ca.paa);
texture = QPATHTOFOLDER(Pictures\Markers\marker_unsc_ca.paa);
};
class a3u_flag_optre_covenant: a3u_flag_optre_unsc
{
name = "Covenant";
icon = QPATHTOFOLDER(Pictures\Markers\marker_covenant_ca.paa);
texture = QPATHTOFOLDER(Pictures\Markers\marker_covenant_ca.paa);
};
class a3u_flag_optre_insurrection: a3u_flag_optre_unsc
{
name = "Insurrection";
icon = QPATHTOFOLDER(Pictures\Markers\marker_insurrection_ca.paa);
texture = QPATHTOFOLDER(Pictures\Markers\marker_insurrection_ca.paa);
};
};
Binary file added A3A/addons/core/Pictures/Markers/OPTRE.xcf
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added A3A/addons/core/Pictures/antistasi_logo.paa
Binary file not shown.
Binary file added A3A/addons/core/Pictures/antistasi_logo_small.paa
Binary file not shown.
Binary file added A3A/addons/core/Pictures/antistasi_logo_sw.paa
Binary file not shown.
9 changes: 8 additions & 1 deletion A3A/addons/core/Templates/Templates.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -761,5 +761,12 @@ class Templates
// ***************************** SPE IFA *****************************

#include "Templates\SPE_IFA\templates.hpp"


// ***************************** OPTRE *****************************

#include "Templates\OPTRE\templates.hpp"

// ***************************** RACS *****************************

#include "Templates\RACS\templates.hpp"
};
Loading