diff --git a/addons/main/CfgSettings.hpp b/addons/main/CfgSettings.hpp index 3a7b949a0..f92ca6659 100644 --- a/addons/main/CfgSettings.hpp +++ b/addons/main/CfgSettings.hpp @@ -4,11 +4,6 @@ class CfgSettings { class PREFIX { class dependencies { CBA[] = {"cba_main", REQUIRED_CBA_VERSION, "(true)"}; - - compat_csla[] = {"acre_sys_csla", {VERSION_AR}, "isClass (configFile >> 'CfgPatches' >> 'CSLA')"}; - compat_gm[] = {"acre_sys_gm", {VERSION_AR}, "isClass (configFile >> 'CfgPatches' >> 'gm_core')"}; - compat_sogpf[] = {"acre_sys_sog", {VERSION_AR}, "isClass (configFile >> 'CfgPatches' >> 'data_f_vietnam')"}; - compat_ws[] = {"acre_sys_ws", {VERSION_AR}, "isClass (configFile >> 'CfgPatches' >> 'data_f_lxWS')"}; }; }; }; diff --git a/addons/main/script_mod.hpp b/addons/main/script_mod.hpp index 40ccd7847..da6a26462 100644 --- a/addons/main/script_mod.hpp +++ b/addons/main/script_mod.hpp @@ -11,7 +11,7 @@ #define VERSION_PLUGIN MAJOR.MINOR.PATCHLVL.BUILD // MINIMAL required version for the Mod. Components can specify others.. -#define REQUIRED_VERSION 2.10 +#define REQUIRED_VERSION 2.14 #define REQUIRED_CBA_VERSION {3,15,5} #ifdef COMPONENT_BEAUTIFIED diff --git a/include/a3/ui_f/hpp/defineResincl.inc b/include/a3/ui_f/hpp/defineResincl.inc index 818fd438c..12b897259 100644 --- a/include/a3/ui_f/hpp/defineResincl.inc +++ b/include/a3/ui_f/hpp/defineResincl.inc @@ -1448,6 +1448,9 @@ enum #define IDC_OPTIONS_MAPDUCKING_VALUE 119 #define IDC_OPTIONS_MAPDUCKING_SLIDER 120 +#define IDC_OPTIONS_UI_VALUE 121 +#define IDC_OPTIONS_UI_SLIDER 122 + // microphone adjustment #define IDC_OPTIONS_MIC_PROGRESS_BAR 1001 #define IDC_OPTIONS_MIC_PROGRESS 1002 diff --git a/tools/compile_sqf.py b/tools/compile_sqf.py deleted file mode 100644 index dabf515ba..000000000 --- a/tools/compile_sqf.py +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env python3 - -import os -import sys -import subprocess - -# Handle script being called from either base or /tools folder (e.g. hemmt will run from base) -addon_base_path = os.getcwd() -if os.path.basename(addon_base_path) == "tools": - addon_base_path = os.path.dirname(addon_base_path) - - -def cleanup(): - count = 0 - for root, _dirs, files in os.walk(os.path.join(addon_base_path, "addons")): - for file in files: - if file.endswith(".sqfc"): - os.remove(os.path.join(root, file)) - count += 1 - print("cleaned [{} sqfc files]".format(count)) - - -def build(verbose): - compiler_exe = os.path.join(addon_base_path, "ArmaScriptCompiler.exe") - if not os.path.isfile(compiler_exe): - print("ArmaScriptCompiler.exe not found in base addon folder, trying ci folder") - compiler_exe = os.path.join(addon_base_path, "ci", "ArmaScriptCompiler.exe") - if not os.path.isfile(compiler_exe): - print("Warning: ArmaScriptCompiler.exe not found - skipping compiling") - return 1 - print("ArmaScriptCompiler.exe found - starting compiling") - ret = subprocess.call([compiler_exe], cwd=addon_base_path, stdout=verbose) - print("compiled [ret {}]".format(ret)) - return 0 - - -def main(argv): - ret = 0 - - # print("compile_sqf.py [Base: {}]".format(addon_base_path)) - if ("cleanup" in argv) or (len(argv) < 2): - cleanup() - if ("build" in argv) or (len(argv) < 2): - ret = build("verbose" in argv) - - return ret - - -if __name__ == "__main__": - sys.exit(main(sys.argv))