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
01a586e9c2
Also fix release url display
2016-09-17 17:45:30 +02:00
Glowbal
24142f6879
Fix release url
2016-09-17 17:45:06 +02:00
Glowbal
1bd30c4b85
Add ace_blood documentation
2016-09-17 16:54:21 +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
bux578
3da236def8
Update 2016-09-17-ace3-version370.md
2016-09-17 12:22:17 +02:00
bux578
6fe31e6be6
Rename 2016-09-12-ace3-version370.md to 2016-09-17-ace3-version370.md
2016-09-17 12:16:51 +02:00
bux578
1ea99c6ab1
Merge pull request #4384 from acemod/acerep-6
...
ACEREP 00006
2016-09-17 12:15:52 +02:00
Glowbal
5134c16dd0
Add cookoff documentation
2016-09-17 12:15:08 +02:00
Glowbal
48a198fea4
Add support for disabling cookoff for individual vehicles
2016-09-17 12:13:43 +02:00
ace3mod
b8948ec296
[Docs] Update component dependencies
...
Automatically committed through Travis CI.
[ci skip]
2016-09-17 11:41:48 +02:00
jonpas
fda10f0e7b
Add optionals support to extract dependencies tool, Add more checks if folders are present ( #4394 )
2016-09-17 11:40:50 +02:00
Glowbal
1d637476c9
ACEREP #00006
2016-09-17 11:27:52 +02:00
Ozan Eğitmen
56751eff0e
Revert "Delete "Group Side" module after use"
...
This reverts commit 2880c6152a
2016-09-17 01:01:37 +03: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
bux578
87b3308b0f
Merge pull request #4409 from acemod/fixDepListNoPrefix
...
Fix dependencies list prefix that shouldn't exist
2016-09-16 08:11:36 +02:00
jonpas
2ca67e16a8
Fix dependencies list prefix - there shan't be one!
2016-09-16 03:33:20 +02:00
Ozan Eğitmen
2880c6152a
Delete "Group Side" module after use
2016-09-16 01:34:32 +03:00
BaerMitUmlaut
35f1862a43
Merge pull request #4407 from acemod/medical-ai-doc
...
Medical AI documentation
2016-09-15 22:49:03 +02:00
BaerMitUmlaut
afd1ae0879
Added note regarding basic medical
2016-09-15 22:47:21 +02:00
BaerMitUmlaut
bbce8e397e
Added medical AI documentation
2016-09-15 14:08:03 +02:00
bux578
1eac4ab135
Merge pull request #4397 from acemod/fix-doc-blank-space
...
Escape jekyll code in documentation guidelines page
2016-09-15 07:21:22 +02:00
jonpas
471cc2fdb5
Escape jekyll code in documentation guidelines page
2016-09-14 21:30:43 +02: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
ace3mod
39ffdff920
[Docs] Update component dependencies
...
Automatically committed through Travis CI.
[ci skip]
2016-09-13 21:56:07 +02:00
Glowbal
99c9e80d9f
Fix broken extract_dependencies script
2016-09-13 21:54:11 +02:00
ace3mod
3280dba5be
Revert "[Docs] Update component dependencies"
...
This reverts commit a5577b27f6
2016-09-13 21:35:29 +02:00
ace3mod
a5577b27f6
[Docs] Update component dependencies
...
Automatically committed through Travis CI.
[ci skip]
2016-09-13 21:31:51 +02:00
Glowbal
4c8466a790
Set release version
2016-09-13 21:28:34 +02: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
BaerMitUmlaut
e85abbe746
Merge pull request #4378 from acemod/disable-medical-ai-on-remotecontrol
...
Disable medical AI for remote controlled AI and players
2016-09-12 17:09:26 +02:00
BaerMitUmlaut
1601f6a7b7
Disable medical AI for remote controlled AI
2016-09-12 17:06:14 +02:00
BaerMitUmlaut
08c995096b
Merge pull request #4382 from acemod/onlyTheDeadHaveSeenTheEndOfFatigue
...
Exit fatiuge loop when dead (don't play breathing sound)
2016-09-12 14:04:18 +02:00
PabstMirror
9844ae32c9
Exit fatiuge loop when dead (don't play breathing sound)
2016-09-11 22:03:20 -05:00
commy2
bfb88efe9a
Fix script error in cargo drop function ( #4369 )
2016-09-10 21:21:09 +02:00
Ozan Eğitmen
d533bd1663
Delete "Teleport Players" module after use
2016-09-10 15:33:19 +03:00
Glowbal
04dd0412ff
Prepare 3.7.0 RC6
2016-09-09 11:43:40 +02:00
jonpas
062f6deec8
Fix Advanced Throwing floating IR grenades and block vanilla throwing ( #4365 )
...
* Fix #4362 - floating primed IR grenades
* Fix #4363 - block vanilla throwing while prepared
* Respect last thrown time with vanilla throwing and dropping primed throwable,
2016-09-09 11:00:30 +02:00
