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
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
Alessandro Foresi
6695a8793b
Added: Some italian translastions
2015-05-09 23:43:03 +02:00
ToasterBR
021b00c722
Translation to Portuguese
...
Done all remaining portuguese translations, including some minor
corrections
2015-05-02 03:38:53 -03: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
KoffeinFlummi
592e0d2dd3
Merge https://github.com/ruPaladin/ACE3 into russian-merge
...
Conflicts:
addons/ballistics/stringtable.xml
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
2015-04-19 00:51:09 +02:00
FreeZbe
f55bd5a629
French: updates / fixes stringtable
2015-04-18 18:49:46 +02:00
PabstMirror
060dc22ad5
Merge pull request #721 from acemod/privatesPass1
...
Privates Var Fixing
2015-04-17 23:51:23 -05:00
PabstMirror
caef5c105f
More Privates
2015-04-17 22:40:37 -05:00
Tachii
b7c7d2ff15
Update stringtable.xml
2015-04-18 03:04:14 +03:00
Tachii
bd3ef35c88
Update stringtable.xml
2015-04-18 02:07:49 +03:00
ruPaladin
766321224b
hearing
2015-04-17 15:59:29 +03:00
KoffeinFlummi
1b67b2df26
Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge
...
Conflicts:
addons/disposable/stringtable.xml
addons/explosives/stringtable.xml
addons/fcs/stringtable.xml
addons/frag/stringtable.xml
addons/hearing/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/inventory/stringtable.xml
addons/javelin/stringtable.xml
addons/kestrel4500/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/laserpointer/stringtable.xml
addons/magazinerepack/stringtable.xml
addons/maptools/stringtable.xml
addons/markers/stringtable.xml
addons/microdagr/stringtable.xml
addons/movement/stringtable.xml
2015-04-15 22:20:47 +02:00
commy2
6710040633
toLower in, always follow your own advice
2015-04-15 16:13:53 +02:00
KoffeinFlummi
8b915380b7
Merge branch 'hungarian-merge'
2015-04-15 13:55:02 +02:00
KoffeinFlummi
2ffbccbf20
Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge
2015-04-15 12:59:56 +02:00
Marco
9a8dd905f2
Update stringtable.xml
2015-04-15 10:56:39 +02:00
jaynus
df3c8155a0
Merge branch 'master' of github.com:acemod/ACE3
2015-04-14 14:45:30 -07: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
KoffeinFlummi
ebcdafe610
Fix spelling of "isClientSetable"
2015-04-14 21:43:19 +02:00
KoffeinFlummi
b563bf8a8e
Merge branch 'Update-Stringtable-Common' of https://github.com/licht-im-Norden87/ACE3 into german-merge
2015-04-14 15:04:42 +02:00
KoffeinFlummi
63fe4118d4
Merge https://github.com/FreeZbe/ACE3 into french-merge
2015-04-14 14:48:13 +02:00
Harakhti
3c3f6ba4c3
Translation: A to I
...
Some parts filled out, other parts corrected or stylized.
2015-04-13 19:28:58 +02:00
KoffeinFlummi
f6c7d444e1
Merge https://github.com/Anthariel/ACE3 into french-merge
2015-04-13 13:31:48 +02:00
KoffeinFlummi
118b5509ea
Merge https://github.com/gienkov/ACE3 into polish-merge
2015-04-13 13:00:59 +02:00
KoffeinFlummi
614afa8537
Merge https://github.com/Kllrt/ACE3 into czech-merge
...
Conflicts:
addons/attach/stringtable.xml
addons/captives/stringtable.xml
addons/common/stringtable.xml
addons/dragging/stringtable.xml
addons/explosives/stringtable.xml
addons/goggles/stringtable.xml
addons/grenades/stringtable.xml
addons/hearing/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/inventory/stringtable.xml
addons/kestrel/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/laserpointer/stringtable.xml
addons/logistics_uavbattery/stringtable.xml
addons/logistics_wirecutter/stringtable.xml
addons/magazinerepack/stringtable.xml
addons/maptools/stringtable.xml
addons/medical/stringtable.xml
addons/microdagr/stringtable.xml
addons/nametags/stringtable.xml
addons/optionsmenu/stringtable.xml
addons/overheating/stringtable.xml
addons/realisticnames/stringtable.xml
addons/reload/stringtable.xml
addons/reloadlaunchers/stringtable.xml
addons/weaponselect/stringtable.xml
addons/wep_javelin/stringtable.xml
addons/winddeflection/stringtable.xml
2015-04-12 14:27:59 +02:00
FreeZbe
45ff6c7ce9
French: (Nearly) Complete French translations
...
Some entries (3 or 4) are still missing.
I dont understand what you mean / what the input is related to.
2015-04-12 14:15:45 +02:00
licht-im-Norden87
15e9b2cccc
Update stringtable.xml
2015-04-12 13:59:09 +02:00
licht-im-Norden87
2222192aee
Update stringtable.xml
2015-04-12 13:51:47 +02:00
bux578
0e3d971274
Fix translations error
2015-04-12 07:46:43 +02:00
KoffeinFlummi
59952441d8
Merge branch 'patch-2' of https://github.com/licht-im-Norden87/ACE3 into german-merge
2015-04-12 06:22:17 +02:00
EpMAK
21abff3713
Revert "Revert "Russian Translation""
...
This reverts commit ea04f4ab3e
2015-04-11 21:33:34 +03:00
EpMAK
ea04f4ab3e
Revert "Russian Translation"
...
This reverts commit 17a552bb80
2015-04-11 21:33:07 +03:00
Kllrt
38adfbcb70
Added missing CZ strings and made little revision
2015-04-11 16:33:00 +02: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
EpMAK
17a552bb80
Russian Translation
...
Russian translation of stringtables: new lines + old lines fixed a bit,
realistic names for armory are not yet filled.
2015-04-10 19:55:57 +03:00
EpMAK
68d08b8c7b
Revert "Translation"
...
This reverts commit fab5605ad5
2015-04-10 19:46:18 +03:00
EpMAK
fab5605ad5
Translation
...
Russian translation of the texts
2015-04-10 17:51:48 +03:00
Jo David
33a14076fc
Merge branch 'master' of https://github.com/acemod/ACE3 into translations
...
Conflicts:
addons/captives/stringtable.xml
addons/medical/stringtable.xml
2015-04-10 09:01:24 +02:00
Anthariel
04bf321099
Update stringtable.xml
...
Added: French Translation (100%)
2015-04-10 06:31:42 +02:00
Grzegorz
d874140268
hearing PL translation
2015-04-10 03:33:40 +02:00
licht-im-Norden87
828e19a268
Update stringtable.xml
2015-04-09 23:42:45 +02:00
licht-im-Norden87
2097a5f213
Update stringtable.xml
2015-04-09 23:42:15 +02:00
commy2
5ea35a01bb
sorting out required addons for modularity
2015-04-09 13:23:29 +02:00
bux578
92da20ce62
translations
...
#367
2015-04-07 10:02:33 +02:00
jaynus
1bb6be5654
Cleaning up of all tabs in source code files.
2015-04-06 09:22:43 -07:00
Nicolás Badano
4fb50fa71e
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-03-24 15:44:10 -03:00
Nicolás Badano
8b3648cf8d
Configure exceptions for self actions inside vehicles
2015-03-24 15:43:49 -03:00
bux578
60c50e0daf
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ModuleIcons
2015-03-24 19:12:23 +01:00
Nicolás Badano
5e79970740
Switching nicknames
2015-03-24 01:18:00 -03:00
bux578
ba42ec831b
second batch of icons
2015-03-23 20:02:35 +01: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
PabstMirror
bed312dcee
Use MACRO_ADDITEM from main instead of redefining
2015-03-11 17:36:40 -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
PabstMirror
9631154926
Set ADDON variable in XEH_preInit
2015-01-29 01:38:46 -06:00
KoffeinFlummi
c407553d49
Add remaining READMEs, add helper script
2015-01-26 14:34:48 +01:00
PabstMirror
cb561a2d93
Convert Old Ace_Options
2015-01-21 18:19:10 -06: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
PabstMirror
00ecb21ad7
#15 oops
2015-01-14 00:02:44 -06:00
PabstMirror
c9e957f9ac
#15 - all agm ref in p3d fixed - still bin issues
2015-01-13 23:24:53 -06:00
PabstMirror
436815fea3
Paths
2015-01-13 21:45:09 -06:00
Nicolás Badano
40c43944fe
hearing: make tinnitus disabable
2015-01-14 00:29:01 -03:00
Nicolás Badano
71879acb79
hearing: ups, wrong triangle
2015-01-14 00:13:57 -03:00
Nicolás Badano
057be50cf6
hearing: skip first execution of the PFH
2015-01-14 00:08:17 -03:00
Nicolás Badano
f082242485
hearing: buggy PFH
2015-01-13 23:34:55 -03:00
Nicolás Badano
cc7d67a150
Merge branch 'agmHearingPort' of https://github.com/KoffeinFlummi/ACE3.git into agmHearingPort
...
Conflicts:
addons/hearing/CfgSounds.hpp
addons/hearing/CfgWeapons.hpp
addons/hearing/script_component.hpp
2015-01-13 23:19:00 -03:00
Nicolás Badano
5e4a78a1bc
hearing: replaced spawn by PFH
2015-01-13 23:16:55 -03:00
Nicolás Badano
319e772832
hearing: tweaks
2015-01-13 23:07:50 -03:00
PabstMirror
a78f508551
compiling, still need to test
2015-01-13 20:07:31 -06:00
Nicolás Badano
b9c2af8dfe
hearing: final fixes
2015-01-13 23:00:48 -03:00
Nicolás Badano
e7c3b0db18
hearing: various fixes
2015-01-13 22:41:53 -03:00
Nicolás Badano
bf88af1579
hearing: replace some remaining tags
2015-01-13 01:21:49 -03:00
Nicolás Badano
90dc92fb52
Rename earplugs model file
2015-01-13 01:19:41 -03:00
Nicolás Badano
3b34ad06a2
hearing: Rename function files
2015-01-13 01:18:27 -03:00
Nicolás Badano
5d6fd9ab3e
CBAfy AGM_Hearing
2015-01-13 01:17:52 -03:00
Nicolás Badano
db7322e50a
AGM_Hearing pre CBA
2015-01-13 00:51:09 -03:00
