Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release'

Browse Source
This commit is contained in:
jonpas 2020-01-01 20:57:22 +01:00
commit 4daec7a350
6 changed files with 43 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -4,7 +4,7 @@
<p align="center"> <p align="center">
<a href="https://github.com/acemod/ACE3/releases/latest"> <a href="https://github.com/acemod/ACE3/releases/latest">
<img src="https://img.shields.io/badge/Version-3.12.6-blue.svg?style=flat-square" alt="ACE3 Version"> <img src="https://img.shields.io/badge/Version-3.13.0-blue.svg?style=flat-square" alt="ACE3 Version">
</a> </a>
<a href="https://github.com/acemod/ACE3/issues"> <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"> <img src="https://img.shields.io/github/issues-raw/acemod/ACE3.svg?style=flat-square&label=Issues" alt="ACE3 Issues">

2
addons/hellfire/CfgAmmo.hpp
View File

@ -103,7 +103,7 @@ class CfgAmmo {
class AirTarget { class AirTarget {
minRange = 0; minRange = 0;
maxRange = 8000; maxRange = 8000;
objectDistanceLimitCoef = -1 objectDistanceLimitCoef = -1;
viewDistanceLimitCoef = -1; viewDistanceLimitCoef = -1;
}; };
class GroundTarget { class GroundTarget {

6
addons/main/script_version.hpp
View File

@ -1,4 +1,4 @@
#define MAJOR 3 #define MAJOR 3
#define MINOR 12 #define MINOR 13
#define PATCHLVL 6 #define PATCHLVL 0
#define BUILD 43 #define BUILD 45

12
docs/_config.yml
View File

@ -8,17 +8,17 @@ ace:
githubUrl: https://github.com/acemod/ACE3 githubUrl: https://github.com/acemod/ACE3
version: version:
major: 3 major: 3
minor: 12 minor: 13
patch: 6 patch: 0
build: 43 build: 45
acex: acex:
githubUrl: https://github.com/acemod/ACEX githubUrl: https://github.com/acemod/ACEX
version: version:
major: 3 major: 3
minor: 4 minor: 5
patch: 2 patch: 0
build: 13 build: 15
markdown: kramdown markdown: kramdown

12
docs/_config_dev.yml
View File

@ -8,17 +8,17 @@ ace:
githubUrl: https://github.com/acemod/ACE3 githubUrl: https://github.com/acemod/ACE3
version: version:
major: 3 major: 3
minor: 12 minor: 13
patch: 6 patch: 0
build: 43 build: 45
acex: acex:
githubUrl: https://github.com/acemod/ACEX githubUrl: https://github.com/acemod/ACEX
version: version:
major: 3 major: 3
minor: 4 minor: 5
patch: 2 patch: 0
build: 13 build: 15
markdown: kramdown markdown: kramdown

18
tools/make.py
View File

@ -51,7 +51,7 @@ import traceback
import time import time
import timeit import timeit
import re import re
import fileinput from tempfile import mkstemp
if sys.platform == "win32": if sys.platform == "win32":
import winreg import winreg
@ -73,7 +73,7 @@ prefix = "ace"
pbo_name_prefix = "ace_" pbo_name_prefix = "ace_"
signature_blacklist = [] 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"] 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 ciBuild = False # Used for CI builds
@ -582,9 +582,15 @@ def get_project_version(version_increments=[]):
def replace_file(filePath, oldSubstring, newSubstring): def replace_file(filePath, oldSubstring, newSubstring):
for line in fileinput.input(filePath, inplace=True): fh, absPath = mkstemp()
# Use stdout directly, print() adds newlines automatically with open(absPath, "w", encoding="utf-8") as newFile:
sys.stdout.write(line.replace(oldSubstring,newSubstring)) 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(): def set_version_in_files():
@ -603,7 +609,7 @@ def set_version_in_files():
try: try:
# Save the file contents to a variable if the file exists # Save the file contents to a variable if the file exists
if os.path.isfile(filePath): if os.path.isfile(filePath):
f = open(filePath, "r+") f = open(filePath, "r+", encoding="utf-8")
fileText = f.read() fileText = f.read()
f.close() f.close()