mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
merge with master
This commit is contained in:
commit
db48e0c83d
@ -5,7 +5,7 @@ class CfgPatches {
|
|||||||
units[] = {};
|
units[] = {};
|
||||||
weapons[] = {};
|
weapons[] = {};
|
||||||
requiredVersion = 0.60;
|
requiredVersion = 0.60;
|
||||||
requiredAddons[] = {AGM_Core};
|
requiredAddons[] = {"ace_core"};
|
||||||
version = "0.95";
|
version = "0.95";
|
||||||
versionStr = "0.95";
|
versionStr = "0.95";
|
||||||
versionAr[] = {0,95,0};
|
versionAr[] = {0,95,0};
|
||||||
|
@ -53,7 +53,7 @@ class CfgVehicles {
|
|||||||
};
|
};
|
||||||
class GVAR(Detach) {
|
class GVAR(Detach) {
|
||||||
displayName = "$STR_AGM_Attach_Detach";
|
displayName = "$STR_AGM_Attach_Detach";
|
||||||
condition = QUOTE( [_player] call FUNC(canDetach );
|
condition = QUOTE( [_player] call FUNC(canDetach) );
|
||||||
statement = QUOTE( [_player] call FUNC(detach) );
|
statement = QUOTE( [_player] call FUNC(detach) );
|
||||||
exceptions[] = {"AGM_Drag_isNotDragging"};
|
exceptions[] = {"AGM_Drag_isNotDragging"};
|
||||||
showDisabled = 0;
|
showDisabled = 0;
|
||||||
|
@ -47,7 +47,7 @@
|
|||||||
#define ACE_NOGRIP handAnim[] = {}
|
#define ACE_NOGRIP handAnim[] = {}
|
||||||
#define ACE_DISTANCE_DEFAULT distanceZoomMin = 300; distanceZoomMax = 300
|
#define ACE_DISTANCE_DEFAULT distanceZoomMin = 300; distanceZoomMax = 300
|
||||||
|
|
||||||
// #include "script_macros_optics.hpp"
|
// #include "script_macros_optics.hpp" //ToDo
|
||||||
|
|
||||||
#define ACE_NOZEROING discreteDistance[] = {}; \
|
#define ACE_NOZEROING discreteDistance[] = {}; \
|
||||||
discreteDistanceInitIndex = 0; \
|
discreteDistanceInitIndex = 0; \
|
||||||
|
@ -17,7 +17,7 @@ class CfgVehicles {
|
|||||||
class ViewOptics;
|
class ViewOptics;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
};
|
||||||
|
|
||||||
class ACE_M47_Static: ACE_M47_Static_Base {
|
class ACE_M47_Static: ACE_M47_Static_Base {
|
||||||
scope = 1; // Hide it for now
|
scope = 1; // Hide it for now
|
||||||
|
Loading…
Reference in New Issue
Block a user