Merge pull request #1 from acemod/master

Update
acemod · Feb 3, 2016 · 714a885 · 714a885
2 parents 78729e9 + 4612652
commit 714a885
Show file tree

Hide file tree

Showing 111 changed files with 470 additions and 27 deletions.
diff --git a/AUTHORS.txt b/AUTHORS.txt
@@ -63,6 +63,7 @@ Falke75
 Ferenczi
 Ferenzi
 Filip Basara <[email protected]>
+fr89k <[email protected]>
 FreeZbe <[email protected]>
 geraldbolso1899
 Ghost

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 <p align="center">
-    <img src="https://github.com/acemod/ACE3/blob/master/extras/assets/logo/black/ACE3-Logo.jpg" width="480">
+    <img src="https://github.com/acemod/ACE3/raw/master/extras/assets/logo/black/ACE3-Logo.jpg" width="480">
 </p>
 
 <p align="center">

diff --git a/addons/advanced_ballistics/script_component.hpp b/addons/advanced_ballistics/script_component.hpp
@@ -1,6 +1,11 @@
 #define COMPONENT advanced_ballistics
 #include "\z\ace\addons\main\script_mod.hpp"
 
+// #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define CBA_DEBUG_SYNCHRONOUS
+// #define ENABLE_PERFORMANCE_COUNTERS
+
 #ifdef DEBUG_ENABLED_ADVANCEDBALLISTICS
     #define DEBUG_MODE_FULL
 #endif

diff --git a/addons/ai/script_component.hpp b/addons/ai/script_component.hpp
@@ -1,6 +1,11 @@
 #define COMPONENT ai
 #include "\z\ace\addons\main\script_mod.hpp"
 
+// #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define CBA_DEBUG_SYNCHRONOUS
+// #define ENABLE_PERFORMANCE_COUNTERS
+
 #ifdef DEBUG_ENABLED_AI
     #define DEBUG_MODE_FULL
 #endif

diff --git a/addons/aircraft/script_component.hpp b/addons/aircraft/script_component.hpp
@@ -1,6 +1,11 @@
 #define COMPONENT aircraft
 #include "\z\ace\addons\main\script_mod.hpp"
 
+// #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define CBA_DEBUG_SYNCHRONOUS
+// #define ENABLE_PERFORMANCE_COUNTERS
+
 #ifdef DEBUG_ENABLED_AIRCRAFT
     #define DEBUG_MODE_FULL
 #endif

diff --git a/addons/apl/script_component.hpp b/addons/apl/script_component.hpp
@@ -1,6 +1,11 @@
 #define COMPONENT APL
 #include "\z\ace\addons\main\script_mod.hpp"
 
+// #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define CBA_DEBUG_SYNCHRONOUS
+// #define ENABLE_PERFORMANCE_COUNTERS
+
 #ifdef DEBUG_ENABLED_APL
     #define DEBUG_MODE_FULL
 #endif

diff --git a/addons/atragmx/script_component.hpp b/addons/atragmx/script_component.hpp
@@ -1,6 +1,11 @@
 #define COMPONENT atragmx
 #include "\z\ace\addons\main\script_mod.hpp"
 
+// #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define CBA_DEBUG_SYNCHRONOUS
+// #define ENABLE_PERFORMANCE_COUNTERS
+
 #ifdef DEBUG_ENABLED_ATRAGMX
     #define DEBUG_MODE_FULL
 #endif

diff --git a/addons/attach/script_component.hpp b/addons/attach/script_component.hpp
@@ -1,6 +1,11 @@
 #define COMPONENT attach
 #include "\z\ace\addons\main\script_mod.hpp"
 
+// #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define CBA_DEBUG_SYNCHRONOUS
+// #define ENABLE_PERFORMANCE_COUNTERS
+
 #ifdef DEBUG_ENABLED_ATTACH
     #define DEBUG_MODE_FULL
 #endif

diff --git a/addons/backpacks/script_component.hpp b/addons/backpacks/script_component.hpp
@@ -1,6 +1,11 @@
 #define COMPONENT backpacks
 #include "\z\ace\addons\main\script_mod.hpp"
 
