bux578
55a6ef1937
Merge pull request #3367 from licht-im-Norden87/patch-43
...
Update German Stringtable
2016-02-22 08:26:23 +01:00
commy2
f4a985fdfd
Merge pull request #3345 from acemod/jrCompat338
...
Add flashsupressor to asdg_MuzzleSlot_338
2016-02-21 23:46:50 +01:00
commy2
dd10fac470
use DisplayLoad for main menu box and to disable options when world=Empty
2016-02-21 23:28:02 +01:00
commy2
9ac1f8fc47
use DisplayLoad for turretDisplayLoaded event
2016-02-21 23:13:26 +01:00
commy2
4c0a817ba8
use precompiled function for optics display
2016-02-21 22:56:35 +01:00
commy2
e1db193099
remove unused config and remove some wrong base classes
2016-02-21 22:50:15 +01:00
commy2
2b9518bf81
use precompiled function for vector display
2016-02-21 22:41:11 +01:00
commy2
da0d37ed0d
remove commented out code
2016-02-21 22:31:14 +01:00
commy2
3f855298e2
remove unused mapDisplayLoaded event and ACE_dlgMap variable
2016-02-21 22:23:46 +01:00
commy2
f43e88ff25
replace zeusDisplayChanged with DisplayLoad event
2016-02-21 22:16:12 +01:00
commy2
4335bfbfcf
replace inventoryDisplayLoaded with DisplayLoad event
2016-02-21 21:24:39 +01:00
licht-im-Norden87
5e0f109b4c
Update stringtable.xml
2016-02-21 21:15:38 +01:00
commy2
e9808bf20b
remove unused PFH check
2016-02-21 20:42:06 +01:00
licht-im-Norden87
00c8f7bdef
mk6
2016-02-21 20:30:57 +01:00
commy2
5e486869c0
replace mainDisplayLoaded event with DisplayLoad XEH and add ACE version to main menu (CBA help)
2016-02-21 20:26:30 +01:00
licht-im-Norden87
4036dcaa8e
Update stringtable.xml
2016-02-21 20:05:26 +01:00
licht-im-Norden87
62dc2ffd06
Update stringtable.xml
2016-02-21 20:04:32 +01:00
licht-im-Norden87
3c8b3031d8
Update stringtable.xml
2016-02-21 19:59:06 +01:00
licht-im-Norden87
ce97916fbf
Update stringtable.xml
2016-02-21 19:55:08 +01:00
licht-im-Norden87
574a6a32ea
Update stringtable.xml
2016-02-21 19:54:24 +01:00
PabstMirror
2467fa7b0c
Fix empty callbacks in medical/repair
2016-02-21 11:34:25 -06:00
PabstMirror
cb33666091
ObjectEvent Func, swap execRemoteFnc in doAnim
...
#3370
2016-02-21 11:08:07 -06:00
commy2
5dcb8707dd
Merge pull request #3359 from gienkov/edenadditions
...
integrate captivity modules with 3DEN
2016-02-21 12:44:39 +01:00
bux
38c1b45fb9
properly fix the medical translation file
2016-02-21 11:41:53 +01:00
PabstMirror
3d4602e461
Add all joint muzzles and remove from ballistics
2016-02-20 20:03:10 -06:00
PabstMirror
3fbd6cff18
Merge pull request #3368 from acemod/fixNils
...
Fix some undefined functions / strings
2016-02-20 19:49:07 -06:00
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
ea113b8e61
Fix duplicate {
2016-02-21 01:04:12 +01: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
esteldunedain
63056ef47a
Merge branch 'master' into fixRHSCompat
2016-02-20 17:02:11 -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
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
Thomas Kooi
6048d15847
Merge pull request #3290 from acemod/nametagsOptimization
...
Nametags optimization
2016-02-20 17:15:01 +01:00
Thomas Kooi
14b526d417
Merge pull request #3272 from acemod/deadmanBombVest
...
Deadman switch - trigger explosives in inventory
2016-02-20 17:11:06 +01:00
PabstMirror
918413030b
Short Circuit Tagging
2016-02-20 10:08:41 -06:00
Thomas Kooi
427b14e3ba
Merge pull request #3245 from GitHawk/rearm_fix
...
Fixing setVehicleAmmo for rearm
2016-02-20 17:08:37 +01:00
Thomas Kooi
8055eae580
Merge pull request #3210 from acemod/taggingX
...
Tagging X
2016-02-20 17:05:02 +01:00
Thomas Kooi
8d12f1cc08
Merge pull request #3130 from acemod/ab-subsonicAmmo
...
AB - Handle subsonic ammo when configs not defined
2016-02-20 17:01:22 +01:00
bux578
76bacf184d
Merge pull request #2237 from gienkov/patch-29
...
Make reserve steerable
2016-02-20 17:00:51 +01:00
Thomas Kooi
2e47cb5b40
Merge pull request #3079 from jonpas/tacticalLadderFixes
...
Prevent Tactical Ladder interaction if unit on ladder
2016-02-20 16:59:23 +01:00
Thomas Kooi
1e3596b92a
Merge pull request #3043 from acemod/Mortar_interact
...
Mortar interaction and ammunition handling
2016-02-20 16:57:55 +01:00
Thomas Kooi
4f10d551d6
Merge pull request #2949 from gienkov/fixWoundCount
...
ceil number of wounds
2016-02-20 16:56:17 +01:00
Thomas Kooi
27c6934ff2
Merge pull request #2230 from SzwedzikPL/interactions_lamps
...
Interaction with portable lamps
2016-02-20 16:47:28 +01:00
PabstMirror
b9cf5817b9
Restore delay in modules
2016-02-20 09:39:15 -06:00
esteldunedain
6523b715fe
Delay captivity until 0.05s after settings are initialized
2016-02-20 11:57:47 -03:00
gienkov
1b03ee76fd
tabs
2016-02-20 14:07:39 +01:00
gienkov
54b71cc7ba
integrate captivity modules with 3DEN
2016-02-20 13:36:53 +01:00
bux
d9b452f496
darken and improve sandbag texture
2016-02-20 12:12:32 +01:00
Thomas Kooi
fbcfbb92a6
Merge pull request #3346 from acemod/betterFlashEffects
...
Better flash effects
2016-02-20 10:22:57 +01:00
PabstMirror
fc3bb0de6b
Fix #3355 - add missing semi-colons
2016-02-19 18:51:25 -06:00
PabstMirror
dffcbc7650
Cleanup events
2016-02-19 15:45:37 -06:00
PabstMirror
44b526ab6d
bodybag - hide player corpse and delete later
...
Fix #1301
2016-02-19 15:41:13 -06:00
PabstMirror
488d24bc01
Fix cargo loading on the big huron containers
2016-02-19 15:30:23 -06:00
PabstMirror
ed653456e5
Merge pull request #3338 from acemod/translations156merge
...
Fix Merge Conflicts on More Italian Translations
2016-02-19 15:09:40 -06:00
esteldunedain
f2566afc73
Another 5m of effect
2016-02-19 15:22:24 -03:00
bux578
d601e50b15
Merge pull request #3350 from gienkov/patch-2
...
medical PL translation
2016-02-19 19:21:15 +01:00
Grzegorz
95250c8ecd
medical PL translation
...
3.5.0 ready
2016-02-19 19:10:59 +01:00
Grzegorz
99e24aab6d
frag PL translation
...
3.5.0 ready
2016-02-19 19:07:00 +01:00
Githawk
5b908b4be8
Adding disconnect EH
2016-02-19 17:32:02 +01:00
Githawk
e925c48798
Adding HandleDisconnect EH and deletion of fuel truck
2016-02-19 17:24:32 +01:00
esteldunedain
b420512139
Fix reduction based on looking away from the grenade
2016-02-19 12:34:50 -03:00
esteldunedain
9e5f52d161
Make units heavily affected by the blast turn away from the light.
2016-02-19 12:33:49 -03:00
