Glowbal
0c43c83b3d
Merge branch 'master'
...
Conflicts:
addons/medical/ACE_Settings.hpp
addons/medical/XEH_postInit.sqf
addons/medical/XEH_preInit.sqf
addons/medical/functions/fnc_actionDiagnose.sqf
addons/medical/functions/fnc_actionLoadUnit.sqf
addons/medical/functions/fnc_addDamageToUnit.sqf
addons/medical/functions/fnc_createLitter.sqf
addons/medical/functions/fnc_displayPatientInformation.sqf
addons/medical/functions/fnc_handleCreateLitter.sqf
addons/medical/functions/fnc_handleDamage.sqf
addons/medical/functions/fnc_handleDamage_advanced.sqf
addons/medical/functions/fnc_handleDamage_airway.sqf
addons/medical/functions/fnc_handleDamage_caching.sqf
addons/medical/functions/fnc_handleDamage_internalInjuries.sqf
addons/medical/functions/fnc_handleDamage_wounds.sqf
addons/medical/functions/fnc_isBeingCarried.sqf
addons/medical/functions/fnc_isBeingDragged.sqf
addons/medical/functions/fnc_litterCleanupLoop.sqf
addons/medical/functions/fnc_moduleAssignMedicRoles.sqf
addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf
addons/medical/functions/fnc_setCardiacArrest.sqf
addons/medical/functions/fnc_showBloodEffect.sqf
addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf
addons/medical/functions/fnc_treatmentAdvanced_surgicalKit_onProgress.sqf
addons/medical/functions/fnc_treatmentBasic_epipen.sqf
addons/medical/functions/fnc_treatmentIV.sqf
addons/medical/functions/fnc_treatmentIVLocal.sqf
2016-09-18 11:51:21 +02:00
commy2
2b4c5f9c49
auto add blown off turrets to curator
2016-09-18 11:31:28 +02:00
PabstMirror
32b7ef7b85
Skip incindinary effects if projectile is null
2016-09-17 13:09:03 -05:00
commy2
95409f6772
Merge pull request #4383 from acemod/support-disable-cookoff
...
Add object attribute to disable cookoff for individual vehicles
2016-09-17 18:50:34 +02:00
commy2
d5edc5a1f5
Merge pull request #4411 from acemod/burn-wheels
...
incendiary and cookoff improvements
2016-09-17 18:30:08 +02:00
commy2
e02516e5b5
invert reverted inverted
2016-09-17 18:08:08 +02:00
commy2
3d18374747
add object 3den setting for disabling cook off effects
2016-09-17 17:47:29 +02:00
Glowbal
e8f55348d8
Add ACE2 sys_Blood port
2016-09-17 16:52:25 +02:00
SilentSpike
e3d26c535a
Merge pull request #4368 from 654wak654/delete-teleport-module
...
Delete "Teleport Players" module after use
2016-09-17 11:52:38 +01:00
Glowbal
48a198fea4
Add support for disabling cookoff for individual vehicles
2016-09-17 12:13:43 +02:00
Ozan Eğitmen
56751eff0e
Revert "Delete "Group Side" module after use"
...
This reverts commit 2880c6152afd69e488de15ed44dfde0f70adacec.
2016-09-17 01:01:37 +03:00
classicarma
0d4a0a52ba
translate gunbag
2016-09-17 01:47:01 +09:00
classicarma
7f208e094d
translate grenades
2016-09-17 01:46:51 +09:00
classicarma
5c160db023
translate goggles
2016-09-17 01:46:34 +09:00
classicarma
3605778d60
translate gforces
2016-09-17 01:46:19 +09:00
classicarma
1e28c16ba2
translate gestures
2016-09-17 01:46:09 +09:00
classicarma
5fc3b05c21
translate frag
2016-09-17 01:46:00 +09:00
classicarma
f9e44a2820
translate flashsuppressors
2016-09-17 01:45:47 +09:00
classicarma
32939571e5
translate flashlights
2016-09-17 01:45:34 +09:00
classicarma
6312a19dd6
translate finger
2016-09-17 01:45:24 +09:00
classicarma
d1e57f9678
translate fcs
2016-09-17 01:45:14 +09:00
classicarma
47bd4e9991
translate fastroping
2016-09-17 01:44:56 +09:00
classicarma
4fabf8b1f1
translate exolosives
2016-09-17 01:44:45 +09:00
classicarma
647ad8c681
translate dragging
2016-09-17 01:44:37 +09:00
classicarma
4827a18aa0
translate digtags
2016-09-17 01:44:30 +09:00
classicarma
99c5122120
translate disarming
2016-09-17 01:44:22 +09:00
classicarma
dfa5a745a0
translate dagr
2016-09-17 00:58:02 +09:00
classicarma
24d365fa5d
translate cookoff
2016-09-17 00:57:49 +09:00
classicarma
83a18e84de
translate concertina_wire
2016-09-17 00:57:40 +09:00
classicarma
e767d65cfb
translate common
2016-09-17 00:57:27 +09:00
classicarma
e6b2cc8a74
translate chemlights
2016-09-17 00:57:17 +09:00
classicarma
78ee33b46f
translate cargo
2016-09-17 00:57:09 +09:00
classicarma
fb48edb667
translate captives
2016-09-17 00:57:00 +09:00
classicarma
53bee76f8d
translate ballistics
2016-09-17 00:56:53 +09:00
classicarma
23d70fb6f0
translate attach
2016-09-17 00:56:45 +09:00
classicarma
1e1c202f96
translate atragmx
2016-09-17 00:56:36 +09:00
classicarma
4003b1486b
translate advanced_throwing
2016-09-17 00:56:25 +09:00
classicarma
892af25bac
translate advanced_fatigue
2016-09-17 00:56:13 +09:00
classicarma
4fd92b534a
translate advanced_ballistics
...
This reverts commit 65bfee0f9481313599c654b69ca2a0370077f3ea.
translate advanced_ballistics
2016-09-17 00:55:53 +09:00
commy2
3cea9e727d
fix a comment
2016-09-16 14:00:43 +02:00
commy2
a487c5e89f
offset for quad engine smoke, delete destroyed RepairItem s
2016-09-16 13:51:41 +02:00
commy2
d200eadb46
incendiary and cookoff improvements
2016-09-16 13:08:19 +02:00
classicarma
524312dce3
translate aircraft
2016-09-16 19:49:08 +09:00
classicarma
53e50f4f91
translate disposable
2016-09-16 12:01:26 +09:00
Ozan Eğitmen
2880c6152a
Delete "Group Side" module after use
2016-09-16 01:34:32 +03:00
PabstMirror
bbcc82acf6
Tweak fatgiue duty factors
2016-09-13 16:56:06 -05:00
PabstMirror
b81ccca3f7
Captives - rewrite findEmptyNonFFVCargoSeat ( #4348 )
...
Simplify func using `fullCrew`
Fix #4339
also switch hard `ERROR(` macro to `WARNING(`
2016-09-13 16:52:51 -05:00
Glowbal
65cdf200fb
Merged branch release into master
2016-09-13 21:28:22 +02:00
Glowbal
4ae4fca852
Prep 3.7.0 release
2016-09-12 19:47:31 +02:00
jonpas
0400a857e6
Fix Advanced Throwing vanilla throw block for primed throwables ( #4370 )
...
* Fix vanilla throwing block failing after priming, simplify muzzle ammo (can only be 1 or 0, 1 doesn't influence anything if no appliccable throwable in inventory)
* Disable select grenade keys when advanced throwing is active
* Fix #4375 - select next grenade cycles between first 2 grenade muzzles due to setAmmo
2016-09-12 19:21:04 +02:00
