Commit Graph

54 Commits

Author SHA1 Message Date
Phyma
ffaa195fe5 Conform function headers to coding guidelines (#5255)
* Fixed headers to work with silentspike python script

* Fixed rest of the files

* Fixed ace-team
2017-06-08 15:31:51 +02:00
PabstMirror
6c592e5a10 Virtual units - skip goggles/hearing effects (#4988)
* Disable goggles and hearing fx for virtual units

* Cleanup some other CBA_fnc_addPlayerEventHandler
2017-04-11 10:06:29 -05:00
commy2
8a4514f8e7 use a function to do gestures 2016-07-12 16:16:01 +02:00
jonpas
55c7b9bfc4 Merge pull request #3997 from acemod/gogglesEffectsSetting
Add goggle setting for level of effects
2016-07-09 18:48:22 +02:00
PabstMirror
5108ffe20c Add goggles setting for level of effects
Can chose between none, tint/colorCC/ and full dust/dirt/rain/rotorwash
2016-06-25 19:16:26 -05:00
PabstMirror
5a92aaeb28 Make dirt/dust effects less bright at night
Fix #1447
2016-06-25 19:02:07 -05: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
SilentSpike
c4b75160a4 Run event renaming script 2016-05-24 14:13:11 +01: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
2869a53e6d Googles - Only play wipe anim for primary weapon
Close #3638
Animation only makes sense for primary weapon, so skip for others.
2016-04-12 00:19:24 -05:00
commy2
467075ad67 replace timePFH with CBA_missionTime 2016-03-02 11:01:39 +01:00
esteldunedain
0b9695ce70 Apply the ufeh to ACE_Grenades 2016-02-06 17:20:30 -03:00
esteldunedain
ac3f75c8b4 Apply the ufeh to ACE_Goggles 2016-02-06 17:16:10 -03:00
esteldunedain
c87f19c8da Fix #3258 2016-02-04 10:04:26 -03:00
PabstMirror
dc60860421 Fix Third Person Goggle Effect Not Displaying
#3074
2015-12-26 23:31:49 -06:00
PabstMirror
ebbf2b373a goggles - prevent CBA PFEH warning
fix "x\cba\addons\common\fnc_removePerFrameHandler.sqf:30","WARNING:
Invalid or not existing PFH ID."
2015-11-17 23:44:50 -06:00
commy2
a57d1bca75 replace local keyword with private 2015-11-17 17:43:07 +01:00
commy2
dc882a3c66 more goggles code cleanup 2015-09-30 01:26:08 +02:00
commy2
8d5ce1dbe2 more goggles code cleanup 2015-09-29 22:24:25 +02:00
commy2
62349f685c more goggles code cleanup 2015-09-29 22:01:40 +02:00
commy2
b7ce315240 more goggles code cleanup 2015-09-29 21:28:57 +02:00
commy2
d1aacf3fef more goggles code cleanup 2015-09-29 19:51:41 +02:00
commy2
53bfcdb61e more goggles code cleanup 2015-09-29 18:51:24 +02:00
commy2
d051d4c208 more goggles code cleanup 2015-09-29 17:57:09 +02:00
commy2
477e9f06b6 more goggles code cleanup 2015-09-29 17:09:23 +02:00
commy2
2731ac360a more goggles code cleanup 2015-09-29 16:56:10 +02:00
PabstMirror
9996aa22ab Replace googles - isTurnedOut 2015-09-21 15:03:34 -05:00
jokoho48
b7e02da1cc remove if (!hasInterface) from PFH
move ! in ()
2015-09-11 16:58:26 +02:00
jokoho48
defbdf1b1a fix that HC throw a issue if PPEffect was used/applyed 2015-09-09 17:05:48 +02:00
SilentSpike
397d77e5b5 Remove special goggles treatment of vehicle units
The condition to disable the overlay for gunners introduces more problems (and inconsistencies for that matter) than it was worth. Vehicle gunners using camera based weapons should probably consider not wearing a pair of glasses/goggles before doing so.
2015-08-31 15:25:40 +01:00
SilentSpike
543e829278 Fix goggles overlay for FFV seats
When aiming down sights, view is considered to be "gunner" and so the overlay would be disabled. Introduces addition canUseWeapon check if view is "gunner" to differentiate FFV seats from regular gunner seats
2015-08-31 14:56:51 +01:00
PabstMirror
b3741f4036 Capitalization for macro CBA_fnc_addPerFrameHandler 2015-08-04 02:34:38 -05:00
PabstMirror
236ae767b5 Goggles - Cache Surface Dust 2015-05-28 00:18:45 -05:00
jaynus
c924baefd7 All instances of time and diagTicktime changed to ACE_time / ACE_diagTime. 2015-05-21 09:42:44 -07:00
PabstMirror
caef5c105f More Privates 2015-04-17 22:40:37 -05:00
Tenga
c8cff6e91c - Added isFeatureCameraActive to ace_common
- ace_goggles_fnc_externalCamera now checks for cameras made by a BI feature
2015-04-10 21:48:24 +02:00
Tenga
eec5f458db Count the commander camera as a 3rd person camera 2015-04-10 20:05:33 +02:00
jaynus
1bb6be5654 Cleaning up of all tabs in source code files. 2015-04-06 09:22:43 -07:00
Nicolás Badano
18fa6f9850 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into aceSettings 2015-02-03 17:48:24 -03:00
Garth L-H de Wet
7acd7854b7 Updated headers of the goggles to be as required. 2015-02-02 11:04:53 +02:00
Nicolás Badano
96b7c0d30c ACE_Settings: replace all ACE_Options 2015-01-30 19:19:45 -03:00
PabstMirror
c07120c439 Fix Googles Macros 2015-01-25 00:55:35 -06:00
PabstMirror
8a27a49d31 #84 - goggles option error 2015-01-22 16:58:11 -06:00
PabstMirror
cb561a2d93 Convert Old Ace_Options 2015-01-21 18:19:10 -06:00
Garth L-H de Wet
2fe155f990 Converted a couple PFHs to use the waitAndExecute function as that is what they were doing.
Fixed a couple bugs.
2015-01-19 10:34:49 +02:00
Garth L-H de Wet
ef19ffad0c Glasses conditions are local to each unit. No longer global scope on each client. 2015-01-19 01:38:54 +02:00
Garth L-H de Wet
b499cc9a1d Rain effect is working as expected. 2015-01-19 01:12:45 +02:00