Merge unstable 2.2.0 into master

stutpip123 · Jan 6, 2020 · 6ef759d · 6ef759d
2 parents c966260 + 545f3d5
commit 6ef759d
Show file tree

Hide file tree

Showing 679 changed files with 145,659 additions and 69,986 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -0,0 +1,22 @@
+## What type of PR is this.
+1. [ ] Bug
+2. [ ] Enhancement
+
+### What have you changed and why?
+Information:
+
+
+### Please specify which Issue this PR Resolves.
+closes #XXXX
+
+### Please verify the following and ensure all checks are completed.
+
+1. [ ] Have you loaded the Mission in Singleplayer?
+2. [ ] Have you loaded the Mission in a Dedicated Server?
+
+### Is further testing or are further changes required?
+1. [ ] No
+2. [ ] Yes (Please provide further detail below.)
+
+********************************************************
+Notes:
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,16 @@
-
-A3DD/
 .vscode/
 .github/
-Arma 3 Dev Deploy.exe
 *.log
 *.pbo
 *.pbo.bak
 *.bat
+
+#Ignore mission files that have been copied to A3-Antistasi
+A3-Antistasi/description.ext
+A3-Antistasi/mission.sqm
+A3-Antistasi/roadsDB*.sqf
+A3-Antistasi/PIC.jpg
+A3-Antistasi/ak.jpg
+
+#Ignore packaged missions
+PreparedMissions/
diff --git a/A3-Antistasi/AI/Buildings/isInRoof.sqf b/A3-Antistasi/AI/Buildings/isInRoof.sqf
diff --git a/A3-Antistasi/AI/Buildings/isWindowPosition.sqf b/A3-Antistasi/AI/Buildings/isWindowPosition.sqf