+// #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define CBA_DEBUG_SYNCHRONOUS
+// #define ENABLE_PERFORMANCE_COUNTERS
+
 #ifdef DEBUG_ENABLED_BACKPACKS
     #define DEBUG_MODE_FULL
 #endif

diff --git a/addons/ballistics/script_component.hpp b/addons/ballistics/script_component.hpp
@@ -1,6 +1,11 @@
 #define COMPONENT ballistics
 #include "\z\ace\addons\main\script_mod.hpp"
 
+// #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define CBA_DEBUG_SYNCHRONOUS
+// #define ENABLE_PERFORMANCE_COUNTERS
+
 #ifdef DEBUG_ENABLED_BALLISTICS
     #define DEBUG_MODE_FULL
 #endif

diff --git a/addons/captives/script_component.hpp b/addons/captives/script_component.hpp
@@ -2,6 +2,9 @@
 #include "\z\ace\addons\main\script_mod.hpp"
 
 // #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define CBA_DEBUG_SYNCHRONOUS
+// #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_CAPTIVES
     #define DEBUG_MODE_FULL

diff --git a/addons/cargo/script_component.hpp b/addons/cargo/script_component.hpp
@@ -2,6 +2,9 @@
 #include "\z\ace\addons\main\script_mod.hpp"
 
 // #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define CBA_DEBUG_SYNCHRONOUS
+// #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_CARGO
     #define DEBUG_MODE_FULL

diff --git a/addons/common/functions/fnc__handleSyncedEvent.sqf b/addons/common/functions/fnc__handleSyncedEvent.sqf
@@ -5,7 +5,7 @@
  * Arguments [Client] :
  * 0: eventName <STRING>
  * 1: arguments <ARRAY>
- * 2: ttl <SCALAR>
+ * 2: ttl <NUMBER>
  *
  * Return Value:
  * Boolean of success <BOOL>

diff --git a/addons/common/script_component.hpp b/addons/common/script_component.hpp
@@ -2,7 +2,9 @@
 #include "\z\ace\addons\main\script_mod.hpp"
 
 // #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
 // #define CBA_DEBUG_SYNCHRONOUS
+// #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_COMMON
     #define DEBUG_MODE_FULL

diff --git a/addons/concertina_wire/script_component.hpp b/addons/concertina_wire/script_component.hpp
@@ -2,6 +2,9 @@
 #include "\z\ace\addons\main\script_mod.hpp"
 
 // #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define CBA_DEBUG_SYNCHRONOUS
+// #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_CONCERTINA_WIRE
     #define DEBUG_MODE_FULL

diff --git a/addons/dagr/script_component.hpp b/addons/dagr/script_component.hpp
@@ -1,6 +1,11 @@
 #define COMPONENT dagr
 #include "\z\ace\addons\main\script_mod.hpp"
 
+// #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define CBA_DEBUG_SYNCHRONOUS
+// #define ENABLE_PERFORMANCE_COUNTERS
+
 #ifdef DEBUG_ENABLED_DAGR
     #define DEBUG_MODE_FULL
 #endif

diff --git a/addons/difficulties/script_component.hpp b/addons/difficulties/script_component.hpp
@@ -1,6 +1,11 @@
 #define COMPONENT difficulties
 #include "\z\ace\addons\main\script_mod.hpp"
 
+// #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define CBA_DEBUG_SYNCHRONOUS
+// #define ENABLE_PERFORMANCE_COUNTERS
+
 #ifdef DEBUG_ENABLED_DIFFICULTIES
     #define DEBUG_MODE_FULL
 #endif

diff --git a/addons/disarming/script_component.hpp b/addons/disarming/script_component.hpp
@@ -1,6 +1,11 @@
 #define COMPONENT disarming
 #include "\z\ace\addons\main\script_mod.hpp"
 
