From c7e29813323d55af235af915bfe5484b2de59b15 Mon Sep 17 00:00:00 2001 From: jonpas Date: Tue, 17 Dec 2019 19:58:09 +0100 Subject: [PATCH 1/7] Version zh-TW README --- tools/make.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/make.py b/tools/make.py index 1db6b039ed..9ffead03ba 100644 --- a/tools/make.py +++ b/tools/make.py @@ -73,7 +73,7 @@ prefix = "ace" pbo_name_prefix = "ace_" signature_blacklist = [] importantFiles = ["mod.cpp", "README.md", "docs\\README_DE.md", "docs\\README_PL.md", "docs\\README.zh-TW.md", "AUTHORS.txt", "LICENSE", "logo_ace3_ca.paa", "meta.cpp"] -versionFiles = ["README.md", "docs\\README_DE.md", "docs\\README_PL.md", "mod.cpp"] +versionFiles = ["mod.cpp", "README.md", "docs\\README_DE.md", "docs\\README_PL.md", "docs\\README.zh-TW.md"] ciBuild = False # Used for CI builds From 8ea5146a2e98ce425b880d30fc56898e39cbb967 Mon Sep 17 00:00:00 2001 From: jonpas Date: Tue, 17 Dec 2019 20:17:22 +0100 Subject: [PATCH 2/7] Support zh-TW version update in make.py (UTF-8 encoding in file replace) --- tools/make.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/tools/make.py b/tools/make.py index 9ffead03ba..f9f5706fc2 100644 --- a/tools/make.py +++ b/tools/make.py @@ -51,7 +51,7 @@ import traceback import time import timeit import re -import fileinput +from tempfile import mkstemp if sys.platform == "win32": import winreg @@ -582,9 +582,15 @@ def get_project_version(version_increments=[]): def replace_file(filePath, oldSubstring, newSubstring): - for line in fileinput.input(filePath, inplace=True): - # Use stdout directly, print() adds newlines automatically - sys.stdout.write(line.replace(oldSubstring,newSubstring)) + fh, absPath = mkstemp() + with open(absPath, "w", encoding="utf-8") as newFile: + with open(filePath, encoding="utf-8") as oldFile: + for line in oldFile: + newFile.write(line.replace(oldSubstring, newSubstring)) + + newFile.close() + os.remove(filePath) + shutil.move(absPath, filePath) def set_version_in_files(): @@ -603,7 +609,7 @@ def set_version_in_files(): try: # Save the file contents to a variable if the file exists if os.path.isfile(filePath): - f = open(filePath, "r+") + f = open(filePath, "r+", encoding="utf-8") fileText = f.read() f.close() From c755037b80b9653eb001c1f3dfddf60e7adb0fb3 Mon Sep 17 00:00:00 2001 From: jonpas Date: Tue, 17 Dec 2019 23:36:32 +0100 Subject: [PATCH 3/7] Update version on wiki --- docs/_config.yml | 12 ++++++------ docs/_config_dev.yml | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/_config.yml b/docs/_config.yml index 224559582d..c0137278b5 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -8,17 +8,17 @@ ace: githubUrl: https://github.com/acemod/ACE3 version: major: 3 - minor: 12 - patch: 6 - build: 43 + minor: 13 + patch: 0 + build: 44 acex: githubUrl: https://github.com/acemod/ACEX version: major: 3 - minor: 4 - patch: 2 - build: 13 + minor: 5 + patch: 0 + build: 14 markdown: kramdown diff --git a/docs/_config_dev.yml b/docs/_config_dev.yml index a1d68d7786..6b4e65548a 100644 --- a/docs/_config_dev.yml +++ b/docs/_config_dev.yml @@ -8,17 +8,17 @@ ace: githubUrl: https://github.com/acemod/ACE3 version: major: 3 - minor: 12 - patch: 6 - build: 43 + minor: 13 + patch: 0 + build: 44 acex: githubUrl: https://github.com/acemod/ACEX version: major: 3 - minor: 4 - patch: 2 - build: 13 + minor: 5 + patch: 0 + build: 14 markdown: kramdown From dd826589d293ff73daff3e29fbb39cb595189e1e Mon Sep 17 00:00:00 2001 From: jonpas Date: Wed, 18 Dec 2019 00:23:49 +0100 Subject: [PATCH 4/7] Prepare release 3.13.0 --- README.md | 2 +- addons/main/script_version.hpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index eb794493a0..2ad414038b 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 fe84527032..710ba75072 100644 --- a/addons/main/script_version.hpp +++ b/addons/main/script_version.hpp @@ -1,4 +1,4 @@ #define MAJOR 3 -#define MINOR 12 -#define PATCHLVL 6 -#define BUILD 43 +#define MINOR 13 +#define PATCHLVL 0 +#define BUILD 44 From c59667d0ba18e7c66e82d4cd8ae7aaaac309807a Mon Sep 17 00:00:00 2001 From: jonpas Date: Mon, 30 Dec 2019 19:33:35 +0100 Subject: [PATCH 5/7] Prepare release 3.13.0 (build 2) --- addons/main/script_version.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/main/script_version.hpp b/addons/main/script_version.hpp index 710ba75072..5db5adbc5b 100644 --- a/addons/main/script_version.hpp +++ b/addons/main/script_version.hpp @@ -1,4 +1,4 @@ #define MAJOR 3 #define MINOR 13 #define PATCHLVL 0 -#define BUILD 44 +#define BUILD 45 From 64838857de9c5e568f5c90ce2a2c706e1789006c Mon Sep 17 00:00:00 2001 From: jonpas Date: Mon, 30 Dec 2019 20:40:34 +0100 Subject: [PATCH 6/7] Update version on wiki --- docs/_config.yml | 4 ++-- docs/_config_dev.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/_config.yml b/docs/_config.yml index c0137278b5..7d72a43e14 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -10,7 +10,7 @@ ace: major: 3 minor: 13 patch: 0 - build: 44 + build: 45 acex: githubUrl: https://github.com/acemod/ACEX @@ -18,7 +18,7 @@ acex: major: 3 minor: 5 patch: 0 - build: 14 + build: 15 markdown: kramdown diff --git a/docs/_config_dev.yml b/docs/_config_dev.yml index 6b4e65548a..493f7782e0 100644 --- a/docs/_config_dev.yml +++ b/docs/_config_dev.yml @@ -10,7 +10,7 @@ ace: major: 3 minor: 13 patch: 0 - build: 44 + build: 45 acex: githubUrl: https://github.com/acemod/ACEX @@ -18,7 +18,7 @@ acex: major: 3 minor: 5 patch: 0 - build: 14 + build: 15 markdown: kramdown From d060185704bb28fed1af3362f6f0d290b9d3886a Mon Sep 17 00:00:00 2001 From: jonpas Date: Mon, 30 Dec 2019 20:54:16 +0100 Subject: [PATCH 7/7] Hellfire - Fix missing semi-colon --- addons/hellfire/CfgAmmo.hpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/addons/hellfire/CfgAmmo.hpp b/addons/hellfire/CfgAmmo.hpp index e03a174a91..8a50594ffa 100644 --- a/addons/hellfire/CfgAmmo.hpp +++ b/addons/hellfire/CfgAmmo.hpp @@ -78,22 +78,22 @@ class CfgAmmo { seekerTypes[] = { "ARH" }; defaultSeekerLockMode = "LOBL"; seekerLockModes[] = { "LOBL" }; - + activeRadarEngageDistance = 1000; seekerMaxRange = 2000; // distance that the hellfire internal radar can scan }; - + // Vanilla lock system vars weaponLockSystem = "8"; airLock = 1; lockType = 0; maneuvrability = 0; // no maneuvrability so that default guidance doesnt work - + missileLockMaxDistance = 8000; missileLockMinDistance = 250; missileLockMaxSpeed = 600; missileKeepLockedCone = 70; - + flightProfiles[] = {}; class Components { class SensorsManagerComponent { @@ -101,18 +101,18 @@ class CfgAmmo { class MillimeterWaveRadar { componentType = "ActiveRadarSensorComponent"; class AirTarget { - minRange = 0; - maxRange = 8000; - objectDistanceLimitCoef = -1 - viewDistanceLimitCoef = -1; - }; + minRange = 0; + maxRange = 8000; + objectDistanceLimitCoef = -1; + viewDistanceLimitCoef = -1; + }; class GroundTarget { - minRange = 0; - maxRange = 8000; - objectDistanceLimitCoef = -1; - viewDistanceLimitCoef = -1; - }; - typeRecognitionDistance = 4000; + minRange = 0; + maxRange = 8000; + objectDistanceLimitCoef = -1; + viewDistanceLimitCoef = -1; + }; + typeRecognitionDistance = 4000; angleRangeHorizontal = 70; angleRangeVertical = 70; groundNoiseDistanceCoef = 0; // relevant to AA missiles - not really for this