Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,578 Commits 73 Branches 88 Tags 752 MiB
811e1cd598
Commit Graph

8698 Commits

Author SHA1 Message Date
Glowbal
811e1cd598 First set up clean up for medical rewrite 2016-09-18 12:05:36 +02:00
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
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
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 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
Ozan Eğitmen
2880c6152a Delete "Group Side" module after use 2016-09-16 01:34:32 +03: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
BaerMitUmlaut
1601f6a7b7 Disable medical AI for remote controlled AI 2016-09-12 17:06:14 +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
BaerMitUmlaut
b1f91f8cf5 Use directCall on tripflare effect 2016-09-08 21:22:32 +02:00
Glowbal
ebdc883855 Prepare 3.7.0 RC5 2016-09-07 21:35:58 +02:00
PabstMirror
0d81ce34e2 Fix stop gesture keybind (#4354) 2016-09-07 21:07:51 +02:00
PabstMirror
1caea46d60 Medical - Fix adv wound not stacking (#4353) 2016-09-07 20:54:54 +02:00
jonpas
13df3efce2 Prepare 3.7.0 RC4 2016-09-06 22:56:22 +02:00
commy2
6e99e8a951 don't let tripod fall over as easily (#4352) 2016-09-06 21:55:23 +02:00
PabstMirror
1a4ed7b7b4 Grenades - disable throw mode / keybind if advThrow (#4350) 2016-09-06 21:54:42 +02:00
commy2
5cd9b56866 don't let tripod fall over as easily (#4352) 2016-09-06 21:53:38 +02:00
PabstMirror
a320a56813 Fix blood bags not showing in medical menu (#4351) 
fix #4306
 2016-09-06 21:52:22 +02:00
PabstMirror
4781903be6 Add setting for medical ai 2016-09-06 21:48:46 +02:00
PabstMirror
ec4c2276a5 Add setting for medical ai 2016-09-05 22:35:01 -05:00
Glowbal
89a5f28772 Merge pull request #4192 from acemod/medical-rewrite-engine-component 
merge medical engine component into medical rewrite branch
 2016-09-05 22:31:37 +02:00
Glowbal
f3dc1afdbf Prepare 3.7.0 RC3 2016-09-05 22:27:30 +02:00
PabstMirror
4fd5d6be6c Fix handleDamage params for addDamageToUnit (#4344) 2016-09-05 22:27:00 +02:00
BaerMitUmlaut
a096439f36 Moved particles component to optionals (#4341) 2016-09-05 20:50:30 +02:00
PabstMirror
a585a36ced Add ace mags to 7.62 SPAR_03 (#4340) 2016-09-05 20:33:12 +02:00
jonpas
2034234940 Refuel nozzle taking, disconnecting, connecting and returning interaction fixes (#4337) 
* Prevent taking or disconnecting a nozzle if already carrying one

* Fix multiple nozzle connect actions, Fix returning nozzle into a vehicle being refueled
 2016-09-05 20:23:28 +02:00
jonpas
2474da36b3 Fix pick up delay and IR chemlights, prevent picking up GL and mortar smoke shells (#4336) 
* Fix pick up interaction not rendering right after throw, Prevent GL rounds from being picked up

* Prevent picking up GL and mortar smoke shells

* Fix pick up delay properly, Add separate define for quick throwing (for use when debugging)

* Fix forgotten rename in IR chemlight handling
 2016-09-05 20:23:03 +02:00
Glowbal
be8b4468af Increment build number 2016-09-05 08:27:58 +02:00
PabstMirror
7055b242e4 Fix AF author String (#4330) 2016-09-04 22:34:48 +02:00
PabstMirror
f21d45392f SPAR use ACE Magazines - Fix #4207 (#4329) 2016-09-04 21:56:05 +02:00
Glowbal
849a2cd475 Prepare 3.7.0 2016-09-04 21:51:36 +02:00
Glowbal
5034dffec8 Fix build error with make 2016-09-04 21:51:13 +02:00
BaerMitUmlaut
cc414de8d1 Add Advanced Fatigue component (#4321) 
* Initial commit advanced fatigue

* Added animation changes

* Fixes, rewrites

* Broadcast 3den attribute and fix UBC

* Further animation tweaks

* Added Eden attribute and CBA settings

* Switch to CBA events

* Add beautified component name

* Rewrites, fixes, tweaks

* Move setVars to GVARs

* Add setting to disable

* Switch to status effect handler for sprint and jog blocking

* Add component name

* Failsafe for early unit player EH

* Removed raised weapon penalty for pistols

* Added respawn compatibility

* Tweaked side jog animation speed

* Added support for virtual load

* Added stamina bar

* Remove debug flags

* Added custom duty factor functions and values

* Added structural comments

* Disabled CBA settings, added ACE settings

* Fixed config

* Added readme

* Remove leftover debug diag_logs

* Improved stringtable
 2016-09-04 21:33:07 +02:00
PabstMirror
7314f863f6 Add spare barrel to VA in 1.64 (#4328) 
Close #4325
 2016-09-04 21:26:15 +02:00
PabstMirror
0848b6d1de Fix script errors (#4327) 2016-09-04 21:03:52 +02:00
BaerMitUmlaut
8a47d7a9b6 Add fade nametags towards screen border (#4316) 
* Fade nametags towards screen border

* Use distance2D instead of vector commands

* Don't calculate fade when off screen

* Made fade on border optional
 2016-09-04 20:50:12 +02:00