Commit Graph

60 Commits

Author SHA1 Message Date
PabstMirror
05d98370e4 Handle enableCombatDeafness and/or ringing enabled 2015-07-11 21:00:40 -05:00
PabstMirror
040f4a92a0 #1696 - Flashbangs make big boom 2015-07-10 21:39:35 -05:00
PabstMirror
c27afca485 DisableEarRinging / Cleanup 2015-07-10 21:30:47 -05:00
PabstMirror
d11fa939e1 Hearing - Merge PFEH (ringing/volume) 2015-07-10 21:01:32 -05:00
jonpas
4826fd5c1c Exit Ear Rining PFH when disabled during ringing 2015-07-10 22:52:04 +02:00
SzwedzikPL
6b4eeedbad headgear influence on hearing 2015-07-01 21:21:09 +02:00
jonpas
8f0101a1d9 Merge branch 'master' into addEarplugsEnhancement
Conflicts:
	addons/hearing/functions/fnc_addEarPlugs.sqf
2015-07-01 17:45:00 +02:00
naizarak
75e322e6ae Update fnc_addEarPlugs.sqf
Do not automatically add earplugs to units if combat deafness is disabled.
2015-06-29 12:23:32 -07:00
jonpas
475e4673eb Fixed typo 2015-06-28 22:28:26 +02:00
jonpas
9e6ce52fb6 Added check to addEarplugs if earplugs are used 2015-06-28 21:25:01 +02:00
ulteq
5d2905ca42 Improved config caching 2015-06-18 11:56:58 +02:00
ulteq
022f9286e2 Fixed a bug in the caching routine 2015-06-13 19:12:24 +02:00
ulteq
3427f655b9 Removed debug output 2015-06-13 19:01:40 +02:00
ulteq
6d4f58c18e weapon magazines caching 2015-06-13 18:57:02 +02:00
ulteq
d9722db15e Abort if distance > 50m 2015-06-13 18:42:09 +02:00
ulteq
2509f1d840 Missing privates 2015-06-13 18:34:30 +02:00
ulteq
b6a710d282 Implemented a proper magazine lookup routine 2015-06-13 18:32:48 +02:00
ulteq
38dca2bb9e New loudness calculation for different ammo types 2015-06-13 18:19:35 +02:00
ulteq
db68b6c155 Increased loudness of missles and rockets. 2015-06-13 17:43:27 +02:00
ulteq
feec8a14b7 Removed debug output 2015-06-13 17:23:45 +02:00
ulteq
eacd8e5a49 Removed debug output 2015-06-13 17:22:45 +02:00
ulteq
833634f010 Ported the ACE2 ear ringing logic 2015-06-13 17:16:18 +02:00
jonpas
9fbf256acd Merge branch 'master' into macroSTR
Conflicts:
	addons/hearing/functions/fnc_putInEarplugs.sqf
	addons/interact_menu/ACE_Settings.hpp
2015-06-04 17:13:09 +02:00
bux578
9096f38777 Ear Plugs -> Earplugs
http://en.wikipedia.org/wiki/Earplug
2015-06-03 15:29:38 +02:00
jonpas
763cb07629 Macro STRING to LSTRING 2015-05-28 21:59:04 +02:00
jonpas
6072e14077 Changed all strings to macros (except external) 2015-05-27 19:04:25 +02:00
jaynus
c924baefd7 All instances of time and diagTicktime changed to ACE_time / ACE_diagTime. 2015-05-21 09:42:44 -07:00
ulteq
50a8a89b28 Added missing privates 2015-04-30 10:50:49 +02:00
PabstMirror
822bd22c97 gj git 2015-04-20 02:18:46 -05:00
PabstMirror
e747234443 Cleanup Spelling 2015-04-20 02:17:47 -05:00
PabstMirror
8c449a454b merge conflict 2015-04-19 23:57:15 -05:00
PabstMirror
caef5c105f More Privates 2015-04-17 22:40:37 -05:00
commy2
6710040633 toLower in, always follow your own advice 2015-04-15 16:13:53 +02:00
jaynus
c6943fbdaf fixes to ACRE volume, and this transform should really be in set/get global volume. Closes #588 2015-04-14 14:45:21 -07:00
PabstMirror
ae064359f6 Remove Debug 2015-04-10 23:51:07 -05:00
PabstMirror
0edcf03e12 Handle Vehicle Attunation 2015-04-10 23:21:54 -05:00
PabstMirror
dac3047fca Use AllVehicles Instead of CAManBase 2015-04-10 22:16:33 -05:00
Nicolás Badano
5e79970740 Switching nicknames 2015-03-24 01:18:00 -03:00
Nicolás Badano
eb4ccd9505 Merge branch 'hearingCleanup' of github.com:KoffeinFlummi/ACE3
Conflicts:
	addons/hearing/functions/fnc_updateVolume.sqf
2015-03-16 20:39:49 -03:00
Nicolás Badano
5b91996c69 Add hearing module and additional customization parameters:
- Enable/Disable combat deafness altogether (default on)
- Volume when using earbuds (default 50%)
- Volume when unconscious (default 40%)
2015-03-16 20:28:37 -03:00
PabstMirror
d06760e77e Use ACRE API: acre_api_fnc_setGlobalVolume 2015-03-16 13:14:45 -05:00
PabstMirror
5d0f0c2896 Rename ACE_EarBuds -> ACE_EarPlugs
Can't verify translations
2015-03-16 10:56:05 -05:00
PabstMirror
ec0e2d72c2 Check firer's silencer instead of player's 2015-03-15 16:47:50 -05:00
PabstMirror
04412e8ba4 Replace spawn with waitAndExec 2015-03-15 16:46:06 -05:00
PabstMirror
1cdc341320 Headers, Formatting 2015-03-15 16:40:47 -05:00
Nicolás Badano
0600a72147 Fixes 2015-02-02 21:13:31 -03:00
Nicolás Badano
96b7c0d30c ACE_Settings: replace all ACE_Options 2015-01-30 19:19:45 -03:00
Nicolás Badano
27bd5c5790 hearing: fixes 2015-01-17 03:20:41 -03:00
Nicolás Badano
8a397f80ef hearing: change addPerFrameHandler to waitAndExecute 2015-01-17 03:02:52 -03:00
Nicolás Badano
c85db9baf9 hearing: fix PFH in case the game is paused 2015-01-17 02:24:28 -03:00