+// #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define CBA_DEBUG_SYNCHRONOUS
+// #define ENABLE_PERFORMANCE_COUNTERS
+
 #ifdef DEBUG_ENABLED_DISARMING
     #define DEBUG_MODE_FULL
 #endif

diff --git a/addons/disposable/script_component.hpp b/addons/disposable/script_component.hpp
@@ -2,6 +2,9 @@
 #include "\z\ace\addons\main\script_mod.hpp"
 
 // #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define CBA_DEBUG_SYNCHRONOUS
+// #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_ATTACH
     #define DEBUG_MODE_FULL

diff --git a/addons/dragging/script_component.hpp b/addons/dragging/script_component.hpp
@@ -2,6 +2,10 @@
 #include "\z\ace\addons\main\script_mod.hpp"
 
 //#define DEBUG_ENABLED_DRAGGING
+// #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define CBA_DEBUG_SYNCHRONOUS
+// #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_DRAGGING
     #define DEBUG_MODE_FULL

diff --git a/addons/explosives/script_component.hpp b/addons/explosives/script_component.hpp
@@ -2,6 +2,9 @@
 #include "\z\ace\addons\main\script_mod.hpp"
 
 // #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define CBA_DEBUG_SYNCHRONOUS
+// #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_EXPLOSIVES
     #define DEBUG_MODE_FULL

diff --git a/addons/fcs/script_component.hpp b/addons/fcs/script_component.hpp
@@ -1,6 +1,11 @@
 #define COMPONENT fcs
 #include "\z\ace\addons\main\script_mod.hpp"
 
+// #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define CBA_DEBUG_SYNCHRONOUS
+// #define ENABLE_PERFORMANCE_COUNTERS
+
 #ifdef DEBUG_ENABLED_FCS
     #define DEBUG_MODE_FULL
 #endif

diff --git a/addons/finger/script_component.hpp b/addons/finger/script_component.hpp
@@ -1,6 +1,11 @@
 #define COMPONENT finger
 #include "\z\ace\addons\main\script_mod.hpp"
 
+// #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define CBA_DEBUG_SYNCHRONOUS
+// #define ENABLE_PERFORMANCE_COUNTERS
+
 #ifdef DEBUG_ENABLED_FINGER
     #define DEBUG_MODE_FULL
 #endif

diff --git a/addons/flashlights/script_component.hpp b/addons/flashlights/script_component.hpp
@@ -1,6 +1,11 @@
 #define COMPONENT flashlights
 #include "\z\ace\addons\main\script_mod.hpp"
 
+// #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define CBA_DEBUG_SYNCHRONOUS
+// #define ENABLE_PERFORMANCE_COUNTERS
+
 #ifdef DEBUG_ENABLED_FLASHLIGHTS
     #define DEBUG_MODE_FULL
 #endif

diff --git a/addons/flashsuppressors/script_component.hpp b/addons/flashsuppressors/script_component.hpp
@@ -1,6 +1,11 @@
 #define COMPONENT flashsuppressors
 #include "\z\ace\addons\main\script_mod.hpp"
 
+// #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define CBA_DEBUG_SYNCHRONOUS
+// #define ENABLE_PERFORMANCE_COUNTERS
+
 #ifdef DEBUG_ENABLED_FLASHSUPPRESSORS
     #define DEBUG_MODE_FULL
 #endif

diff --git a/addons/fonts/script_component.hpp b/addons/fonts/script_component.hpp
@@ -1,6 +1,11 @@
 #define COMPONENT fonts
 #include "\z\ace\addons\main\script_mod.hpp"
 
+// #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define CBA_DEBUG_SYNCHRONOUS
+// #define ENABLE_PERFORMANCE_COUNTERS
+
 #ifdef DEBUG_ENABLED_FONTS
     #define DEBUG_MODE_FULL
 #endif

diff --git a/addons/frag/script_component.hpp b/addons/frag/script_component.hpp
@@ -2,6 +2,10 @@
 #include "\z\ace\addons\main\script_mod.hpp"
 
 //#define DEBUG_ENABLED_FRAG
