ba3ecf2a0a
Merge pull request #2321 from acemod/HearingStuff
...
Hearing stuff
2015-08-31 13:24:29 -05:00
38122ffeaf
Merge pull request #2197 from acemod/mapOpenCloseEvents
...
Map open close events / MapTools Cleanup
2015-08-31 13:23:10 -05:00
f15805d1f3
setStructuralDamage function
2015-08-31 20:05:38 +02:00
e1d683d8dc
laserpointer with new command lineintersectssurface
2015-08-31 17:31:37 +02:00
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
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
5e57cad669
Merge pull request #2216 from acemod/isolateZeusMenuKeybind
...
Prevent CBA keybindings in zeus interface
2015-08-31 14:41:48 +01:00
04269831e8
Consider modifier keys for zeus interaction hack
...
The hacky keybind detection method should consider modifier keys also to prevent keybinds on the same key with different modifiers from firing
2015-08-31 14:40:31 +01:00
8c6f896164
fixed script error when canceling treatment actions
2015-08-31 13:00:17 +02:00
0e432a5eb3
Merge pull request #2271 from jonpas/toolsCBAupdate
...
Updated required CBA files
2015-08-30 21:38:13 -07:00
228eeab1a8
fix comments
2015-08-31 00:05:55 +02:00
4e6f289493
fix Function Names
...
fix Input
2015-08-30 23:40:53 +02:00
317706cf46
add Trace
2015-08-30 23:10:03 +02:00
bda274efff
fix wrong config access point
2015-08-30 22:59:27 +02:00
4be7411a05
Use "visibleMapChanged" event
2015-08-30 15:26:43 -05:00
7a4c37c085
disable all actions on ladders by default, close #2289
2015-08-30 22:03:45 +02:00
fae38a2232
tripod hmgs should have 100rnd mags instead of 500rnd mags, fix #1190
2015-08-30 20:20:00 +02:00
c18af0d34b
completely prevent ace_optics from interfering with any mission camera scripts
2015-08-30 19:30:44 +02:00
74dfd73167
fix issues with pip optics camera in virtual arsenal
2015-08-30 19:05:35 +02:00
8d589ea8f0
solution for custom cameras (for intros) being broken with ACE
2015-08-30 15:50:51 +02:00
fc6f97e09e
fix autoriflemen spawning with 0x frag grenade bug
2015-08-30 13:30:21 +02:00
610bb7a1df
better animation for spotting scope, fix #1638
2015-08-30 13:10:25 +02:00
58ec4a68cb
fix weapon select in ffv slots not working
2015-08-30 12:01:13 +02:00
4682235d8a
increase reach in 3rd person for opening doors, fix #2301
2015-08-30 11:13:26 +02:00
32300a0a80
objectParent command replacing fnc_getBackpackAssignedUnit
2015-08-30 10:45:14 +02:00
910bb151e2
#1988 - Boost explosive hearing damage
2015-08-30 01:47:40 -05:00
8307ccea96
firedNear - use new isKindOf
2015-08-30 01:37:14 -05:00
2f54cfadbc
Merge pull request #2146 from jokoho48/codeCleanupHearing
...
Code cleanup of Hearing module
2015-08-30 01:18:47 -05:00
05e07f37ac
Merge branch 'master' of https://github.com/acemod/ACE3 into BackBlastEnhanced
2015-08-30 07:49:55 +02:00
d97cb8e78f
add Missing Include
2015-08-30 07:49:12 +02:00
6d2e25d40b
change some DFUNC to FUNC
2015-08-30 07:38:17 +02:00
35b6e04345
rewrite Caching in overpressure
...
update code to params command
update Comments
2015-08-30 07:35:58 +02:00
5662e9eb62
proper name for stabilizer
2015-08-30 01:54:43 +02:00
9187b31b92
pitot tube
2015-08-30 01:47:20 +02:00
17f647f341
PL translation
2015-08-30 01:42:42 +02:00
6a17e3fa83
Merge remote-tracking branch 'origin/master'
2015-08-30 00:42:46 +02:00
5f63290508
Merge branch 'ptbr'
2015-08-30 00:42:31 +02:00
b968a32ea2
Merge pull request #2260 from acemod/updateMainConfig
...
Update Main Config File
2015-08-30 00:37:46 +02:00
a7f2a7fefc
Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3
2015-08-30 00:35:11 +02:00
4bde554854
Merge branch 'master' into medical-adjustments
...
Conflicts:
addons/medical/functions/fnc_actionCheckBloodPressure.sqf
addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf
addons/medical/functions/fnc_actionCheckPulse.sqf
addons/medical/functions/fnc_actionCheckPulseLocal.sqf
2015-08-29 23:49:58 +02:00
f67809b18c
Merge branch 'master' into mapOpenCloseEvents
2015-08-29 16:43:24 -05:00
22f8b2e8c2
Merge pull request #2305 from acemod/attachEventHandlers
...
Attach event handlers
2015-08-29 16:35:51 -05:00
2fd30ba20c
fixes #2274
2015-08-29 22:57:52 +02:00
602ef690fc
Allow diagnose on torso #1879
2015-08-29 22:54:51 +02:00
ce42f5864f
fix #2155
2015-08-29 22:53:08 +02:00
b291141d11
Should Be a better fix for #2298
2015-08-29 22:51:42 +02:00
183e872f1f
Possible fix for #2298
2015-08-29 22:44:52 +02:00
fa3a0213b7
Merge pull request #2249 from acemod/captiveFFV
...
Captive ffv animation fix + cleanup
2015-08-29 15:39:23 -05:00
657157d767
Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros
...
Conflicts:
addons/hearing/functions/fnc_moduleHearing.sqf
2015-08-29 22:38:26 +02:00
2b3957324c
Merge pull request #2262 from jonpas/readmeFix
...
Updated README.md files
2015-08-29 22:37:40 +02:00