Added ACE3 project template #471, #470, #469, #462

Resolved #471, resolved #470, resolved #469, resolved #462

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,24 @@
+**Arma 3 Version:** `x.xx` (stable / rc / dev)
+**CBA Version:** `3.x.x` (stable / dev + commit hash)
+**Achilles Version:** `2.x.x` (stable / dev + commit hash)
+
+**Mods:**
+```
+- CBA_A3
+- achilles
+```
+
+**Description:**
+- Add a detailed description of the error. This makes it easier for us to fix the issue.
+
+**Steps to reproduce:**
+- Add the steps needed to reproduce the issue.
+
+**Where did the issue occur?**
+- Dedicated / Self-Hosted Multiplayer / Singleplayer / Editor (Singleplayer) / Editor (Multiplayer) / Virtual Arsenal
+
+**Additional information:**
+- Provide any additional information that will help us solve this issue.
+
+**RPT log file:**
+- Add a link ([gist](https://gist.github.com) or [pastebin](http://pastebin.com)) to the client and/or server RPT file. An instruction to find your RPT files can be found [here](https://community.bistudio.com/wiki/Crash_Files#Arma_3).

.github/ISSUE_TEMPLATE/bug-report.md

@@ -0,0 +1,30 @@
+---
+name: Bug report
+about: Report an issue with Achilles
+
+---
+
+**Arma 3 Version:** `x.xx` (stable / rc / dev)
+**CBA Version:** `3.x.x` (stable / dev + commit hash)
+**Achilles Version:** `2.x.x` (stable / dev + commit hash)
+
+**Mods:**
+```
+- CBA_A3
+- achilles
+```
+
+**Description:**
+- Add a detailed description of the error. This makes it easier for us to fix the issue.
+
+**Steps to reproduce:**
+- Add the steps needed to reproduce the issue.
+
+**Where did the issue occur?**
+- Dedicated / Self-Hosted Multiplayer / Singleplayer / Editor (Singleplayer) / Editor (Multiplayer) / Virtual Arsenal
+
+**Additional information:**
+- Provide any additional information that will help us solve this issue.
+
+**RPT log file:**
+- Add a link ([gist](https://gist.github.com) or [pastebin](http://pastebin.com)) to the client and/or server RPT file. An instruction to find your RPT files can be found [here](https://community.bistudio.com/wiki/Crash_Files#Arma_3).

.github/ISSUE_TEMPLATE/feature-request.md

@@ -0,0 +1,13 @@
+---
+name: Feature request
+about: Request a new feature or functionality
+
+---
+
+### Before reporting
+
+- Any and all requests should be done in the designated feature request issue.
+- Before posting a new one, please make sure to check the previous entries on the thread AND THE ENTRIES on #414 and make a quick search; please don't reiterate requests that had already been either accepted for inclusion or disregarded.
+- There's really no point on making feature requests for anything included or planned for inclusion in ACE2, AGM or CSE. The majority of those things are been considered for porting or rewriting already.
+- Accepted feature requests may be moved to a separate issue by moderators for further discussion.
+

.github/ISSUE_TEMPLATE/mod-conflict.md

@@ -0,0 +1,30 @@
+---
+name: Mod conflict
+about: Report issues where Achilles doesn't play nice with other mods
+
+---
+
+**Arma 3 Version:** `x.xx` (stable / rc / dev)
+**CBA Version:** `3.x.x` (stable / dev + commit hash)
+**Achilles Version:** `2.x.x` (stable / dev + commit hash)
+
+**Mods:**
+```
+- CBA_A3
+- achilles
+```
+
+**Description:**
+- Add a detailed description of the error. This makes it easier for us to fix the issue. Please try to narrow down the mod which causes this issue in combination with Achilles. Visit Achilles Discord for assistance if necessary.
+
+**Steps to reproduce:**
+- Add the steps needed to reproduce the issue.
+
+**Where did the issue occur?**
+- Dedicated / Self-Hosted Multiplayer / Singleplayer / Editor (Singleplayer) / Editor (Multiplayer) / Virtual Arsenal
+
+**Additional information:**
+- Provide any additional information that will help us solve this issue.
+
+**RPT log file:**
+- Add a link ([gist](https://gist.github.com) or [pastebin](http://pastebin.com)) to the client and/or server RPT file. An instruction to find your RPT files can be found [here](https://community.bistudio.com/wiki/Crash_Files#Arma_3).

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,5 @@
+**When merged this pull request will:**
+- Describe what this pull request will do
+- Each change in a separate line
+- Include documentation if applicable
+- Respect the [Development Guidelines](https://lexicon.readthedocs.io/en/rewrite/development/code-guidelines.html)

.github/PULL_REQUEST_TEMPLATE/bug-fix.md

@@ -0,0 +1,25 @@
+---
+name: Bug fix
+about: Submit a PR for a bug fix
+
+---
+
+### This pull requests will solve:
+
+> mention which issue this pull requests resolves.
+
+### This is done by:
+
+> describe how this issue is fixed
+
+
+### This can be tested by:
+
+> describe how to verify this PR solves the issue.
+
+
+## Check list
+
+- [ ] Use seperate commits for large changes
+- [ ] Include documentation if applicable
+- [ ] Respect the [Development Guidelines](https://lexicon.readthedocs.io/en/rewrite/development/code-guidelines.html)

.github/PULL_REQUEST_TEMPLATE/new-feature.md

@@ -0,0 +1,11 @@
+---
+name: New feature
+about: Submit a PR for a new feature
+
+---
+
+**When merged this pull request will:**
+- Describe what this pull request will do
+- Each change in a separate line
+- Include documentation if applicable
+- Respect the [Development Guidelines](https://lexicon.readthedocs.io/en/rewrite/development/code-guidelines.html)

.gitignore

@@ -1,11 +1,15 @@
-@Achilles/keys/private/
 docs/build/
 docs/source/_build/
-tools/*.yml
 .vscode/
-*.bikey
-*.biprivatekey
-*.bisign
 *.pbo
-*.log
-.hephaestus.json
+tools/armake.exe
+release
+*.cache
+*.pbo
+texHeaders.bin
+*.swp
+*.swo
+*.biprivatekey
+Thumbs.db
+@achilles
+*.zip

AUTHORS.txt

@@ -0,0 +1,8 @@
+# CONTRIBUTOR LIST
+
+# CORE TEAM
+- CreepPork https://github.com/CreepPork
+- oOKexOo https://github.com/oOKexOo
+- NeilZar https://github.com/NeilZar
+
+# CONTRIBUTORS

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 Achilles
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

Makefile

@@ -0,0 +1,89 @@
+VERSION = $(shell cat "VERSION")
+PREFIX = achilles
+BIN = @achilles
+ZIP = achilles
+FLAGS = -i include -w unquoted-string -w redefinition-wo-undef
+VERSION_FILES = README.md mod.cpp
+
+MAJOR = $(word 1, $(subst ., ,$(VERSION)))
+MINOR = $(word 2, $(subst ., ,$(VERSION)))
+PATCH = $(word 3, $(subst ., ,$(VERSION)))
+BUILD = $(word 4, $(subst ., ,$(VERSION)))
+VERSION_S = $(MAJOR).$(MINOR).$(PATCH)
+VERSION_F = $(MAJOR).$(MINOR).$(PATCH).$(BUILD)
+GIT_HASH = $(shell git log -1 --pretty=format:"%H" | head -c 8)
+
+ifeq ($(OS), Windows_NT)
+	ARMAKE = ./tools/armake.exe # Downloaded via make.ps (rename armake_wXY.exe otherwise)
+else
+	ARMAKE = armake
+endif
+
+$(BIN)/addons/$(PREFIX)_%.pbo: addons/%
+	@mkdir -p $(BIN)/addons
+	@echo "  PBO  $@"
+	@${ARMAKE} build ${FLAGS} -f -e "version=$(GIT_HASH)" $< $@
+
+$(BIN)/optionals/$(PREFIX)_%.pbo: optionals/%
+	@mkdir -p $(BIN)/optionals
+	@echo "  PBO  $@"
+	@${ARMAKE} build ${FLAGS} -f -e "version=$(GIT_HASH)" $< $@
+
+# Shortcut for building single addons (eg. "make <component>.pbo")
+%.pbo:
+	"$(MAKE)" $(MAKEFLAGS) $(patsubst %, $(BIN)/addons/$(PREFIX)_%, $@)
+
+all: $(patsubst addons/%, $(BIN)/addons/$(PREFIX)_%.pbo, $(wildcard addons/*)) \
+		$(patsubst optionals/%, $(BIN)/optionals/$(PREFIX)_%.pbo, $(wildcard optionals/*))
+
+filepatching:
+	"$(MAKE)" $(MAKEFLAGS) FLAGS="-w unquoted-string -p"
+
+$(BIN)/keys/%.biprivatekey:
+	@mkdir -p $(BIN)/keys
+	@echo "  KEY  $@"
+	@${ARMAKE} keygen -f $(patsubst $(BIN)/keys/%.biprivatekey, $(BIN)/keys/%, $@)
+
+$(BIN)/addons/$(PREFIX)_%.pbo.$(PREFIX)_$(VERSION)-$(GIT_HASH).bisign: $(BIN)/addons/$(PREFIX)_%.pbo $(BIN)/keys/$(PREFIX)_$(VERSION).biprivatekey
+	@echo "  SIG  $@"
+	@${ARMAKE} sign -f -s $@ $(BIN)/keys/$(PREFIX)_$(VERSION).biprivatekey $<
+
+$(BIN)/optionals/$(PREFIX)_%.pbo.$(PREFIX)_$(VERSION)-$(GIT_HASH).bisign: $(BIN)/optionals/$(PREFIX)_%.pbo $(BIN)/keys/$(PREFIX)_$(VERSION).biprivatekey
+	@echo "  SIG  $@"
+	@${ARMAKE} sign -f -s $@ $(BIN)/keys/$(PREFIX)_$(VERSION).biprivatekey $<
+
+signatures: $(patsubst addons/%, $(BIN)/addons/$(PREFIX)_%.pbo.$(PREFIX)_$(VERSION)-$(GIT_HASH).bisign, $(wildcard addons/*)) \
+		$(patsubst optionals/%, $(BIN)/optionals/$(PREFIX)_%.pbo.$(PREFIX)_$(VERSION)-$(GIT_HASH).bisign, $(wildcard optionals/*))
+
+extensions: $(wildcard extensions/*/*)
+	cd extensions/build && cmake .. && make
+	find ./extensions/build/ \( -name "*.so" -o -name "*.dll" \) -exec cp {} ./ \;
+
+extensions-win64: $(wildcard extensions/*/*)
+	cd extensions/build && CXX=$(eval $(which g++-w64-mingw-i686)) cmake .. && make
+
+version:
+	@echo "  VER  $(VERSION)"
+	$(shell sed -i -r -s 's/[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/$(VERSION)/g' $(VERSION_FILES))
+	$(shell sed -i -r -s 's/[0-9]+\.[0-9]+\.[0-9]+/$(VERSION_S)/g' $(VERSION_FILES))
+	@echo -e "#define MAJOR $(MAJOR)\n#define MINOR $(MINOR)\n#define PATCHLVL $(PATCH)\n#define BUILD $(BUILD)" > "addons/main/script_version.hpp"
+
+commit:
+	@echo "  GIT  commit release preparation"
+	#@git add -A
+	#@git diff-index --quiet HEAD || git commit -am "Prepare release $(VERSION_S)" -q
+
+push: commit
+	@echo "  GIT  push release preparation"
+	#@git push -q
+
+release: clean version commit
+	@"$(MAKE)" $(MAKEFLAGS) signatures
+	@echo "  ZIP  $(ZIP)_$(VERSION_F).zip"
+	@cp mod.cpp README.md AUTHORS.txt LICENSE logo_achilles_ca.paa $(BIN)
+	@zip -qr $(ZIP)_$(VERSION_F).zip $(BIN)
+
+clean:
+	rm -rf $(BIN) $(ZIP)_*.zip
+
+.PHONY: all filepatching signatures extensions extensions-win64 version commit push release clean

README.md

@@ -0,0 +1,3 @@
+# Achilles
+
+This is the rewrite branch of Achilles 2.0, which is heavily in development and should **not** be used for any kind of production use.

VERSION

@@ -0,0 +1 @@
+2.0.0.0

addons/main/$PBOPREFIX$

@@ -0,0 +1 @@
+z\achilles\addons\main

addons/main/CfgEventHandlers.hpp

@@ -0,0 +1,17 @@
+class Extended_PreStart_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_FILE(XEH_preStart));
+    };
+};
+
+class Extended_PreInit_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_FILE(XEH_preInit));
+    };
+};
+
+class Extended_PostInit_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_FILE(XEH_postInit));
+    };
+};

addons/main/CfgModuleCategories.hpp

@@ -0,0 +1,14 @@
+class CfgFactionClasses {
+    class NO_CATEGORY;
+    class Achilles: NO_CATEGORY {
+        displayName = "Achilles";
+        priority = 2;
+        side = 7;
+    };
+};
+
+class CfgVehicleClasses {
+    class Achilles_Vehicles {
+        displayName = "Achilles Vehicles";
+    };
+};

addons/main/README.md

@@ -0,0 +1,4 @@
+achilles_main
+=============
+
+Backbone of other components, defining most of the commonly used macros.

addons/main/XEH_PREP.hpp

@@ -0,0 +1 @@
+// FUNCTION PREPS

addons/main/XEH_postInit.sqf

@@ -0,0 +1,2 @@
+#include "script_component.hpp"
+

addons/main/XEH_preInit.sqf

@@ -0,0 +1,7 @@
+#include "script_component.hpp"
+
+ADDON = false;
+
+#include "XEH_PREP.hpp"
+
+ADDON = true;

addons/main/XEH_preStart.sqf

@@ -0,0 +1,3 @@
+#include "script_component.hpp"
+
+#include "XEH_PREP.hpp"

addons/main/config.cpp

@@ -0,0 +1,18 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+    class ADDON {
+        name = COMPONENT_NAME;
+        units[] = {};
+        weapons[] = {};
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {"achilles_common"};
+        author = "";
+        authors[] = {"The Achilles Dev Team"};
+        authorUrl = "https://github.com/ArmaAchilles/Achilles";
+        VERSION_CONFIG;
+    };
+};
+
+#include "CfgEventHandlers.hpp"
+#include "CfgModuleCategories.hpp"

addons/main/script_component.hpp

@@ -0,0 +1,17 @@
+#define COMPONENT main
+#include "\z\achilles\addons\main\script_mod.hpp"
+
+// #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define CBA_DEBUG_SYNCHRONOUS
+// #define ENABLE_PERFORMANCE_COUNTERS
+
+#ifdef DEBUG_ENABLED_MAIN
+    #define DEBUG_MODE_FULL
+#endif
+
+#ifdef DEBUG_SETTINGS_MAIN
+    #define DEBUG_SETTINGS DEBUG_SETTINGS_MAIN
+#endif
+
+#include "\z\achilles\addons\main\script_macros.hpp"