Nicolás Badano
d7403976aa
Merge pull request #3337 from acemod/overheatingSilencers
...
Substantially increase overheating when using silencers or flash suppresors
2016-02-20 22:06:19 -03:00
licht-im-Norden87
360c35dc9c
Update stringtable.xml
2016-02-21 02:04:58 +01:00
licht-im-Norden87
0a0400a7a2
deleted all lines exept for 2 because of obvious reason.
2016-02-21 02:03:30 +01:00
esteldunedain
e4e2f0d661
Add a 10% chance for the unjam action to fail (like in ACE2)
2016-02-20 21:09:52 -03:00
Glowbal
e476701069
Merge branch 'master' of github.com:acemod/ACE3
2016-02-21 01:05:18 +01:00
Glowbal
ea113b8e61
Fix duplicate {
2016-02-21 01:04:12 +01:00
PabstMirror
23eb6ec1f5
Fix double {
2016-02-20 18:01:55 -06:00
Glowbal
7d063d4dee
Merge branch 'master' into medical-focus-feature
...
Conflicts:
addons/medical/functions/fnc_treatmentAdvanced_CPR.sqf
2016-02-21 00:37:30 +01:00
commy2
f5ef7b6b2d
displayLoad xeh for imenu
2016-02-21 00:36:46 +01:00
esteldunedain
dc7c4ff4fd
Increase the jam chance of all weapons at high temperatures
2016-02-20 20:26:30 -03:00
esteldunedain
11f3189306
Add an unjam action to the interact menu when the weapon is jammed
2016-02-20 20:19:56 -03:00
esteldunedain
2dbf979ec6
By default, prevent reloading from automatically clearing a weapon jam (like in ACE2)
2016-02-20 20:05:59 -03:00
PabstMirror
8b932fd5a0
Fix some undefined functions / strings
2016-02-20 16:58:45 -06:00
licht-im-Norden87
a977715460
Merge pull request #37 from licht-im-Norden87/patch-49
...
Viewdistance
2016-02-20 23:54:10 +01:00
licht-im-Norden87
82a938113c
Merge pull request #39 from licht-im-Norden87/patch-47
...
hearing
2016-02-20 23:54:04 +01:00
licht-im-Norden87
a4d0c219ac
Merge pull request #40 from licht-im-Norden87/patch-51
...
switchunits
2016-02-20 23:53:52 +01:00
licht-im-Norden87
fb20492573
switchunits
2016-02-20 23:53:02 +01:00
licht-im-Norden87
593ae5495e
Merge pull request #38 from licht-im-Norden87/patch-48
...
interaction
2016-02-20 23:46:17 +01:00
licht-im-Norden87
5996f50490
Merge pull request #36 from licht-im-Norden87/patch-50
...
finger
2016-02-20 23:46:11 +01:00
licht-im-Norden87
50dc6ec341
finger
...
Iam not happy with my translation in any way.
"Zeige Zeiger" sounds terrible
"Zeige Fingerzeig (middlefinger)" can be misunderstood
(maybe there is a nice solution Iam not aware of.) This is truely a pain in the ass
2016-02-20 23:43:16 +01:00
licht-im-Norden87
747cd8c4cf
Viewdistance
2016-02-20 23:33:12 +01:00
commy2
9c4121f3b1
replace ace_common_fnc_selectWeaponMode with CBA_fnc_selectWeapon
2016-02-20 23:30:40 +01:00
licht-im-Norden87
91bdceead6
interaction
2016-02-20 23:27:32 +01:00
licht-im-Norden87
5569790e0b
hearing
2016-02-20 23:25:19 +01:00
licht-im-Norden87
7f2dfe1749
Merge pull request #35 from licht-im-Norden87/patch-46
...
explosives
2016-02-20 23:20:21 +01:00
licht-im-Norden87
d4cca14929
explosives
2016-02-20 23:19:51 +01:00
commy2
a67917c590
add deprecate log
2016-02-20 23:11:50 +01:00
licht-im-Norden87
83e17e293b
Merge pull request #33 from licht-im-Norden87/patch-45
...
common
2016-02-20 23:08:47 +01:00
licht-im-Norden87
5294527daa
Merge pull request #32 from licht-im-Norden87/patch-44
...
cargo
2016-02-20 23:07:59 +01:00
licht-im-Norden87
cdb58b6233
common
2016-02-20 23:06:29 +01:00
licht-im-Norden87
b41efc39ff
cargo
2016-02-20 23:02:02 +01:00
licht-im-Norden87
073a476ed1
Update German Stringtable
...
Since my other PR was merged I have to open another one to add a few things a fix one or two mistakes. It should be done in <30 minutes. (Guess you guys want to realease 3.5.0 as soon as possible.)
2016-02-20 22:57:45 +01:00
commy2
9cdefae10e
delete sqf file
2016-02-20 22:46:22 +01:00
commy2
73d5b3c77b
relace ace_common_fnc_canUseWeapon with CBA_fnc_canUseWeapon
2016-02-20 22:41:24 +01:00
esteldunedain
d00587f367
Minor fixes
2016-02-20 17:40:19 -03:00
ChairborneIT
0021bc08df
Added translation for most Italian stringtable entries
2016-02-20 21:39:05 +01:00
esteldunedain
2d2e95fddc
Merge branch 'master' into overheatingSilencers
2016-02-20 17:25:26 -03:00
Nicolás Badano
02e530a99c
Merge pull request #3343 from acemod/fixRHSCompat
...
Fix AB compat with subsonic RHS ammo
2016-02-20 17:07:05 -03:00
esteldunedain
4f62e56004
Unify the changes of #3130 and #3343
2016-02-20 17:05:47 -03:00
esteldunedain
63056ef47a
Merge branch 'master' into fixRHSCompat
2016-02-20 17:02:11 -03:00
Nicolás Badano
d3468649e3
Merge pull request #3279 from acemod/changeHearingDefaults
...
Overhaul ACE_Hearing and change default settings.
2016-02-20 17:00:10 -03:00
esteldunedain
6fd8d8da04
Merge branch 'master' into changeHearingDefaults
...
Conflicts:
addons/grenades/functions/fnc_flashbangExplosionEH.sqf
2016-02-20 16:59:00 -03:00
PabstMirror
c9aa221b01
Convert other weapons with join muzzles
2016-02-20 12:01:34 -06:00
PabstMirror
84ba6f29f2
Merge pull request #3362 from acemod/delayedCaptivity
...
Delay captivity until 0.05s after settings are initialized
2016-02-20 10:34:18 -06:00
Thomas Kooi
1b80f68033
Merge pull request #3136 from jonpas/updateMake
...
Fix make.py undefined variable and regex
2016-02-20 17:32:19 +01:00
Thomas Kooi
f6dfd03bec
Merge pull request #2168 from jokoho48/codeCleanupLaserSelfdesignate
...
Code Cleanup laser Self Designate Module
2016-02-20 17:28:41 +01:00
Thomas Kooi
b6b173b03e
Merge pull request #3358 from acemod/darkerSandbags
...
Darken and improve sandbag texture, close #2595
2016-02-20 17:26:35 +01:00
Thomas Kooi
2930fab6c6
Merge pull request #3354 from acemod/playerBodybags
...
Fix bagging respawning players (alt)
2016-02-20 17:26:07 +01:00
Thomas Kooi
911cba81b7
Merge pull request #3347 from GitHawk/refuel_removedTruck
...
Handling disconnect and removal of fuel truck
2016-02-20 17:24:32 +01:00
Thomas Kooi
ff7dbfa9f2
Merge pull request #3305 from GitHawk/dagr_fix
...
Disable ACE_Laser for choppers (aka Changes to DAGR)
2016-02-20 17:17:46 +01:00
