Commit Graph

82 Commits

Author SHA1 Message Date
Brett
3c1c081239
Grenades - Flashbang reaction fixes (#8485)
* flashbang reaction debounce

* fix skill reduction

* store flash strength

* Update addons/grenades/functions/fnc_flashbangExplosionEH.sqf

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>

* Update addons/grenades/functions/fnc_flashbangExplosionEH.sqf

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>

* Update addons/grenades/functions/fnc_flashbangExplosionEH.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-11-05 13:01:01 -05:00
jonpas
9f4dd776b8
ACEX Merge - Make ACEX-prefixed functions proxies (#8555)
* ACEX Merge - Make ACEX-prefixed functions proxies

* No call
2021-10-18 11:56:08 -05:00
Drofseh
3daa510868
Main - Add external macros for ACEX (#8540) 2021-10-17 22:14:40 +02:00
jonpas
6ca9d59443
Merge ACEX (#8415)
* Merge ACEX - first attempt
Backwards compatibility with XGVAR set of macros used on all settings and config entries
Public API functions not taken into account yet, many other things probably still missed

* Resolve issues

* Switch to addSetting, backward compatible CfgPatches, missed XGVAR.

* Remove unnecessary backwards compat

* Convert ACEX Categorised settings to initSettings / Fix Intel items magazine

* Apply suggestions from code review

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* Remove maintainers from merged ACEX components

* Cleanup unused module and faction classes

* Sitting - Add more object configs by @Dystopian
https://github.com/acemod/ACEX/pull/255

* Translations - Add Japanese by @classicarma
https://github.com/acemod/ACEX/pull/259

* Kill Tracker - Add killtracker.inc public include file by @Freddo3000"
https://github.com/acemod/ACEX/pull/251

* Add ACEX authors and sort authors file

* acex - final tweaks (#8513)

* acex - handle old funcs

* replace thirst/hunger setvars to acex naming

fix macro

Revert "fix macro"

This reverts commit d807e5e804c43916eaa42d34a89af94c6d9a48ad.

Revert "replace thirst/hunger setvars to acex naming"

This reverts commit bafc607884932d6e339daedc7c22e25dddbdd868.

x

Co-authored-by: TyroneMF <TyroneMF@hotmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-14 10:46:43 -05:00
Neviothr
5326d0acf5
ACE Arsenal - fix #6591, PCML has no ammo (#7850)
As per @Superxpdude comment - https://github.com/acemod/ACE3/issues/6591#issuecomment-667706600
2020-08-18 12:49:53 -05:00
PabstMirror
7311e644a2
FCS - Fix not working in MP (#7675)
also fix TRACE_10 macro
2020-05-07 11:28:32 -05:00
Dystopian
40f371c063 Interaction - Add condition to zeus actions (#6665)
* Add conditions to zeus actions

* Add condition caching
2018-11-11 11:26:36 -06:00
Dystopian
0e980907fe Fix some item type magic numbers (#6487)
* Fix item type magic numbers

* Add weapon and magazine macros
2018-09-12 22:29:56 -05:00
Dystopian
03ade05611 Add parentheses to GETVAR macros 2017-12-30 16:38:45 +03:00
ulteq
9b6f1879f6 Weather - More natural temperature and humidity randomization (#5754) 2017-11-14 14:43:29 +01:00
ulteq
fb0a60b018 Gravity correction
* ArmA is using 9.8066
2017-11-08 15:26:39 +01:00
ulteq
e1213483e6 Remove duplicate macro definitions 2017-11-06 18:33:08 +01:00
commy2
05d30c5573 convert log macros to cba versions (#4282)
* convert log macros to cba versions

* Add changes to AB

* remove obsolete macro
2016-10-02 12:55:31 +02:00
PabstMirror
7f9a697dca Update CBA_DEBUG_SYNCHRONOUS macro for new CBA (#4271) 2016-08-19 16:33:27 -05:00
commy2
c9a8e0a892 deprecate ACE hash functions in favor of CBA versions 2016-07-30 10:54:01 +02:00
commy2
0c073448dc log file and line numbers for warnings/errors/debug msgs 2016-07-25 20:39:30 +02:00
PabstMirror
e40415b628 Add #undef for PREP w/ DISABLE_COMPILE_CACHE 2016-07-04 01:17:30 -05:00
Glowbal
4c2c647842 Fix change in behaviour of QFUNC
When using QFUNC, the intend most often is to have the name of the variable referencing the function as a string. This behaviour works when compiling without debug enabled. However if debug is enabled, QFUNC compiles in with the debug wrapper, becoming a code string instead of a string representation of a variable reference.

A good example where this change of behaviour can be a problem is config attributes that refer to a call back (used a lot within ACE). In normal build, you will use a getvar to get the relevant code, as it is expected to point to the function. When using debug, you will need to do a compile instead, as it's a string representing a code block.
2016-06-17 21:44:04 +02:00
ViperMaul
99d08d988a Merge branch 'master' of https://github.com/acemod/ACE3 into use-proper-undefs 2016-06-14 08:27:47 -07:00
ViperMaul
d5750a6c40 Remove Tab 2016-06-14 08:12:29 -07:00
ViperMaul
b79a00d8d1 These 2 can be removed, since they are in CBA since 2.4.0 as Note from jonpas 2016-06-14 08:11:28 -07:00
ViperMaul
2242f7c622 Fix for MikeRo Tools strict requirement for #undef usage 2016-06-13 09:20:09 -07:00
jonpas
b0352fdeb9 Merge branch 'master' into eol-lf 2016-06-02 17:02:09 +02:00
commy2
fd26e2e44e Merge pull request #3516 from acemod/cbamissiontime
replace timePFH with CBA_missionTime
2016-05-30 21:23:57 +02:00
commy2
7512c4e52e manual merge 2016-05-30 21:14:34 +02:00
jonpas
816da2aef1 Normalize to LF line endings 2016-05-30 18:37:03 +02:00
jonpas
014421e8ed Remove redundant quoted function macro defines 2016-04-08 20:41:54 +02:00
jonpas
0c124a2af0 Remove redundant macro define 2016-04-08 20:35:50 +02:00
jonpas
85b4366368 Use new QPATHTOF and QPATHTOEF macros 2016-04-08 20:34:50 +02:00
commy2
467075ad67 replace timePFH with CBA_missionTime 2016-03-02 11:01:39 +01:00
PabstMirror
a4391a713d Cleanup old cba SLX_XEH_COMPILE_NEW code 2016-02-22 15:30:16 -06:00
esteldunedain
a51372a6b3 Add the TRACE_10 macro 2016-02-06 20:28:16 -03:00
PabstMirror
63a79b9920 Use Function Caching in CBA 2016-01-09 01:36:19 -06:00
commy2
74f78c2dd1 Merge pull request #3010 from acemod/cargoboxfilters
Add more filters to ammo boxes
2016-01-05 21:55:24 +01:00
commy2
bd3c79f739 add function to retrieve the control of the stamina bar 2015-12-12 20:25:42 +01:00
commy2
2b63b2efa8 add more filters to ammo boxes 2015-12-11 13:14:58 +01:00
jonpas
998f3e996c Cleanup macro definitions 2015-10-30 21:59:46 +01:00
PabstMirror
8bb5f71ba1 Macro for non spawned CBA Debug Logging 2015-09-25 22:30:57 -05:00
commy2
f1abd4698f remove superfluous ; 2015-09-21 22:12:17 +02:00
commy2
f134a77e98 add and use deprecated macro 2015-09-21 22:09:54 +02:00
commy2
020915a52a Revert "fix broken log warning macro"
This reverts commit b1f79f0383.
2015-09-21 21:51:05 +02:00
commy2
b1f79f0383 fix broken log warning macro 2015-09-21 21:39:45 +02:00
commy2
8503d15c9b more common code cleanup 2015-09-21 18:37:19 +02:00
Michael Braun
93106697ab Added debug log macros 2015-08-27 06:21:02 +02:00
Michael Braun
9ca19def70 Added autoformatting variations for log macros 2015-08-26 17:09:31 +02:00
Michael Braun
fd204d972d Fixed issue with ERROR conflicting with log level input 2015-08-26 16:45:28 +02:00
Michael Braun
5f6584ba3f Added Log format macros for use with not printing it to the log. 2015-08-26 15:53:03 +02:00
Michael Braun
a17d94c213 Removed semicolon of log macro 2015-08-26 14:12:17 +02:00
Michael Braun
5a0e95dcf0 Simplified log macros 2015-08-26 14:04:17 +02:00
Michael Braun
da97472600 Added ace specific logging methods 2015-08-07 12:56:10 +02:00