jonpas
bd5f6107a0
Merge branch 'master' into eol-lf
2016-06-09 14:24:45 +02:00
jonpas
b0352fdeb9
Merge branch 'master' into eol-lf
2016-06-02 17:02:09 +02:00
jonpas
26fbc36cab
Merge branch 'master' into cbaEventSystem
2016-05-31 22:36:08 +02:00
commy2
7512c4e52e
manual merge
2016-05-30 21:14:34 +02:00
commy2
e7fa02d0d9
Merge pull request #3812 from acemod/cbaDelayedExecFnc
...
Use new CBA delayed execution functions and deprecate ACE functions
2016-05-30 21:02:29 +02:00
commy2
272775445f
Merge pull request #3670 from acemod/useQuotedFuncMacros
...
Use new quoted function macros
2016-05-30 21:00:23 +02:00
jonpas
816da2aef1
Normalize to LF line endings
2016-05-30 18:37:03 +02:00
SilentSpike
108ff4f644
Replace ACE event system calls with CBA counterparts
...
Regex used:
\[(.+?),(.+?),(.+?)\]\s+call\s+E?FUNC\((common,)?(target|object)Event\)
[$1,$3,$2] call CBA_fnc_targetEvent
E?FUNC\((common,)?(server|global|local)Event\)
CBA_fnc_$2Event
E?FUNC\((common,)?(add|remove)EventHandler\)
CBA_fnc_$2EventHandler
2016-05-22 16:47:39 +01:00
jonpas
e7dbcd7b58
Replace delayed execution functions with new CBA counterparts
2016-05-22 15:29:01 +02:00
commy2
da70854568
manual merge
2016-05-18 11:48:27 +02:00
PabstMirror
9f6661f4db
Make 40mm Grenades Frag ( #3679 )
...
* Make 40mm Grenades Frag
* Just use existing force cfg instead of adding new
Add RHS compat entries
2016-05-07 15:35:39 -05:00
BaerMitUmlaut
7fcbe93b71
Cleaned up excessive whitespace
2016-05-03 02:32:44 +02:00
jonpas
ccaec31a90
Use new QFUNC and QEFUNC macros
2016-04-08 20:43:26 +02:00
commy2
467075ad67
replace timePFH with CBA_missionTime
2016-03-02 11:01:39 +01:00
jonpas
7f022eda00
Replace Purista with Roboto - everywhere, close #3401
2016-02-24 15:06:27 +01:00
esteldunedain
a8131f597a
Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into reflectionsDefaultOff
2016-02-18 12:18:51 -03:00
esteldunedain
2b1c312d13
Make explosion reflections optional, default off
2016-02-06 23:46:40 -03:00
esteldunedain
b70ae9207c
Apply the ufeh to ACE_Frag
2016-02-06 17:12:28 -03:00
PabstMirror
76c9e1560d
Frag - only run addPfhRound on ammo that will frag
...
If spall is not enabled (default) then calculate which ammo types will
actually cause a frag event, cache and then only track those.
2016-01-01 02:33:08 -06:00
commy2
ca9b909e75
fix CBA_fnc capitalization
2015-11-30 16:45:20 +01:00
Michael Braun
5047d4de1c
Switched to ACE_LOG<LEVEL>_# variation
2015-08-26 17:39:44 +02:00
Michael Braun
097506076f
Fixed format usage in macros requiring ARR_# for it to work
2015-08-26 16:48:55 +02:00
Michael Braun
9e10aa86d7
Standardize logging format through ACE_LOG macros
2015-08-26 15:32:54 +02:00
PabstMirror
b3741f4036
Capitalization for macro CBA_fnc_addPerFrameHandler
2015-08-04 02:34:38 -05:00
PabstMirror
bca5fa1f4a
Spall - execNextFrame instead of addPerFrameHandler
2015-07-25 03:20:03 -05:00
PabstMirror
6c7ba7b5ae
Zeus module on dedicated server
2015-06-18 22:43:49 -05:00
PabstMirror
375c81d9b0
Connect Zeus module to Frag
2015-06-18 22:13:06 -05:00
PabstMirror
9c0478ddfd
Cleanup
2015-06-18 22:04:48 -05:00
PabstMirror
e235ebcc15
Fix frag always killing thrower
2015-06-18 21:48:23 -05:00
PabstMirror
ccb30e0a47
use master pfh for frag
2015-06-16 22:39:37 -05:00
jaynus
582ea318d4
Merge remote-tracking branch 'origin/superTime'
...
Conflicts:
addons/frag/functions/fnc_fired.sqf
addons/frag/functions/fnc_trackFragRound.sqf
2015-05-22 07:24:55 -07:00
jaynus
c297257421
Disable frag by default. Add @pabstmirror fix closes #1339 closes #820
2015-05-21 15:06:55 -07:00
jaynus
c924baefd7
All instances of time and diagTicktime changed to ACE_time / ACE_diagTime.
2015-05-21 09:42:44 -07:00
jaynus
58a55313cd
Changed: Entire frag system re-optimized to a single tracking/GC index-based PFH.
...
Changed: Spalling calculations now throttled across frames and limited; accurate but performant
Changed: All lookups are now index-based on a global projectiles array. This reduced runtime dramatically for all fragmentation.
2015-05-13 17:06:10 -07:00
jaynus
aef896cc21
Merge remote-tracking branch 'origin/explosive_reflection' into fragSpallOptimization
...
Conflicts:
addons/frag/XEH_preInit.sqf
2015-05-13 15:52:18 -07:00
jaynus
553942bbc7
Initial commit of frag/spalling optimization rewrite. Now tracks in single PFH, with index-based referencing instead of searches. TODO: Break spall calculation up to multiple frames. Needs testing.
2015-05-13 14:33:14 -07:00
PabstMirror
4185874a9a
Frag Privates
2015-05-12 23:19:31 -05:00
jaynus
b7b6cb6086
Fixed: Adds an enabler config to ace_frag, disabling the PFH for any round not enabled.
2015-05-08 11:27:17 -07:00
ulteq
50a8a89b28
Added missing privates
2015-04-30 10:50:49 +02:00
ulteq
416a914253
More vector math replacements
2015-04-27 22:14:08 +02:00
ulteq
0d6d96e76c
Cleanup++:
...
* Added missing privates
* Removed unused privates
* Replaced some old vector calculations with new vector commands
2015-04-27 22:04:35 +02:00
ulteq
3c92cab7af
Reverted the addBlackList function
2015-04-27 14:02:59 +02:00
ulteq
1fc044dfa9
Cleanup++:
...
*Moved GVAR(enabled) into ACE_Settings.hpp
*Replaced BIS_fnc_magnitude with vectorMagnitude
*Renamed Nou_GBU12
*Added G_40mm_HE config data
2015-04-26 23:14:54 +02:00
ulteq
6170ef0d50
Code cleanup
2015-04-26 23:05:58 +02:00
KoffeinFlummi
59bdc23a95
Merge branch 'master' into curatorFragmentation
2015-04-25 23:55:29 +02:00
KoffeinFlummi
24efbf731d
Convert frag config entry names to lowercase
2015-04-23 15:46:50 +02:00
Glowbal
fb93e9e9bc
wrapped track in debug define
2015-04-20 23:38:50 +02:00
Glowbal
24c32d8e3f
added configuration
2015-04-20 23:18:53 +02:00
Glowbal
7b790ffb1a
staged work
2015-04-20 22:48:11 +02:00
Nou
15ac5ec7b8
Two explosions processed per-frame.
2015-04-14 16:33:47 -07:00
