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 remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
KoffeinFlummi 2015-08-30 00:42:46 +02:00
commit 6a17e3fa83
2 changed files with 10 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
addons/main/config.cpp
View File

@ -543,46 +543,23 @@ class CfgPatches {
"map_vr", "map_vr",
"extended_eventhandlers", "cba_ui", "cba_xeh", "cba_xeh_a3", "cba_jr" "extended_eventhandlers", "cba_ui", "cba_xeh", "cba_xeh_a3", "cba_jr"
}; };
author[] = {"ACE Team"}; author[] = {ECSTRING(common,ACETeam)};
authorUrl = ""; authorUrl = "http://ace3mod.com/";
versionDesc = "A.C.E."; versionDesc = "ACE3";
versionAct = QUOTE(['MAIN',_this] execVM '\z\ace\addons\main\about.sqf';);
VERSION_CONFIG; VERSION_CONFIG;
}; };
}; };
class CfgMods { class CfgMods {
class PREFIX { class PREFIX {
dir = "@ACE"; dir = "@ace";
name = "Core - Advanced Combat Environment"; name = "Advanced Combat Environment 3";
picture = "A3\Ui_f\data\Logos\arma3_expansion_alpha_ca"; picture = "A3\Ui_f\data\Logos\arma3_expansion_alpha_ca";
hidePicture = "true"; hidePicture = "true";
hideName = "true"; hideName = "true";
actionName = "Website"; actionName = "Website";
action = "http://ace.dev-heaven.net"; action = "http://ace3mod.com/";
description = "Bugtracker: "; description = "Issue Tracker: https://github.com/acemod/ACE3/issues";
};
};
class CfgSettings {
class CBA {
class Versioning {
class PREFIX {
level = DEFAULT_VERSIONING_LEVEL;
handler = "ace_common_fnc_mismatch";
class Dependencies {
CBA[]={"cba_main", {1,0,0}, "true"};
XEH[]={"cba_xeh", {1,0,0}, "true"};
};
};
};
/*
class Registry {
class PREFIX {
removed[] = {};
};
};
*/
}; };
}; };

6
addons/main/script_component.hpp
View File

@ -3,12 +3,12 @@
// #define DEBUG_MODE_FULL // #define DEBUG_MODE_FULL
#ifdef DEBUG_ENABLED_CORE #ifdef DEBUG_ENABLED_MAIN
#define DEBUG_MODE_FULL #define DEBUG_MODE_FULL
#endif #endif
#ifdef DEBUG_SETTINGS_CORE #ifdef DEBUG_SETTINGS_MAIN
#define DEBUG_SETTINGS DEBUG_SETTINGS_CORE #define DEBUG_SETTINGS DEBUG_SETTINGS_MAIN
#endif #endif
#include "\z\ace\addons\main\script_macros.hpp" #include "\z\ace\addons\main\script_macros.hpp"