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 'master' into cbaEventSystem

Browse Source
This commit is contained in:
PabstMirror 2016-06-02 19:29:30 -05:00
commit d7f9c52c2f
167 changed files with 1643 additions and 1051 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.editorconfig
View File

@ -10,4 +10,3 @@ trim_trailing_whitespace = true
[*.md]
trim_trailing_whitespace = false

5
addons/advanced_ballistics/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_ballistics", "ace_weather"};
author[] = {"Ruthberg"};
authorUrl = "https://github.com/ulteq";
author = ECSTRING(common,ACETeam);
authors[] = {"Ruthberg"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

5
addons/ai/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"};
author[] = {"KoffeinFlummi","commy2"};
authorUrl = "https://github.com/KoffeinFlummi/";
author = ECSTRING(common,ACETeam);
authors[] = {"KoffeinFlummi","commy2"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

5
addons/aircraft/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"};
author[] = {"KoffeinFlummi","Crusty","commy2","jaynus","Kimi"};
authorUrl = "https://github.com/KoffeinFlummi/";
author = ECSTRING(common,ACETeam);
authors[] = {"KoffeinFlummi","Crusty","commy2","jaynus","Kimi"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

1
addons/aircraft/flightmodel_thunderbolt.hpp
View File

@ -20,4 +20,3 @@ envelope[] = {0,0,0.75,2.4,3.6,3.8,3.7,3.2,2.2,1.7,0.9};
thrustCoef[] = {1,1.2,1.3,1.25,1.06,1.01,1,0.92,0.75,0.65,0.5,0.25,0};
acceleration = 265;
landingSpeed = 220;
gunAimDown = 0.087266463;

4
addons/apl/config.cpp
View File

@ -6,8 +6,8 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_main"};
author[] = {"Bohemia Interactive"};
authorUrl = "http://ace3mod.com";
author = "Bohemia Interactive";
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

4
addons/atragmx/config.cpp
View File

@ -6,7 +6,9 @@ class CfgPatches {
weapons[] = {"ACE_ATragMX"};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ACE_common", "ACE_weather"};
author = "Ruthberg";
author = ECSTRING(common,ACETeam);
authors[] = {"Ruthberg"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

5
addons/attach/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {"ACE_IR_Strobe_Item"};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_interaction"};
author[] = {"KoffeinFlummi","eRazeri","esteldunedain"};
authorUrl = "https://github.com/KoffeinFlummi/";
author = ECSTRING(common,ACETeam);
authors[] = {"KoffeinFlummi","eRazeri","esteldunedain"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

5
addons/backpacks/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"};
author[] = {"bux","commy2"};
authorUrl = "https://github.com/commy2/";
author = ECSTRING(common,ACETeam);
authors[] = {"bux","commy2"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

4
addons/ballistics/config.cpp
View File

@ -6,7 +6,9 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"};
author[] = {"commy2","Ruthberg"};
author = ECSTRING(common,ACETeam);
authors[] = {"commy2","Ruthberg"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

5
addons/captives/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {"ACE_CableTie"};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ACE_Interaction"};
author[] = {"commy2", "KoffeinFlummi"};
authorUrl = "https://github.com/commy2/";
author = ECSTRING(common,ACETeam);
authors[] = {"commy2", "KoffeinFlummi"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

9
addons/cargo/CfgVehicles.hpp
View File

@ -314,14 +314,15 @@ class CfgVehicles {
GVAR(space) = 20;
GVAR(hasCargo) = 1;
};
class Land_Pod_Heli_Transport_04_medevac_F: Pod_Heli_Transport_04_base_F {
GVAR(space) = 8;
GVAR(hasCargo) = 1;
};
class Land_Pod_Heli_Transport_04_repair_F: Pod_Heli_Transport_04_base_F {
GVAR(space) = 12;
GVAR(hasCargo) = 1;
};
class Pod_Heli_Transport_04_crewed_base_F;
class Land_Pod_Heli_Transport_04_medevac_F: Pod_Heli_Transport_04_crewed_base_F {
GVAR(space) = 8;
GVAR(hasCargo) = 1;
};
class StaticMortar;
class Mortar_01_base_F: StaticMortar {

5
addons/cargo/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_interaction"};
author[] = {"commy2", "Glowbal"};
authorUrl = "https://ace3mod.com/";
author = ECSTRING(common,ACETeam);
authors[] = {"commy2", "Glowbal"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

4
addons/common/RscInfoType.hpp
View File

@ -111,4 +111,8 @@ class RscInGameUI {
class RscStaminaBar {
onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscStaminaBar"",'IGUI')] call (uinamespace getvariable 'BIS_fnc_initDisplay'); uiNamespace setVariable [ARR_2(QUOTE(QGVAR(dlgStaminaBar)),_this select 0)]);
};
class RscStanceInfo {
onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscStanceInfo"",'IGUI')] call (uinamespace getvariable 'BIS_fnc_initDisplay'); [ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Stance')])] call FUNC(localEvent););
};
};

12
addons/common/XEH_postInit.sqf
View File

@ -122,9 +122,17 @@ if (isServer) then {
["ace_setVectorDirAndUp", {(_this select 0) setVectorDirAndUp (_this select 1)}] call CBA_fnc_addEventHandler;
["ace_setVanillaHitPointDamage", {(_this select 0) setHitPointDamage (_this select 1)}] call CBA_fnc_addEventHandler;
// Request framework
[QGVAR(requestCallback), FUNC(requestCallback)] call CBA_fnc_addEventHandler;
[QGVAR(receiveRequest), FUNC(receiveRequest)] call CBA_fnc_addEventHandler;
[QGVAR(systemChatGlobal), {systemChat _this}] call CBA_fnc_addEventHandler;
if (isServer) then {
["ace_hideObjectGlobal", {(_this select 0) hideObjectGlobal (_this select 1)}] call CBA_fnc_addEventHandler;
["ace_enableSimulationGlobal", {(_this select 0) enableSimulationGlobal (_this select 1)}] call CBA_fnc_addEventHandler;
["ace_setOwner", {(_this select 0) setOwner (_this select 1)}] call CBA_fnc_addEventHandler;
[QGVAR(serverLog), FUNC(serverLog)] call CBA_fnc_addEventHandler;
};
@ -132,6 +140,10 @@ if (isServer) then {
// Set up remote execution
//////////////////////////////////////////////////
// ACE events
"ACEg" addPublicVariableEventHandler {_this call FUNC(_handleNetEvent)};
"ACEc" addPublicVariableEventHandler {_this call FUNC(_handleNetEvent)};
// Synced ACE events
// Handle JIP scenario
if (!isServer) then {

7
addons/common/XEH_preInit.sqf
View File

@ -19,13 +19,6 @@ DFUNC(selectWeaponMode) = {
GVAR(syncedEvents) = HASH_CREATE;
GVAR(showHudHash) = [] call FUNC(hashCreate);
//GVARS for execNextFrame and waitAndExec and waitUntilAndExecute
GVAR(waitAndExecArray) = [];
GVAR(nextFrameNo) = diag_frameno;
GVAR(nextFrameBufferA) = [];
GVAR(nextFrameBufferB) = [];
GVAR(waitUntilAndExecArray) = [];
GVAR(settingsInitFinished) = false;
GVAR(runAtSettingsInitialized) = [];

5
addons/common/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {"ACE_ItemCore","ACE_FakePrimaryWeapon", "ACE_Banana"};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_main","ace_modules"};
author[] = {"KoffeinFlummi"};
authorUrl = "https://github.com/KoffeinFlummi/";
author = CSTRING(ACETeam);
authors[] = {"KoffeinFlummi"};
url = ECSTRING(main,URL);
VERSION_CONFIG_COMMON;
};
};

3
addons/common/functions/fnc_checkPBOs.sqf
View File

@ -61,7 +61,8 @@ if (!isServer) then {
_error = _error + "Newer version; ";
};
//[_error, "{systemChat _this}"] call FUNC(execRemoteFnc);
//[QGVAR(systemChatGlobal), _error] call FUNC(globalEvent);
ACE_LOGERROR(_error);
if (_mode < 2) then {

2
addons/common/functions/fnc_onAnswerRequest.sqf
View File

@ -20,7 +20,7 @@ if (!isNil "_info") then {
_info params ["_caller", "_target", "_requestID", "_requestMessage", "_callBack"];
private _replyParams = [_info, _accepted];
[_replyParams, QFUNC(requestCallback), _caller, false] call FUNC(execRemoteFnc);
[QGVAR(requestCallback), _caller, _replyParams] call FUNC(objectEvent);
_unit setVariable [_id, nil];
};

2
addons/common/functions/fnc_sendRequest.sqf
View File

@ -20,7 +20,7 @@ params ["_caller", "_target", "_requestID", "_requestMessage", "_callBack"];
if (isPlayer _target) then {
// Pass request on to target locality for player accept/decline.
[[_caller, _target, _requestID, _requestMessage, _callBack], QFUNC(receiveRequest), _target, false] call FUNC(execRemoteFnc);
[QGVAR(receiveRequest), _target, [_caller, _target, _requestID, _requestMessage, _callBack]] call FUNC(objectEvent);
} else {
// accept it, since it's an AI.
[_caller, _target, true] call compile _callBack;

2
addons/common/functions/fnc_serverLog.sqf
View File

@ -20,5 +20,5 @@ params [["_msg", "", [""]]];
if (isServer) then {
diag_log text _msg;
} else {
[_this, QFUNC(serverLog), 1] call FUNC(execRemoteFnc);
[QGVAR(serverLog), _this] call FUNC(serverEvent);
};

8
addons/common/scripts/checkVersionNumber.sqf
View File

@ -100,7 +100,7 @@ if (!isServer) then {
_error = _error call _fnc_cutComma;
diag_log text _error;
[_error, "{systemChat _this}"] call FUNC(execRemoteFnc);
[QGVAR(systemChatGlobal), _error] call FUNC(globalEvent);
};
_missingAddonServer = false;
@ -117,7 +117,7 @@ if (!isServer) then {
_error = _error call _fnc_cutComma;
diag_log text _error;
[_error, "{systemChat _this}"] call FUNC(execRemoteFnc);
[QGVAR(systemChatGlobal), _error] call FUNC(globalEvent);
};
_oldVersionClient = false;
@ -134,7 +134,7 @@ if (!isServer) then {
_error = _error call _fnc_cutComma;
diag_log text _error;
[_error, "{systemChat _this}"] call FUNC(execRemoteFnc);
[QGVAR(systemChatGlobal), _error] call FUNC(globalEvent);
};
_oldVersionServer = false;
@ -151,7 +151,7 @@ if (!isServer) then {
_error = _error call _fnc_cutComma;
diag_log text _error;
[_error, "{systemChat _this}"] call FUNC(execRemoteFnc);
[QGVAR(systemChatGlobal), _error] call FUNC(globalEvent);
};
ACE_Version_ClientErrors = [_missingAddon, _missingAddonServer, _oldVersionClient, _oldVersionServer];

4
addons/concertina_wire/config.cpp
View File

@ -6,7 +6,9 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_apl", "ace_interaction"};
author[] = {"Rocko", "Ruthberg"};
author = ECSTRING(common,ACETeam);
authors[] = {"Rocko", "Ruthberg"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

4
addons/dagr/config.cpp
View File

@ -6,7 +6,9 @@ class CfgPatches {
weapons[] = {"ACE_DAGR"};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_weather"};
author[] = {"Rosuto", "Ruthberg"};
author = ECSTRING(common,ACETeam);
authors[] = {"Rosuto", "Ruthberg"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

5
addons/disarming/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {"ACE_DebugPotato"};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ACE_Interaction"};
author[] = {"PabstMirror"};
authorUrl = "https://github.com/PabstMirror/";
author = ECSTRING(common,ACETeam);
authors[] = {"PabstMirror"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

5
addons/disposable/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"};
author[] = {"commy2"};
authorUrl = "https://github.com/commy2/";
author = ECSTRING(common,ACETeam);
authors[] = {"commy2"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

11
addons/dragging/CfgVehicles.hpp
View File

@ -19,12 +19,6 @@ class CfgVehicles {
GVAR(canDrag) = 0;
};
//remove actions from Taru Pods
class Pod_Heli_Transport_04_base_F: StaticWeapon {
GVAR(canCarry) = 0;
GVAR(canDrag) = 0;
};
class StaticMortar;
class Mortar_01_base_F: StaticMortar {
GVAR(canCarry) = 1;
@ -53,6 +47,11 @@ class CfgVehicles {
GVAR(canCarry) = 0;
GVAR(canDrag) = 0;
};
//remove actions from Taru Pods
class Pod_Heli_Transport_04_base_F: Slingload_base_F {
GVAR(canCarry) = 0;
GVAR(canDrag) = 0;
};
class EAST_Box_Base: ReammoBox_F {
GVAR(canCarry) = 1;

5
addons/dragging/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_interaction"};
author[] = {"Garth 'L-H' de Wet", "commy2"};
authorUrl = "https://github.com/commy2/";
author = ECSTRING(common,ACETeam);
authors[] = {"Garth 'L-H' de Wet", "commy2"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

1
addons/explosives/XEH_postInit.sqf
View File

@ -17,6 +17,7 @@
//Event for setting explosive placement angle/pitch:
[QGVAR(place), {_this call FUNC(setPosition)}] call CBA_fnc_addEventHandler;
[QGVAR(startDefuse), FUNC(startDefuse)] call EFUNC(common,addEventHandler);
//When getting knocked out in medical, trigger deadman explosives:
//Event is global, only run on server (ref: ace_medical_fnc_setUnconscious)

5
addons/explosives/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {"ACE_Clacker", "ACE_DefusalKit", "ACE_M26_Clacker", "ACE_DeadManSwitch", "ACE_Cellphone"};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_interaction"};
author[] = {"Garth 'L-H' de Wet"};
authorUrl = "http://garth.snakebiteink.co.za/";
author = ECSTRING(common,ACETeam);
authors[] = {"Garth 'L-H' de Wet"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

2
addons/explosives/functions/fnc_startDefuse.sqf
View File

@ -44,7 +44,7 @@ if (STANCE _unit == "Prone") then {
if (ACE_player != _unit) then {
// If the unit is a player, call the function on the player.
if (isPlayer _unit) then {
[[_unit, _target], QFUNC(startDefuse), _unit] call EFUNC(common,execRemoteFnc);
[QGVAR(startDefuse), _unit, [_unit, _target]] call EFUNC(common,objectEvent);
} else {
_unit playActionNow _actionToPlay;
_unit disableAI "MOVE";

5
addons/fastroping/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_interaction"};
author[] = {"KoffeinFlummi", "BaerMitUmlaut"};
authorUrl = "";
author = ECSTRING(common,ACETeam);
authors[] = {"KoffeinFlummi", "BaerMitUmlaut"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

7
addons/fcs/ACE_UI.hpp Normal file
View File

@ -0,0 +1,7 @@
class ACE_UI {
class gunnerZeroing {
class conditions {
ADDON = "false";
};
};
};

6
addons/fcs/config.cpp
View File

@ -6,13 +6,15 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_interaction"};
author[] = {"KoffeinFlummi","BadGuy (simon84)","commy2"};
authorUrl = "https://github.com/KoffeinFlummi/";
author = ECSTRING(common,ACETeam);
authors[] = {"KoffeinFlummi","BadGuy (simon84)","commy2"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};
#include "CfgEventHandlers.hpp"
#include "ACE_UI.hpp"
#include "CfgAmmo.hpp"
#include "CfgMagazines.hpp"

5
addons/finger/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"};
author[] = {"Drill"};
authorUrl = "https://github.com/TheDrill/";
author = ECSTRING(common,ACETeam);
authors[] = {"Drill"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

5
addons/flashlights/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {"ACE_Flashlight_MX991", "ACE_Flashlight_KSF1", "ACE_Flashlight_XL50"};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_interaction"};
author[] = {"voiper"};
authorUrl = "https://github.com/voiperr/";
author = ECSTRING(common,ACETeam);
authors[] = {"voiper"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

5
addons/flashsuppressors/config.cpp
View File

@ -14,8 +14,9 @@ class CfgPatches {
};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"};
author[] = {"commy2"};
authorUrl = "https://github.com/commy2";
author = ECSTRING(common,ACETeam);
authors[] = {"commy2"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

5
addons/fonts/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_main"};
author[] = {"jaynus"};
authorUrl = "https://github.com/jaynus/";
author = ECSTRING(common,ACETeam);
authors[] = {"jaynus"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

4
addons/frag/config.cpp
View File

@ -5,7 +5,9 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"};
author[] = {"Nou"};
author = ECSTRING(common,ACETeam);
authors[] = {"Nou"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

5
addons/gestures/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_interact_menu"};
author[] = {"joko // Jonas", "Emperias", "Zigomarvin"};
authorUrl = "https://github.com/jokoho48";
author = ECSTRING(common,ACETeam);
authors[] = {"joko // Jonas", "Emperias", "Zigomarvin"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

5
addons/gforces/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"};
author[] = {"KoffeinFlummi", "esteldunedain"};
authorUrl = "https://github.com/KoffeinFlummi/";
author = ECSTRING(common,ACETeam);
authors[] = {"KoffeinFlummi", "esteldunedain"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

3
addons/goggles/XEH_postInit.sqf
View File

@ -31,7 +31,6 @@ GVAR(EffectsActive) = false;
SETGLASSES(ace_player,GLASSESDEFAULT);
GVAR(EyesDamageScript) = -1;
GVAR(FrameEvent) = [false, [false, 20]];
GVAR(PostProcessEyes_Enabled) = false;
GVAR(DustHandler) = -1;
@ -83,7 +82,7 @@ GVAR(OldGlasses) = "<null>";
GVAR(PostProcessEyes) ppEffectAdjust [1, 1, 0, [0, 0, 0, 0], [1, 1, 1, 1], [1, 1, 1, 0]];
GVAR(PostProcessEyes) ppEffectCommit 5;
GVAR(EyesDamageScript) = [{
[{
params ["_unit"];
GVAR(PostProcessEyes) ppEffectEnable false;

5
addons/goggles/config.cpp
View File

@ -7,8 +7,9 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"};
author[] = {"Garth 'L-H' de Wet"};
authorUrl = "http://garth.snakebiteink.co.za/";
author = ECSTRING(common,ACETeam);
authors[] = {"Garth 'L-H' de Wet"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

5
addons/grenades/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"};
author[] = {"commy2", "KoffeinFlummi"};
authorUrl = "https://github.com/commy2/";
author = ECSTRING(common,ACETeam);
authors[] = {"commy2", "KoffeinFlummi"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

5
addons/hearing/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {"ACE_EarPlugs"};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_interaction", "A3_Characters_F", "A3_Characters_F_Kart"};
author[] = {"KoffeinFlummi", "esteldunedain", "HopeJ", "commy2", "Rocko", "Rommel", "Ruthberg"};
authorUrl = "https://github.com/KoffeinFlummi/";
author = ECSTRING(common,ACETeam);
authors[] = {"KoffeinFlummi", "esteldunedain", "HopeJ", "commy2", "Rocko", "Rommel", "Ruthberg"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

5
addons/hitreactions/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"};
author[] = {"commy2"};
authorUrl = "https://github.com/commy2";
author = ECSTRING(common,ACETeam);
authors[] = {"commy2"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

1
addons/huntir/XEH_postInit.sqf
View File

@ -11,4 +11,3 @@ GVAR(ELEVAT) = 0.01;
// Register fire event handler
// Don't run for non players, as they are too dumb to launch huntirs anyway
["ace_firedPlayer", DFUNC(handleFired)] call CBA_fnc_addEventHandler;
["ace_firedPlayerNonLocal", DFUNC(handleFired)] call CBA_fnc_addEventHandler;

4
addons/huntir/config.cpp
View File

@ -6,7 +6,9 @@ class CfgPatches {
weapons[] = {"ACE_HuntIR_monitor"};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"};
author[] = {"Norrin", "Rocko", "Ruthberg"};
author = ECSTRING(common,ACETeam);
authors[] = {"Norrin", "Rocko", "Ruthberg"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

2
addons/huntir/functions/fnc_handleFired.sqf
View File

@ -1,7 +1,7 @@
/*
* Author: Norrin, Rocko, Ruthberg
*
* Handles HuntIR projectiles. Called from the unified fired EH for all CAManBase.
* Handles HuntIR projectiles. Called from the unified fired EH for the local player.
*
* Arguments:
* None. Parameters inherited from EFUNC(common,firedEH)

5
addons/interact_menu/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"};
author[] = {"NouberNou", "esteldunedain"};
authorUrl = "";
author = ECSTRING(common,ACETeam);
authors[] = {"NouberNou", "esteldunedain"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

16
addons/interaction/CfgVehicles.hpp
View File

@ -496,14 +496,6 @@ class CfgVehicles {
};
};
class Pod_Heli_Transport_04_base_F: StaticWeapon {
class ACE_Actions: ACE_Actions {
class ACE_MainActions: ACE_MainActions {
distance = 5;
};
};
};
class StaticMGWeapon: StaticWeapon {};
class HMG_01_base_F: StaticMGWeapon {};
@ -552,6 +544,14 @@ class CfgVehicles {
class ACE_SelfActions {};
};
class Slingload_base_F: ReammoBox_F {};
class Pod_Heli_Transport_04_base_F: Slingload_base_F {
class ACE_Actions: ACE_Actions {
class ACE_MainActions: ACE_MainActions {
distance = 5;
};
};
};
class ACE_RepairItem_Base: ThingX {
class ACE_Actions {

5
addons/interaction/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_interact_menu"};
author[] = {"commy2", "KoffeinFlummi", "esteldunedain", "bux578", "dixon13"};
authorUrl = "https://github.com/commy2/";
author = ECSTRING(common,ACETeam);
authors[] = {"commy2", "KoffeinFlummi", "esteldunedain", "bux578", "dixon13"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

5
addons/inventory/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"};
author[] = {"Pabst Mirror, commy2"};
authorUrl = "https://github.com/PabstMirror/";
author = ECSTRING(common,ACETeam);
authors[] = {"Pabst Mirror, commy2"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

4
addons/javelin/config.cpp
View File

@ -5,7 +5,9 @@ class CfgPatches {
units[] = {};
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = { "ace_main", "ace_common", "ace_missileguidance" };
requiredAddons[] = {"ace_main", "ace_common", "ace_missileguidance"};
author = ECSTRING(common,ACETeam);
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

4
addons/kestrel4500/config.cpp
View File

@ -6,7 +6,9 @@ class CfgPatches {
weapons[] = {"ACE_Kestrel4500"};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ACE_common", "ACE_weather"};
author[] = {ECSTRING(common,ACETeam), "Ruthberg"};
author = ECSTRING(common,ACETeam);
authors[] = {ECSTRING(common,ACETeam), "Ruthberg"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

4
addons/laser/config.cpp
View File

@ -5,7 +5,9 @@ class CfgPatches {
units[] = {};
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = { "ace_common" };
requiredAddons[] = {"ace_common"};
author = ECSTRING(common,ACETeam);
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

2
addons/laser_selfdesignate/config.cpp
View File

@ -6,6 +6,8 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_laser"};
author = ECSTRING(common,ACETeam);
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

5
addons/laserpointer/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {"ACE_acc_pointer_red","ACE_acc_pointer_green","ACE_acc_pointer_green_IR"};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"};
author[] = {"commy2"};
authorUrl = "https://github.com/commy2";
author = ECSTRING(common,ACETeam);
authors[] = {"commy2"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

5
addons/logistics_uavbattery/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {"ACE_UAVBattery"};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_interaction"};
author[] = {"marc_book"};
authorUrl = "";
author = ECSTRING(common,ACETeam);
authors[] = {"marc_book"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

5
addons/logistics_wirecutter/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {"ACE_wirecutter"};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_interaction"};
author[] = {"gpgpgpgp", "PabstMirror"};
authorUrl = "";
author = ECSTRING(common,ACETeam);
authors[] = {"gpgpgpgp", "PabstMirror"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

5
addons/magazinerepack/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_interaction"};
author[] = {"commy2","esteldunedain"};
authorUrl = "https://github.com/commy2/";
author = ECSTRING(common,ACETeam);
authors[] = {"commy2","esteldunedain"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

6
addons/main/config.cpp
View File

@ -567,8 +567,8 @@ class CfgPatches {
"cba_xeh_a3",
"cba_jr"
};
author[] = {ECSTRING(common,ACETeam)};
authorUrl = "http://ace3mod.com/";
author = ECSTRING(common,ACETeam);
url = CSTRING(URL);
VERSION_CONFIG;
};
};
@ -581,7 +581,7 @@ class CfgMods {
hidePicture = "true";
hideName = "true";
actionName = "Website";
action = "http://ace3mod.com/";
action = CSTRING(URL);
description = "Issue Tracker: https://github.com/acemod/ACE3/issues";
};
};

2
addons/main/script_mod.hpp
View File

@ -13,4 +13,4 @@
// MINIMAL required version for the Mod. Components can specify others..
#define REQUIRED_VERSION 1.56
#define REQUIRED_CBA_VERSION {2,3,1}
#define REQUIRED_CBA_VERSION {2,4,0}

11
addons/main/stringtable.xml
View File

@ -12,5 +12,16 @@
<Italian>Logistica ACE</Italian>
<French>ACE Logistique</French>
</Key>
<Key ID="STR_ACE_Main_URL">
<English>http://ace3mod.com/</English>
<German>http://ace3mod.com/</German>
<Polish>http://ace3mod.com/</Polish>
<Portuguese>http://ace3mod.com/</Portuguese>
<Russian>http://ace3mod.com/</Russian>
<Czech>http://ace3mod.com/</Czech>
<Spanish>http://ace3mod.com/</Spanish>
<Italian>http://ace3mod.com/</Italian>
<French>http://ace3mod.com/</French>
</Key>
</Package>
</Project>

5
addons/map/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_interaction"};
author[] = {"KoffeinFlummi","Rocko","esteldunedain"};
authorUrl = "https://github.com/KoffeinFlummi/";
author = ECSTRING(common,ACETeam);
authors[] = {"KoffeinFlummi","Rocko","esteldunedain"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

5
addons/map_gestures/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"};
author[] = {"Dslyecxi", "MikeMatrix"};
authorUrl = "https://github.com/MikeMatrix";
author = ECSTRING(common,ACETeam);
authors[] = {"Dslyecxi", "MikeMatrix"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

5
addons/maptools/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {"ACE_MapTools"};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_interaction"};
author[] = {"esteldunedain"};
authorUrl = "https://github.com/esteldunedain/";
author = ECSTRING(common,ACETeam);
authors[] = {"esteldunedain"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

6
addons/markers/CfgEventHandlers.hpp
View File

@ -16,3 +16,9 @@ class Extended_PostInit_EventHandlers {
init = QUOTE(call COMPILE_FILE(XEH_postInit));
};
};
class Extended_DisplayLoad_EventHandlers {
class RscDiary {
ADDON = QUOTE(_this call FUNC(mapDisplayInitEH));
};
};

1
addons/markers/XEH_PREP.hpp
View File

@ -1,6 +1,7 @@
PREP(getEnabledChannels);
PREP(initInsertMarker);
PREP(mapDisplayInitEH);
PREP(mapDrawEH);
PREP(onLBSelChangedChannel);
PREP(onLBSelChangedColor);

5
addons/markers/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"};
author[] = {"commy2"};
authorUrl = "https://github.com/commy2/";
author = ECSTRING(common,ACETeam);
authors[] = {"commy2"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

34
addons/markers/functions/fnc_mapDisplayInitEH.sqf Normal file
View File

@ -0,0 +1,34 @@
/*
* Author: PabstMirror
* Handles XEH DisplayLoad for the various map displays (RscDiary)
*
* Arguments:
* 0: Map Display (idd 12,37,52,53) <Display>
*
* Return Value:
* None
*
* Example:
* [display] call ace_markers_fnc_mapDisplayInitEH
*
* Public: No
*/
#include "script_component.hpp"
disableSerialization;
params ["_display"];
TRACE_1("params",_display);
private _bisShapeLB = _display displayctrl 1091;
private _curSelShape = missionNamespace getVariable [QGVAR(curSelMarkerShape), 0];
TRACE_2("shape",_bisShapeLB,_curSelShape);
_bisShapeLB ctrlAddEventHandler ["LBSelChanged", {_this call FUNC(onLBSelChangedShape)}];
_bisShapeLB lbSetCurSel _curSelShape;
private _bisColorLB = _display displayctrl 1090;
private _curSelColor = missionNamespace getVariable [QGVAR(curSelMarkerColor), 0];
TRACE_2("color",_bisColorLB,_curSelColor);
_bisColorLB ctrlAddEventHandler ["LBSelChanged", {_this call FUNC(onLBSelChangedColor)}];
_bisColorLB lbSetCurSel _curSelColor;

12
addons/markers/functions/fnc_onLBSelChangedColor.sqf
View File

@ -26,3 +26,15 @@ GVAR(curSelMarkerColor) = _index;
private _config = (configFile >> "CfgMarkerColors") select _data;
GVAR(currentMarkerColorConfigName) = configName _config;
//Set map display to same color:
private _bisColorLB = switch (false) do {
case (isNull findDisplay 12): {(findDisplay 12) displayCtrl 1090};
case (isNull findDisplay 52): {(findDisplay 52) displayCtrl 1090};
case (isNull findDisplay 53): {(findDisplay 53) displayCtrl 1090};
case (isNull findDisplay 37): {(findDisplay 37) displayCtrl 1090};
default {controlNull};
};
if (_ctrl != _bisColorLB) then { //Don't set what we got a EH from
_bisColorLB lbSetCurSel GVAR(curSelMarkerColor);
};

12
addons/markers/functions/fnc_onLBSelChangedShape.sqf
View File

@ -26,3 +26,15 @@ GVAR(curSelMarkerShape) = _index;
private _config = (configFile >> "CfgMarkers") select _data;
GVAR(currentMarkerConfigName) = configName _config;
//Set map display to same shape:
private _bisShapeLB = switch (false) do {
case (isNull findDisplay 12): {(findDisplay 12) displayCtrl 1091};
case (isNull findDisplay 52): {(findDisplay 52) displayCtrl 1091};
case (isNull findDisplay 53): {(findDisplay 53) displayCtrl 1091};
case (isNull findDisplay 37): {(findDisplay 37) displayCtrl 1091};
default {controlNull};
};
if (_ctrl != _bisShapeLB) then { //Don't set what we got a EH from
_bisShapeLB lbSetCurSel GVAR(curSelMarkerShape);
};

6
addons/medical/CfgEden.hpp
View File

@ -16,9 +16,9 @@ class Cfg3DEN {
class Value: ctrlToolbox {
idc = 100;
style = "0x02";
x = "48 * (pixelW * 1.25 * 4)";
w = "82 * (pixelW * 1.25 * 4)";
h = "5 * (pixelH * 1.25 * 4)";
x = "48 * (pixelW * pixelGrid * 0.25)";
w = "82 * (pixelW * pixelGrid * 0.25)";
h = "5 * (pixelH * pixelGrid * 0.25)";
rows = 1;
columns = 4;
strings[] = {"$STR_3DEN_Attributes_Lock_Default_text", CSTRING(AssignMedicRoles_role_none), CSTRING(AssignMedicRoles_role_medic), CSTRING(AssignMedicRoles_role_doctorShort)};

5
addons/medical/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {"ACE_fieldDressing", "ACE_packingBandage", "ACE_elasticBandage", "ACE_tourniquet", "ACE_morphine", "ACE_atropine", "ACE_epinephrine", "ACE_plasmaIV", "ACE_plasmaIV_500", "ACE_plasmaIV_250", "ACE_bloodIV", "ACE_bloodIV_500", "ACE_bloodIV_250", "ACE_salineIV", "ACE_salineIV_500", "ACE_salineIV_250", "ACE_quikclot", "ACE_personalAidKit", "ACE_surgicalKit", "ACE_bodyBag"};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_interaction", "ace_apl"};
author[] = {"Glowbal", "KoffeinFlummi"};
authorUrl = "";
author = ECSTRING(common,ACETeam);
authors[] = {"Glowbal", "KoffeinFlummi"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

5
addons/medical_menu/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_medical"};
author[] = {$STR_ACE_Common_ACETeam, "Glowbal"};
authorUrl = "http://ace3mod.com";
author = ECSTRING(common,ACETeam);
authors[] = {"Glowbal"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

5
addons/microdagr/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {"ACE_microDAGR"};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"};
author[] = {"PabstMirror"};
authorUrl = "https://github.com/PabstMirror/";
author = ECSTRING(common,ACETeam);
authors[] = {"PabstMirror"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

6
addons/microdagr/functions/fnc_canShow.sqf
View File

@ -27,8 +27,10 @@ _returnValue = switch (_showType) do {
("ACE_microDAGR" in (items ACE_player)) && {[ACE_player, objNull, ["notOnMap", "isNotInside", "isNotSitting"]] call EFUNC(common,canInteractWith)}
};
case (DISPLAY_MODE_DISPLAY): {
//Can't have minimap up while zoomed in
(cameraview != "GUNNER") && {"ACE_microDAGR" in (items ACE_player)} && {[ACE_player, objNull, ["notOnMap", "isNotInside", "isNotSitting"]] call EFUNC(common,canInteractWith)}
//Can't have minimap up while zoomed in on foot, but allow drivers to use while in "Gunner" to handle non-3d vehicles like most tanks
((cameraView != "GUNNER") || {(vehicle ACE_player != ACE_player) && {driver vehicle ACE_player == ACE_player}}) &&
{"ACE_microDAGR" in (items ACE_player)} &&
{[ACE_player, objNull, ["notOnMap", "isNotInside", "isNotSitting"]] call EFUNC(common,canInteractWith)}
};
default { false };
};

2
addons/missileguidance/config.cpp
View File

@ -6,6 +6,8 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_laser"};
author = ECSTRING(common,ACETeam);
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

5
addons/missionmodules/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"};
author[] = {"Glowbal"};
authorUrl = "";
author = ECSTRING(common,ACETeam);
authors[] = {"Glowbal"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

5
addons/mk6mortar/config.cpp
View File

@ -7,8 +7,9 @@ class CfgPatches {
weapons[] = {"ACE_RangeTable_82mm","ace_mortar_82mm"};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_interaction"};
author[] = {"PabstMirror","Grey","VKing"};
authorUrl = "https://github.com/acemod";
author = ECSTRING(common,ACETeam);
authors[] = {"PabstMirror","Grey","VKing"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

5
addons/modules/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_main"};
author[] = {"Glowbal"};
authorUrl = "";
author = ECSTRING(common,ACETeam);
authors[] = {"Glowbal"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

5
addons/movement/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"};
author[] = {"commy2","KoffeinFlummi","Tachii"};
authorUrl = "https://github.com/commy2/";
author = ECSTRING(common,ACETeam);
authors[] = {"commy2","KoffeinFlummi","Tachii"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

4
addons/mx2a/config.cpp
View File

@ -6,7 +6,9 @@ class CfgPatches {
weapons[] = {"ACE_MX2A"};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_apl"};
author[] = {"Spooner", "tcp"};
author = ECSTRING(common,ACETeam);
authors[] = {"Spooner", "tcp"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

5
addons/nametags/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_interaction"};
author[] = { "commy2", "esteldunedain" };
authorUrl = "https://github.com/commy2/";
author = ECSTRING(common,ACETeam);
authors[] = { "commy2", "esteldunedain" };
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

5
addons/nightvision/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {"ACE_NVG_Gen1", "ACE_NVG_Gen2", /*"ACE_NVG_Gen3",*/ "ACE_NVG_Gen4", "ACE_NVG_Wide"};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"};
author[] = {"commy2", "KoffeinFlummi", "PabstMirror"};
authorUrl = "https://github.com/commy2/";
author = ECSTRING(common,ACETeam);
authors[] = {"commy2", "KoffeinFlummi", "PabstMirror"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

5
addons/noidle/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"};
author[] = {"commy2"};
authorUrl = "https://github.com/commy2";
author = ECSTRING(common,ACETeam);
authors[] = {"commy2"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

5
addons/noradio/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"};
author[] = {"commy2"};
authorUrl = "https://github.com/commy2/";
author = ECSTRING(common,ACETeam);
authors[] = {"commy2"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

5
addons/norearm/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"};
author[] = {"commy2"};
authorUrl = "https://github.com/commy2";
author = ECSTRING(common,ACETeam);
authors[] = {"commy2"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

5
addons/optics/config.cpp
View File

@ -18,8 +18,9 @@ class CfgPatches {
};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"};
author[] = {"Taosenai","KoffeinFlummi","commy2"};
authorUrl = "http://www.ryanschultz.org/tmr/";
author = ECSTRING(common,ACETeam);
authors[] = {"Taosenai","KoffeinFlummi","commy2"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

5
addons/optionsmenu/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"};
author[] = {"Glowbal", "PabstMirror"};
authorUrl = "http://github.com/Glowbal";
author = ECSTRING(common,ACETeam);
authors[] = {"Glowbal", "PabstMirror"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

22
addons/optionsmenu/functions/fnc_debugDumpToClipboard.sqf
View File

@ -17,7 +17,7 @@
private ["_var", "_unit", "_outputText", "_text"];
#define MIN_ARRAY_SIZE 10
#define MIN_ARRAY_SIZE 50
_outputText = {
diag_log text (_this select 0);
@ -30,12 +30,20 @@ time = %1
------Performance------
diag_fps = %2
count ace_common_waitAndExecArray = %3
count cba_common_perFrameHandlerArray = %4 (max %5)
count diag_activeSQFScripts = %6
count diag_activeSQSScripts = %7
count diag_activeMissionFSMs = %8",
time, diag_fps, count ace_common_waitAndExecArray, {!isNil "_x"} count cba_common_perFrameHandlerArray, count cba_common_perFrameHandlerArray, count diag_activeSQFScripts, count diag_activeSQSScripts,count diag_activeMissionFSMs];
count cba_common_waitAndExecArray = %3
count cba_common_waitUntilAndExecArray = %4
count cba_common_perFrameHandlerArray = %5 (max %6)
count diag_activeSQFScripts = %7
count diag_activeSQSScripts = %8
count diag_activeMissionFSMs = %9",
time,
diag_fps,
count cba_common_waitAndExecArray,
count cba_common_waitUntilAndExecArray,
{!isNil "_x"} count cba_common_perFrameHandlerArray, count cba_common_perFrameHandlerArray,
count diag_activeSQFScripts,
count diag_activeSQSScripts,
count diag_activeMissionFSMs];
[_text] call _outputText;

5
addons/overheating/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {"ACE_SpareBarrel"};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_interaction"};
author[] = {"commy2", "KoffeinFlummi", "esteldunedain"};
authorUrl = "https://github.com/commy2/";
author = ECSTRING(common,ACETeam);
authors[] = {"commy2", "KoffeinFlummi", "esteldunedain"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

5
addons/overpressure/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"};
author[] = {"commy2","KoffeinFlummi","esteldunedain"};
authorUrl = "https://github.com/commy2/";
author = ECSTRING(common,ACETeam);
authors[] = {"commy2","KoffeinFlummi","esteldunedain"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

5
addons/parachute/config.cpp
View File

@ -7,8 +7,9 @@ class CfgPatches {
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"};
VERSION_CONFIG;
author[] = {"Garth 'LH' de Wet"};
authorUrl = "http://garth.snakebiteink.co.za/";
author = ECSTRING(common,ACETeam);
authors[] = {"Garth 'LH' de Wet"};
url = ECSTRING(main,URL);
};
};

4
addons/rangecard/config.cpp
View File

@ -6,7 +6,9 @@ class CfgPatches {
weapons[] = {"ACE_RangeCard"};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ACE_Advanced_Ballistics"};
author = "Ruthberg";
author = ECSTRING(common,ACETeam);
authors[] = {"Ruthberg"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

5
addons/realisticnames/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"};
author[] = {"KoffeinFlummi","TaoSensai","commy2"};
authorUrl = "https://github.com/KoffeinFlummi/";
author = ECSTRING(common,ACETeam);
authors[] = {"KoffeinFlummi","TaoSensai","commy2"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

24
addons/rearm/CfgVehicles.hpp
View File

@ -143,24 +143,21 @@ class CfgVehicles {
MACRO_REARM_TRUCK_ACTIONS
};
class Pod_Heli_Transport_04_base_F: StaticWeapon {};
class ThingX;
class ReammoBox_F: ThingX {
class ACE_Actions {
class ACE_MainActions {};
};
};
class Slingload_base_F: ReammoBox_F {};
class Slingload_01_Base_F: Slingload_base_F {};
class Pod_Heli_Transport_04_base_F: Slingload_base_F {};
class Land_Pod_Heli_Transport_04_ammo_F: Pod_Heli_Transport_04_base_F {
transportAmmo = 0;
MACRO_REARM_TRUCK_ACTIONS
};
class Slingload_base_F;
class Slingload_01_Base_F: Slingload_base_F {
class ACE_Actions {
class ACE_MainActions {
displayName = ECSTRING(interaction,MainAction);
selection = "";
distance = 10;
condition = "true";
};
};
};
class B_Slingload_01_Ammo_F: Slingload_01_Base_F {
transportAmmo = 0;
MACRO_REARM_TRUCK_ACTIONS
@ -168,7 +165,6 @@ class CfgVehicles {
// Dummy Vehicles
class ThingX;
class GVAR(defaultCarriedObject): ThingX {
class EventHandlers {
class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};

5
addons/rearm/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_interaction"};
author[] = {"GitHawk", "Jonpas"};
authorUrl = "https://ace3mod.com";
author = ECSTRING(common,ACETeam);
authors[] = {"GitHawk", "Jonpas"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

5
addons/recoil/config.cpp
View File

@ -6,8 +6,9 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common"};
author[] = {"commy2"};
authorUrl = "";
author = ECSTRING(common,ACETeam);
authors[] = {"commy2"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

Some files were not shown because too many files have changed in this diff Show More