Merge branch 'release'

acemod · Jun 20, 2017 · ba05b74 · ba05b74
2 parents a92b6a7 + 9d9edc4
commit ba05b74
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 <p align="center">
     <a href="https://github.com/acemod/ACE3/releases/latest">
-        <img src="https://img.shields.io/badge/Version-3.9.2-blue.svg?style=flat-square" alt="ACE3 Version">
+        <img src="https://img.shields.io/badge/Version-3.10.0-blue.svg?style=flat-square" alt="ACE3 Version">
     </a>
     <a href="https://github.com/acemod/ACE3/issues">
         <img src="https://img.shields.io/github/issues-raw/acemod/ACE3.svg?style=flat-square&label=Issues" alt="ACE3 Issues">

diff --git a/addons/common/functions/fnc_isFeatureCameraActive.sqf b/addons/common/functions/fnc_isFeatureCameraActive.sqf
@@ -25,7 +25,7 @@
 
 !(
     isNull curatorCamera && // Curator
-    {isNull (GETMVAR(EGVAR(spectator,camera),objNull))} && // ACE Spectator
+    {GETMVAR(EGVAR(spectator,isSet),false)} && // ACE Spectator
     {isNull (GETUVAR(BIS_fnc_arsenal_cam, objNull))} && // Arsenal camera
     {isNull (GETMVAR(BIS_fnc_establishingShot_fakeUAV, objNull))} && // Establishing shot camera
     {isNull (GETMVAR(BIS_fnc_camera_cam, objNull))} && // Splendid camera

diff --git a/addons/main/script_mod.hpp b/addons/main/script_mod.hpp
@@ -10,7 +10,7 @@
 
 // MINIMAL required version for the Mod. Components can specify others..
 #define REQUIRED_VERSION 1.70
-#define REQUIRED_CBA_VERSION {3,2,1}
+#define REQUIRED_CBA_VERSION {3,3,1}
 
 #ifdef COMPONENT_BEAUTIFIED
     #define COMPONENT_NAME QUOTE(ACE3 - COMPONENT_BEAUTIFIED)

diff --git a/addons/main/script_version.hpp b/addons/main/script_version.hpp
@@ -1,4 +1,4 @@
 #define MAJOR 3
-#define MINOR 9
-#define PATCHLVL 2
-#define BUILD 18
+#define MINOR 10
+#define PATCHLVL 0
+#define BUILD 20
diff --git a/docs/README_DE.md b/docs/README_DE.md
@@ -4,7 +4,7 @@
 
 <p align="center">
     <a href="https://github.com/acemod/ACE3/releases">
-        <img src="https://img.shields.io/badge/Version-3.9.2-blue.svg?style=flat-square" alt="ACE3 Version">
+        <img src="https://img.shields.io/badge/Version-3.10.0-blue.svg?style=flat-square" alt="ACE3 Version">
     </a>
     <a href="https://github.com/acemod/ACE3/issues">
         <img src="https://img.shields.io/github/issues-raw/acemod/ACE3.svg?style=flat-square&label=Issues" alt="ACE3 Fehlermeldungen">

diff --git a/docs/README_PL.md b/docs/README_PL.md
@@ -3,7 +3,7 @@
 </p>
 <p align="center">
     <a href="https://github.com/acemod/ACE3/releases">
-        <img src="https://img.shields.io/badge/Wersja-3.9.2-blue.svg?style=flat-square" alt="ACE3 Wersja">
+        <img src="https://img.shields.io/badge/Wersja-3.10.0-blue.svg?style=flat-square" alt="ACE3 Wersja">
     </a>
     <a href="https://github.com/acemod/ACE3/issues">
         <img src="https://img.shields.io/github/issues-raw/acemod/ACE3.svg?label=Zagadnienia&style=flat-square" alt="ACE3 Zagadnienia">

diff --git a/docs/_config.yml b/docs/_config.yml
@@ -8,9 +8,9 @@ ace:
   githubUrl: https://github.com/acemod/ACE3
   version:
     major: 3
-    minor: 9
-    patch: 2
-    build: 18
+    minor: 10
+    patch: 0
+    build: 20
 
 acex:
   githubUrl: https://github.com/acemod/ACEX

diff --git a/docs/_config_dev.yml b/docs/_config_dev.yml
@@ -10,17 +10,17 @@ ace:
   githubUrl: https://github.com/acemod/ACE3
   version:
     major: 3
-    minor: 9
-    patch: 2
-    build: 18
+    minor: 10
+    patch: 0
+    build: 20
 
 acex:
   githubUrl: https://github.com/acemod/ACEX
   version:
     major: 3
-    minor: 1
-    patch: 1
-    build: 3
+    minor: 2
+    patch: 0
+    build: 4
 
 
 markdown: kramdown

diff --git a/mod.cpp b/mod.cpp
@@ -1,8 +1,8 @@
-name = "Advanced Combat Environment 3.9.2";
+name = "Advanced Combat Environment 3.10.0";
 picture = "logo_ace3_ca.paa";
 actionName = "GitHub";
 action = "https://github.com/acemod/ACE3";
-description = "ACE3 - Version 3.9.2";
+description = "ACE3 - Version 3.10.0";
 logo = "logo_ace3_ca.paa";
 logoOver = "logo_ace3_ca.paa";
 tooltip = "ACE3";