Commit Graph

174 Commits

Author SHA1 Message Date
KoffeinFlummi
63c2712360 Merge branch 'release' into portuguese 2015-09-10 21:59:30 +02:00
KoffeinFlummi
c2ffe7cad0 Merge branch 'release' into russian 2015-09-10 21:05:32 +02:00
KoffeinFlummi
83aa2cc68c Merge branch 'release' into french 2015-09-10 19:36:56 +02:00
FreeZbe
fa7943c8be Update French translations 2015-09-10 19:14:51 +02:00
gienkov
1edcc320d1 Merge remote-tracking branch 'origin' into pl-translation-7 2015-09-07 16:05:45 +02:00
[OMCB]kaban
78084f271a Changed "Effect Zeus RC" to "Affects Zeus RC" 2015-09-06 07:11:27 +03:00
Jonathan Pereira
7147891710 Added latest ACE3 PT-BR translations 2015-09-05 15:12:31 -03:00
kaban
08b7110e58 Russian Translations - Update 2015-09-03 04:54:52 +03:00
kaban
91cae690c0 Russian Translations - Update 2015-09-03 03:36:15 +03:00
PabstMirror
910bb151e2 #1988 - Boost explosive hearing damage 2015-08-30 01:47:40 -05:00
PabstMirror
8307ccea96 firedNear - use new isKindOf 2015-08-30 01:37:14 -05:00
PabstMirror
2f54cfadbc Merge pull request #2146 from jokoho48/codeCleanupHearing
Code cleanup of Hearing module
2015-08-30 01:18:47 -05:00
gienkov
17f647f341 PL translation 2015-08-30 01:42:42 +02:00
KoffeinFlummi
a7f2a7fefc Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3 2015-08-30 00:35:11 +02:00
Glowbal
998bc2d45a Merge pull request #2297 from acemod/addMoreHearingProtection
Add Hearing Protection to Helmets with Peltor Headsets
2015-08-29 22:34:59 +02:00
bux578
19a6226ced add Hearing Protection to Helmets with Peltors 2015-08-28 09:10:58 +02:00
jokoho48
bd56d1bb83 ok that is my fault 2015-08-14 00:36:36 +02:00
jokoho48
cb8d009ef0 Woops 2015-08-14 00:31:42 +02:00
jokoho48
c6fbdb420c Code cleanup of Hearing module 2015-08-13 23:42:20 +02:00
PabstMirror
a6acff9178 Setting to disable hearing for zeus RC 2015-08-08 14:40:19 -05:00
PabstMirror
6086553fce Move DoNotForce to common 2015-08-06 12:24:56 -05:00
PabstMirror
f99e8ba5bc Don't allow forcing the tinnitus effect 2015-08-02 12:30:35 -05:00
PabstMirror
c0fb2e1b65 Add Ear Ringing setting to module (Ref #1981) 2015-08-02 12:15:26 -05:00
Harakhti
d0f91c5ebf Row 1
Not a miracle, but it's something.
2015-07-30 14:40:51 +02:00
Glowbal
c9d4395a42 Merge pull request #1870 from SzwedzikPL/ah6_gun_fix
M134 minigun rate of fire & dispersion fix + hearing protection for heli pilots
2015-07-25 21:39:21 +02:00
ViperMaul
38bd2896ab Merge pull request #1851 from SzwedzikPL/hearing_in_zeus
Disable hearing in zeus camera
2015-07-25 10:44:34 -07:00
ViperMaul
55614b9ac3 Merge pull request #1839 from acemod/hearingUnification
Hearing PFEH unification / Flashbangs
2015-07-25 10:44:11 -07:00
SzwedzikPL
99e1b36712 AH6 gun fix, hearing protection change 2015-07-18 15:51:16 +02:00
Glowbal
0154dfc51e Merge pull request #1799 from jokoho48/3DModelUpdate
Add and Update Some 3D Object and Textures
2015-07-17 08:17:42 +02:00
Joko
9aa0285064 Revert LoD Changes 2015-07-15 21:13:05 +02:00
Joko
fd4d4abb73 Move UAV Battery form models to data
change LoD Distance
Fix IVBag names(my issue)
2015-07-15 20:51:06 +02:00
Joko
a72312738e Add to all Objects a LoD with nothing in for "hiding" Objects in Distance
Remove Old Earplugs
Use 3 Object instead of 9 for IVBag with Using of Model Config
2015-07-15 20:34:35 +02:00
SzwedzikPL
60641d57d2 Disable hearing in zeus camera 2015-07-13 21:01:41 +02:00
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
Joko
240b26b9ac Add IRStrobe 3D Object to attach
Add M57 Clacker to explosives
Add New LowPoly Earplug to Hearing
Add WireCutter to logistics_wirecutter
Reduce UAVBattery Texture Size in logistics_uavbattery
Add MapTools to maptools
2015-07-04 19:56:54 +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
Nicolás Badano
1e8d4327df Merge pull request #1763 from naizarak/patch-1
Update fnc_addEarPlugs.sqf
2015-07-01 11:22:59 -03: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
ToasterBR
f4a51d57ef Translation to Brazilian Portuguese (PT-BR)
Made all remaining translations, including new ones like the sitting
module, for example.
2015-06-27 15:48:39 -03:00
ulteq
241e8acdd9 Merge pull request #1541 from jonpas/sitting
Sitting
2015-06-26 21:34:34 +02:00
ulteq
5d2905ca42 Improved config caching 2015-06-18 11:56:58 +02:00
jonpas
29ce8f635e Merge branch 'master' into sitting
Conflicts:
	addons/kestrel4500/CfgVehicles.hpp
	addons/microdagr/CfgVehicles.hpp
2015-06-13 21:43:42 +02:00
ulteq
c3340b174e Merge pull request #1609 from acemod/ace2EarRinging
Ported the ACE2 ear ringing logic
2015-06-13 19:44:15 +02:00