+// #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define CBA_DEBUG_SYNCHRONOUS
+// #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_FRAG
     #define DEBUG_MODE_FULL

diff --git a/addons/gestures/script_component.hpp b/addons/gestures/script_component.hpp
@@ -1,6 +1,11 @@
 #define COMPONENT Gestures
 #include "\z\ace\addons\main\script_mod.hpp"
 
+// #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define CBA_DEBUG_SYNCHRONOUS
+// #define ENABLE_PERFORMANCE_COUNTERS
+
 #ifdef DEBUG_ENABLED_GESTURES
     #define DEBUG_MODE_FULL
 #endif

diff --git a/addons/gforces/script_component.hpp b/addons/gforces/script_component.hpp
@@ -1,6 +1,11 @@
 #define COMPONENT gforces
 #include "\z\ace\addons\main\script_mod.hpp"
 
+// #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define CBA_DEBUG_SYNCHRONOUS
+// #define ENABLE_PERFORMANCE_COUNTERS
+
 #ifdef DEBUG_ENABLED_GFORCES
     #define DEBUG_MODE_FULL
 #endif

diff --git a/addons/goggles/script_component.hpp b/addons/goggles/script_component.hpp
@@ -1,6 +1,11 @@
 #define COMPONENT goggles
 #include "\z\ace\addons\main\script_mod.hpp"
 
+// #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define CBA_DEBUG_SYNCHRONOUS
+// #define ENABLE_PERFORMANCE_COUNTERS
+
 #ifdef DEBUG_ENABLED_GOGGLES
   #define DEBUG_MODE_FULL
 #endif

diff --git a/addons/grenades/script_component.hpp b/addons/grenades/script_component.hpp
@@ -2,6 +2,9 @@
 #include "\z\ace\addons\main\script_mod.hpp"
 
 // #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define CBA_DEBUG_SYNCHRONOUS
+// #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_GRENADES
     #define DEBUG_MODE_FULL

diff --git a/addons/hearing/script_component.hpp b/addons/hearing/script_component.hpp
@@ -2,6 +2,9 @@
 #include "\z\ace\addons\main\script_mod.hpp"
 
 // #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define CBA_DEBUG_SYNCHRONOUS
+// #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_HEARING
     #define DEBUG_MODE_FULL

diff --git a/addons/hitreactions/script_component.hpp b/addons/hitreactions/script_component.hpp
@@ -1,6 +1,11 @@
 #define COMPONENT hitreactions
 #include "\z\ace\addons\main\script_mod.hpp"
 
+// #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define CBA_DEBUG_SYNCHRONOUS
+// #define ENABLE_PERFORMANCE_COUNTERS
+
 #ifdef DEBUG_ENABLED_HITREACTIONS
     #define DEBUG_MODE_FULL
 #endif

diff --git a/addons/huntir/script_component.hpp b/addons/huntir/script_component.hpp
@@ -2,6 +2,9 @@
 #include "\z\ace\addons\main\script_mod.hpp"
 
 // #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define CBA_DEBUG_SYNCHRONOUS
+// #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_HUNTIR
     #define DEBUG_MODE_FULL

diff --git a/addons/interact_menu/script_component.hpp b/addons/interact_menu/script_component.hpp
@@ -2,6 +2,9 @@
 #include "\z\ace\addons\main\script_mod.hpp"
 
 // #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define CBA_DEBUG_SYNCHRONOUS
+// #define ENABLE_PERFORMANCE_COUNTERS
 
 #ifdef DEBUG_ENABLED_INTERACT_MENU
     #define DEBUG_MODE_FULL

diff --git a/addons/interaction/script_component.hpp b/addons/interaction/script_component.hpp
@@ -1,6 +1,11 @@
 #define COMPONENT interaction
 #include "\z\ace\addons\main\script_mod.hpp"
 
+// #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define CBA_DEBUG_SYNCHRONOUS
+// #define ENABLE_PERFORMANCE_COUNTERS
+
 #ifdef DEBUG_ENABLED_INTERACTION
     #define DEBUG_MODE_FULL
 #endif