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' of https://github.com/KoffeinFlummi/ACE3

Browse Source
This commit is contained in:
KoffeinFlummi 2015-01-12 11:24:50 +01:00
commit 53cb5d1028
6 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -1,2 +1,4 @@
*.pbo
texHeaders.bin
*.swp
*.swo

2
addons/ai/config.cpp
View File

@ -5,7 +5,7 @@ class CfgPatches {
units[] = {};
weapons[] = {};
requiredVersion = 0.60;
requiredAddons[] = {AGM_Core};
requiredAddons[] = {"ace_core"};
version = "0.95";
versionStr = "0.95";
versionAr[] = {0,95,0};

2
addons/attach/config.cpp
View File

@ -53,7 +53,7 @@ class CfgVehicles {
};
class GVAR(Detach) {
displayName = "$STR_AGM_Attach_Detach";
condition = QUOTE( [_player] call FUNC(canDetach );
condition = QUOTE( [_player] call FUNC(canDetach) );
statement = QUOTE( [_player] call FUNC(detach) );
exceptions[] = {"AGM_Drag_isNotDragging"};
showDisabled = 0;

4
addons/core/script_component.hpp
View File

@ -1,5 +1,5 @@
#define COMPONENT core
#include "script_mod.hpp"
#include "\z\ace\addons\main\script_mod.hpp"
// #define DEBUG_MODE_FULL
@ -11,4 +11,4 @@
#define DEBUG_SETTINGS DEBUG_SETTINGS_MAIN
#endif
#include "script_macros.hpp"
#include "\z\ace\addons\main\script_macros.hpp"

2
addons/main/script_macros.hpp
View File

@ -47,7 +47,7 @@
#define ACE_NOGRIP handAnim[] = {}
#define ACE_DISTANCE_DEFAULT distanceZoomMin = 300; distanceZoomMax = 300
#include "script_macros_optics.hpp"
// #include "script_macros_optics.hpp" //ToDo
#define ACE_NOZEROING discreteDistance[] = {}; \
discreteDistanceInitIndex = 0; \

2
addons/wep_dragon/CfgVehicles.hpp
View File

@ -17,7 +17,7 @@ class CfgVehicles {
class ViewOptics;
};
};
}
};
class ACE_M47_Static: ACE_M47_Static_Base {
scope = 1; // Hide it for now