diff --git a/README.md b/README.md index 733af4eaed..270b4f6384 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@
-
+
diff --git a/addons/common/functions/fnc_isFeatureCameraActive.sqf b/addons/common/functions/fnc_isFeatureCameraActive.sqf
index 7d282109b2..4e0dc9ad44 100644
--- 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
index f0681137a6..a21034f277 100644
--- 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
index a52346e875..c1be635b72 100644
--- 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
index 52b11e0797..22dc9e46fe 100644
--- a/docs/README_DE.md
+++ b/docs/README_DE.md
@@ -4,7 +4,7 @@
-
+
diff --git a/docs/README_PL.md b/docs/README_PL.md
index 5c5163313f..6f48b7c81e 100644
--- a/docs/README_PL.md
+++ b/docs/README_PL.md
@@ -3,7 +3,7 @@
-
+
diff --git a/docs/_config.yml b/docs/_config.yml
index ab86d182c5..2fcf2b3285 100644
--- 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
index 227d4029bf..73c4a3f60f 100644
--- 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
index 3357f64b54..0eb5ea4fad 100644
--- 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";