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 |
|
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 |
|
bux578
|
ecf2cd58ca
|
Merge pull request #3351 from gienkov/patch-1
frag PL translation
|
2016-02-19 19:21:04 +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 |
|
esteldunedain
|
0f7853f6c6
|
Increase the maximum range for blinding effect to 25m, but with a high falloff. Close #1539
|
2016-02-19 12:18:22 -03:00 |
|
esteldunedain
|
648a0259ec
|
Improve flashbang effects. Make sure the light effect is rendered even if the grenade explodes further than 20m from the player. Increase the amount of hearing damage.
|
2016-02-19 12:02:29 -03:00 |
|
Thomas Kooi
|
95532ea521
|
Merge pull request #3333 from acemod/medicalEvents
Replace execRemoteFnc in ace_medical
|
2016-02-19 12:00:00 +01:00 |
|
commy2
|
e66dafeab9
|
Merge pull request #2339 from acemod/322jump
don't force free looking while jumping
|
2016-02-19 11:54:30 +01:00 |
|
commy2
|
08e09d5cbd
|
manual merge
|
2016-02-19 11:50:17 +01:00 |
|
commy2
|
97008d8fc3
|
Merge pull request #3131 from acemod/removedep
remove deprecated functions
|
2016-02-19 11:48:20 +01:00 |
|