Commit Graph

275 Commits

Author SHA1 Message Date
PabstMirror
930c2f84c6 Call updateHearingProtection at settings init 2016-02-17 09:49:00 -06:00
PabstMirror
649b0c28e2 Calculate hearing protection coefficient on events 2016-02-16 18:17:42 -06:00
PabstMirror
749425dfb7 Settings Category, Minor Cleanup 2016-02-16 12:58:42 -06:00
licht-im-Norden87
99f6c79573 Update stringtable.xml 2016-02-10 16:57:12 +01:00
licht-im-Norden87
8971f4db1e Update stringtable.xml 2016-02-10 16:56:15 +01:00
esteldunedain
698b934801 Increase the volume of the residual woosh when ringing is disabled 2016-02-06 14:49:56 -03:00
esteldunedain
9a8dd3e2ad Fix stringtable 2016-02-06 14:49:28 -03:00
esteldunedain
354ed0cab2 Trace instead of sideChat 2016-02-06 14:11:18 -03:00
esteldunedain
2f1e96ae4f Overhaul ACE_Hearing and change default settings. 2016-02-06 13:59:31 -03:00
ProfessorCZ
61611d0ec7 Czech Translation - Update
Update
2016-02-03 18:31:31 +01:00
PabstMirror
46d6e92bca Add quick debug defines to all script_components 2016-01-28 23:26:02 -06:00
PabstMirror
73b29085e2 Merge pull request #3200 from acemod/moreCache
Hearing - Cache Weapon/Ammo loudness
2016-01-22 14:56:00 -06:00
PabstMirror
be8afe507c Few more privates 2016-01-20 17:19:08 -06:00
PabstMirror
a140f29784 Remove inherited classes that were not used 2016-01-20 09:45:03 -06:00
esteldunedain
1a115e7f9c Fix #3194 2016-01-20 11:48:12 -03:00
esteldunedain
0a91dfa7b2 Do not add or remove earplugs if gear should be preserved. Fix #3180. 2016-01-18 13:23:55 -03:00
PabstMirror
82179636f3 Cache hearing firedNear 2016-01-09 18:51:41 -06:00
Alessandro Foresi
2d152675fc Add: IT small translations, DE removed duplicate 2016-01-03 13:02:01 +01:00
Alessandro Foresi
c16d97cad0 Merge branch 'master' into translation/15bn/alef 2016-01-03 12:23:27 +01:00
PabstMirror
8bdd5d0597 Merge remote-tracking branch 'brGuy/Translations-December' into fixStringtablesMerge 2015-12-31 14:30:29 -06:00
PabstMirror
cf27571b5a Merge pull request #3007 from dudakov/master
Russian Translations - Update
2015-12-31 14:11:45 -06:00
bux
0e8eb5fac4 Remove obsolete hotkey entries 2015-12-30 11:23:52 +01:00
Jonathan Pereira
ad48f51ec7 Added PT-BR translations
All remaining translations of gestures, hearing, interact_menu,
interaction, nightvision, rearm, refuel, viewdistance were done!
2015-12-18 15:14:19 -02:00
kaban
fd06472f4d Russian Translations - Update 2015-12-10 20:32:16 +03:00
PabstMirror
cae9f436f6 Merge branch 'release' 2015-12-08 15:14:33 -06:00
PabstMirror
39edd205f0 Merge pull request #2942 from acemod/CzechTables
Czech Translations - Update
2015-12-07 09:32:00 -06:00
PabstMirror
358228f5bb Cleanup De Stringtables 2015-12-06 15:03:15 -06:00
ProfessorCZ
cf41ac5fba Czech Translations - Update 2015-12-04 22:28:10 -06:00
licht-im-Norden87
291f4df072 Update German Stringtables
Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

kommas...........................................................................................................................................................

Rallypoint

Update stringtable.xml

slideshow, not finished yet

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

What does Curator mean in this context?
l. 294, l 302

cargo

Update stringtable.xml

Update stringtable.xml

I left a few things out. I'd like if someone gives me  advice
Z.698 Pionier oder Instandsetzer o.Ä. Was genau ist die deutsche Bezeichung der Klasse in ACE bzw Arma?
Z.707 Ich habe mich einfach mal auf Mechatroniker festgelegt, da Reperaturspezialist sich doch ein wenig ungelenk anhört...

Update stringtable.xml

Habe engineer als Pionier übersetzt (halte es selbst für etwas unpassend) Der specialist ist bei mir zum Mechatroniker geworden.

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Fix Mistakes from merge

Fix Empty Entries

Fix Mistake

Fix
2015-12-04 22:06:44 -06:00
commy2
5a1aae6028 manual merge 2015-11-30 17:44:15 +01:00
commy2
a9ebcf8543 fix setVariable and getVariable capitalization 2015-11-30 17:27:09 +01:00
gienkov
b091b73e24 fixes 2015-11-27 21:54:04 +01:00
gienkov
3250245587 3.4.0 translations and fixes 2015-11-27 21:50:57 +01:00
PabstMirror
86f7ee2ad2 Merge pull request #2834 from acemod/addEarPlugsLoudness
Hearing - Add earplugs based on loudness and give to MGs and fix respawn issues
2015-11-24 10:52:11 -06:00
PabstMirror
c2564de5ef Fix UBC for 1.54
Soldiers no longer inherit hitpoints from CaManBase
Adds a macro to deal with them
2015-11-20 23:27:29 -06:00
PabstMirror
d6000ae985 local -> private 2015-11-17 14:33:17 -06:00
PabstMirror
87b9ff9785 Hearing - Reset earplugs on respawn, addItem setting
Fix #2835 - readd item on respawn
Fix #2837 - setVariable false on respawn
2015-11-10 20:44:55 -06:00
PabstMirror
845909f8af #2833 - Add earplugs based on loudness (+MGs)
Use same loudness calc as firedNear (replacing old audibleFire)
Give ear plugs to machine gunners (depends on magzine size)
2015-11-08 14:02:00 -06:00
PabstMirror
64de91ed06 Add warning for duplicate setting modules. 2015-10-18 23:34:11 -05:00
KoffeinFlummi
3471ebef16 Merge https://github.com/dudakov/ACE3 into russian-merge 2015-09-23 19:17:52 +02:00
esteldunedain
a621a0c693 Fixes to spanish translations 2015-09-18 13:36:57 -03:00
kaban
4d2707eae2 Russian Translations - Update 2015-09-17 12:21:21 +03:00
kaban
341e122e4c Russian Translations - Update 2015-09-17 11:43:14 +03:00
Ivan Navarro Cabello
463e21dd91 330 2015-09-16 12:40:30 +02:00
Glowbal
478b618e4b Merge pull request #2429 from MikeMatrix/feature/switchToLogMacros
Feature/switch to log macros
2015-09-15 14:51:23 +02:00
PabstMirror
f7bd557a30 Fix some stringtable weirdness 2015-09-14 16:11:43 -05:00
Alessandro Foresi
89eb98a248 Added: IT more translation, medic partial
Fixed: dup entries (from gienkov)
2015-09-12 23:16:57 +02:00
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
Michael Braun
a5fb09a7e1 Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros
Conflicts:
	addons/repair/functions/fnc_moduleRepairSettings.sqf
2015-09-09 02:55:12 +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
Michael Braun
035b3432c5 Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros
Conflicts:
	addons/common/XEH_postInit.sqf
2015-09-01 08:45:59 +02: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
Michael Braun
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
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
Michael Braun
9e10aa86d7 Standardize logging format through ACE_LOG macros 2015-08-26 15:32:54 +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