From f7d63336f5bcf95d219ec53a32cbdc975804f923 Mon Sep 17 00:00:00 2001 From: jonpas Date: Sat, 10 Jun 2017 15:24:19 +0200 Subject: [PATCH 1/5] Increase required CBA version to 3.3.1 --- addons/main/script_mod.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) From e0887b3839f357545f3bb1fadef70461fe73c19c Mon Sep 17 00:00:00 2001 From: jonpas Date: Sat, 10 Jun 2017 15:27:14 +0200 Subject: [PATCH 2/5] Prepare version 3.10.0 --- README.md | 2 +- addons/main/script_version.hpp | 6 +++--- docs/README_DE.md | 2 +- docs/README_PL.md | 2 +- mod.cpp | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 733af4eaed..270b4f6384 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@

- ACE3 Version + ACE3 Version ACE3 Issues diff --git a/addons/main/script_version.hpp b/addons/main/script_version.hpp index a52346e875..60894d7649 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 19 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 @@

- ACE3 Version + ACE3 Version ACE3 Fehlermeldungen 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 @@

- ACE3 Wersja + ACE3 Wersja ACE3 Zagadnienia 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"; From 6eaba8ddaf0e3f1cb8b03cad402677b2b35a12e3 Mon Sep 17 00:00:00 2001 From: jonpas Date: Mon, 12 Jun 2017 16:25:19 +0200 Subject: [PATCH 3/5] Update homepage version numbers #4692 [ci skip] --- docs/_config.yml | 6 +++--- docs/_config_dev.yml | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/_config.yml b/docs/_config.yml index ab86d182c5..00458149cf 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: 19 acex: githubUrl: https://github.com/acemod/ACEX diff --git a/docs/_config_dev.yml b/docs/_config_dev.yml index 227d4029bf..70de39e24b 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: 19 acex: githubUrl: https://github.com/acemod/ACEX version: major: 3 - minor: 1 - patch: 1 - build: 3 + minor: 2 + patch: 0 + build: 4 markdown: kramdown From e770f669b655171ce3b69a35054f8a1db243d23a Mon Sep 17 00:00:00 2001 From: Moritz Schmidt Date: Tue, 13 Jun 2017 13:53:41 +0200 Subject: [PATCH 4/5] Fix isFeatureCameraActive for Spectator enhacements (#5269) * fix isFeatureCameraActive for spec ace_spectator_camera was removed in 77c2b99ee542e3825c4f25e7b5a399597fd436e2 . spectator module initializes three separate cameras instead, of which for example ace_spectator_freeCamera can be used to check if spec mode is active * use ace_spectator_isSet to check for spec mode --- addons/common/functions/fnc_isFeatureCameraActive.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 9d9edc46c7f10acfe47612abde0a465ebf7a22b8 Mon Sep 17 00:00:00 2001 From: jonpas Date: Tue, 13 Jun 2017 14:03:37 +0200 Subject: [PATCH 5/5] Prepare release 3.10.0 (build 2) --- addons/main/script_version.hpp | 2 +- docs/_config.yml | 2 +- docs/_config_dev.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/main/script_version.hpp b/addons/main/script_version.hpp index 60894d7649..c1be635b72 100644 --- a/addons/main/script_version.hpp +++ b/addons/main/script_version.hpp @@ -1,4 +1,4 @@ #define MAJOR 3 #define MINOR 10 #define PATCHLVL 0 -#define BUILD 19 +#define BUILD 20 diff --git a/docs/_config.yml b/docs/_config.yml index 00458149cf..2fcf2b3285 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -10,7 +10,7 @@ ace: major: 3 minor: 10 patch: 0 - build: 19 + build: 20 acex: githubUrl: https://github.com/acemod/ACEX diff --git a/docs/_config_dev.yml b/docs/_config_dev.yml index 70de39e24b..73c4a3f60f 100644 --- a/docs/_config_dev.yml +++ b/docs/_config_dev.yml @@ -12,7 +12,7 @@ ace: major: 3 minor: 10 patch: 0 - build: 19 + build: 20 acex: githubUrl: https://github.com/acemod/ACEX