Merge remote-tracking branch 'upstream/master'

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,31 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**VCOM Version:**
+ - Branch: [e.g. Master, Develop]
+ - Version [e.g. 3.2.1]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

Vcom/changelog.txt

@@ -2,11 +2,25 @@
 All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
-## [3.3] - 2019-01-31
+## [3.3] - 2019-03-26
 ### Added
 - VCOM Situation Framework
+- Revamped reinforcements system
+- New movement system (AI will not enter combat mode unless very close to enemies)
+- New CQC system (To tie in with the new movement system)
+- New suppression system (To tie in with the new movement system)
+- Revamped clear building logic
 
 
+### Changed
+- Functions have now been categorised
+- fn_EnemyArray has new parameters
+- fn_AIHEARING now sets units to "AWARE"
+
+### Fixed
+- AI will only call out formation change when actually changed.
+- VCOM should run on zeus/headless now
+
 ## [3.2.1] - 2019-01-31
 ### Added