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 |
|
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 |
|