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
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
ulteq
badfc4017c
Reset 'deaf' on respawn
2015-06-13 19:27:30 +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
ProfessorCZ
acc5f4d29f
CZ - Translation
2015-06-12 15:05:04 +02:00
ProfessorCZ
531372b2a3
CZ - Translation
...
Already in README
2015-06-12 14:50:50 +02:00
jonpas
332afb2174
Allow certain self-interactions while sitting
2015-06-09 16:17:05 +02:00
PabstMirror
b6951b7a13
#1022 - reset hearing deafness on respawn
2015-06-05 16:37:27 -05: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
541f1010a7
Merge branch 'master' into macroSTR
...
Conflicts:
addons/attach/functions/fnc_attach.sqf
addons/captives/functions/fnc_moduleSurrender.sqf
addons/common/CfgVehicles.hpp
addons/explosives/CfgModule.hpp
addons/hearing/CfgVehicles.hpp
addons/interaction/CfgVehicles.hpp
addons/map/CfgVehicles.hpp
addons/microdagr/CfgVehicles.hpp
addons/mk6mortar/CfgVehicles.hpp
addons/nametags/CfgVehicles.hpp
addons/nightvision/functions/fnc_changeNVGBrightness.sqf
addons/respawn/CfgVehicles.hpp
addons/switchunits/CfgVehicles.hpp
addons/vehiclelock/CfgVehicles.hpp
addons/winddeflection/stringtable.xml
2015-06-02 22:14:32 +02:00
Glowbal
1c0c73be54
Merge pull request #1433 from acemod/fixSettingsFromModules
...
Delay initialization of modules until settings are properly setup
2015-06-01 19:18:11 +02:00
KoffeinFlummi
fa73aec15b
Merge https://github.com/Macusercom/ACE3 into german-merge
2015-06-01 14:27:49 +02:00
Macusercom
038880cb01
Additional Translations for German + some corrections
2015-05-30 23:33:51 +02:00
esteldunedain
9d29aa2107
- Change all modules on ACE using settings to type ACE_Module, so we can guarantee that they wait for settings before initing.
...
- Make ace_common require ace_modules, so all ACE pbos are guaranteed to have it
2015-05-30 01:37:41 -03:00
jonpas
763cb07629
Macro STRING to LSTRING
2015-05-28 21:59:04 +02:00
jonpas
0b0f7274d7
Applied ESTRING and ECSTRING macros
2015-05-27 22:04:41 +02:00
jonpas
6072e14077
Changed all strings to macros (except external)
2015-05-27 19:04:25 +02:00
Ivan Navarro Cabello
047a2ee736
added spansih translate
...
added spansih translate for (advanced_ballistics, ballistics, captives,
common, explosives, frag, hearing, interaction, map, medical, microdagr,
missileguidance, missionmodules, mk6mortar, nametags, optionsmenu,
respawn, switchunits, vehiclelock, weather, winddeflection).
I used the Pull request of #1251 for complete my commit, because #1251
is outdated now.
2015-05-27 15:27:04 +02:00
Macusercom
7eeddfbd65
German translations
...
Added a lot of German translations and fixed even more typos.
2015-05-26 17:04:53 +02:00
jaynus
c924baefd7
All instances of time and diagTicktime changed to ACE_time / ACE_diagTime.
2015-05-21 09:42:44 -07:00
Kavinsky
8e9b35c757
Fixed Capitalized folders on include paths
2015-05-20 23:28:10 +02:00
SAM
31adb5a9fc
Second batch of settings files
2015-05-14 20:59:25 +02:00
GieNkoV
bc72c71e8e
Fix small errors inside stringtables
2015-05-12 19:11:56 +02:00
Grzegorz Sikora
44466e8be8
Remove tabs and repair errors @Glowbal found
...
Conflicts:
addons/map/CfgVehicles.hpp
addons/medical/CfgVehicles.hpp
Conflicts:
addons/map/CfgVehicles.hpp
addons/medical/CfgVehicles.hpp
addons/optionsmenu/stringtable.xml
2015-05-12 18:27:27 +02:00
Grzegorz Sikora
156bba3321
Yes/No to BOOL
...
Conflicts:
addons/common/CfgVehicles.hpp
addons/common/stringtable.xml
addons/explosives/stringtable.xml
addons/hearing/CfgVehicles.hpp
addons/hearing/stringtable.xml
addons/interaction/stringtable.xml
addons/map/CfgVehicles.hpp
addons/map/stringtable.xml
addons/medical/CfgVehicles.hpp
addons/medical/stringtable.xml
addons/nametags/stringtable.xml
addons/respawn/stringtable.xml
addons/switchunits/CfgVehicles.hpp
addons/switchunits/stringtable.xml
Conflicts:
addons/common/CfgVehicles.hpp
addons/common/stringtable.xml
addons/explosives/stringtable.xml
addons/hearing/stringtable.xml
addons/interaction/stringtable.xml
addons/map/CfgVehicles.hpp
addons/map/stringtable.xml
addons/medical/CfgVehicles.hpp
addons/medical/stringtable.xml
addons/nametags/stringtable.xml
addons/respawn/stringtable.xml
addons/switchunits/CfgVehicles.hpp
addons/switchunits/stringtable.xml
2015-05-12 18:26:24 +02:00
Grzegorz Sikora
6a821715a0
Stringtable modules
...
Conflicts:
addons/missionmodules/CfgVehicles.hpp
addons/respawn/CfgVehicles.hpp
2015-05-12 18:25:40 +02:00
KoffeinFlummi
2bb3a0f139
Cleanup #1095
...
- Fix tabs
- Remove tabler comments
- Restore one removed Russian string
2015-05-10 16:19:46 +02:00
