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
13,199 Commits 73 Branches 88 Tags 752 MiB
36c22a9047
Commit Graph

13199 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PabstMirror
36c22a9047 Use local version of setAnimSpeedCoef 2019-05-12 15:36:18 -05:00
PabstMirror
940de99cc5 Update fnc_getBandageTime.sqf 2019-05-12 10:38:18 -05:00
PabstMirror
eef9a37ba9 Treatment - cap max animation speed 
and add lock to prevent AF from reseting anim
 2019-05-12 10:34:12 -05:00
PabstMirror
f9d64d4922 Fix merge 2019-05-12 00:03:43 -05:00
PabstMirror
50caca9923 Merge branch 'master' into medical-treatment-work 2019-05-11 23:56:14 -05:00
classic
7b44138282 Update Japanese translation (#6980) 
* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update stringtable.xml

* fix
 2019-05-11 23:33:49 -05:00
mharis001
7877ce3116 Spectator - Add setting for follow camera max distance (#6989) 
* Add setting for follow camera max distance

* Convert spectator settings to CBA function
 2019-05-11 23:32:13 -05:00
PabstMirror
482c0c769a Merge branch 'master' into medical-treatment-work 
Conflicts:
	addons/medical_status/functions/fnc_initUnit.sqf
	addons/medical_treatment/XEH_postInit.sqf
	addons/medical_treatment/functions/fnc_splint.sqf
	addons/medical_treatment/functions/fnc_treatmentBandageLocal.sqf
	addons/medical_treatment/functions/fnc_treatmentFullHealLocal.sqf
	addons/medical_treatment/functions/fnc_treatmentSurgicalKit_onProgress.sqf
	addons/medical_treatment/functions/fnc_treatment_success.sqf
 2019-05-11 23:15:38 -05:00
PabstMirror
e56cc0d74e
Limping / Splint Treatment (#6947) 
* Improve adjustment calcs / wound blood loss / medications

fix func descriptions

Calc wound blood loss on events

reorder includes so scritpmacroMed has global effect

trivial optimization for getCardiacOutput

Fix var

Fix wounds not reopening (nil _category)

Fix surgical kit inherting canBandage conditional

debug hitpoints

Update ACE_Medical_Treatment_Actions.hpp

Use woundBleeding for IS_BLEEDING macro

rework medication vars

comments

Reset var in init / fullHeal

Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Change wound data array

Drop unique id and merge classId and category

* Splinting and treatment and gui

* Add arm fractures and aim effects

* localizations and event

* fix

* cleanup

* Apply suggestions from code review

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* formating, rename bone images

* Apply suggestions from code review

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* disable calls to extension

* Update fnc_onMedicationUsage.sqf

* Medical - Skip unneeded setVars on initUnit (#6949)

*  Medical - Transfer state machine state on locality (#6950)

* Medical - Transfer state machine state on locality

* Fix feedback isUnconscious var

* Exclude AI

* Make UAV excludes consistant, formating

* Update fnc_treatmentFullHealLocal.sqf

* reset fractures on respawn
 2019-05-11 23:13:59 -05:00
PabstMirror
c924000eb8 Merge branch 'limping' into medical-treatment-work 2019-05-11 23:11:41 -05:00
PabstMirror
6c1cc93519 reset fractures on respawn 2019-05-11 23:11:25 -05:00
PabstMirror
615420a381 Merge branch 'limping' into medical-treatment-work 
Conflicts:
	addons/medical_status/functions/fnc_initUnit.sqf
	addons/medical_treatment/functions/fnc_treatmentFullHealLocal.sqf
 2019-05-11 23:09:16 -05:00
commy2
746d384a04
Merge pull request #6976 from acemod/taking-wheels-from-invincible-vehicles 
Repair - Fix taking wheels from invincible vehicles
 2019-05-11 23:09:59 +02:00
PabstMirror
e36bab38d5 Update fnc_treatmentFullHealLocal.sqf 2019-05-11 15:59:16 -05:00
commy2
588ffba0a3
Merge pull request #6987 from acemod/fix-magwells-rearm 
Fix rearming for vehicles using magazine wells
 2019-05-11 08:38:33 +02:00
BaerMitUmlaut
229199ba16 Fix rearming for vehicles using magazine wells 2019-05-11 01:23:33 +02:00
jonpas
c5f6a6027d Rebuild gh-pages 2019-05-10 13:37:33 +02:00
PabstMirror
366f49295f
Medical Blood - Small optimizations (#6984) 2019-05-08 12:50:00 -05:00
PabstMirror
82bbb965fe Make UAV excludes consistant, formating 2019-05-07 09:39:35 -05:00
PabstMirror
641f3f8a70 Merge branch 'master' into limping 2019-05-07 09:10:03 -05:00
PabstMirror
cdd1de04f0
Medical - Transfer state machine state on locality (#6950) 
* Medical - Transfer state machine state on locality

* Fix feedback isUnconscious var

* Exclude AI
 2019-05-07 09:08:00 -05:00
PabstMirror
a23b22aef6
Medical - Skip unneeded setVars on initUnit (#6949) 2019-05-07 09:07:33 -05:00
Brandon Danyluk
709548c1ef Cookoff - Fix shell detonation (#6979) 
* abc

* Revert "abc"

This reverts commit bcb4214bd9.

* Update to current commit

* ShotShell requires velocity to simulate itself, so always spawn it with velocity
 2019-05-06 10:23:07 -05:00
PabstMirror
5da1308151
Disposable - Add warning for addons using ace_disposable (#6963) 
* Disposable - Add warning for addons using ace_disposable

* update arsenal code and cba version
 2019-05-06 10:05:04 -05:00
BaerMitUmlaut
3cfdae899c Add berlin wall compatibility (#6982) 2019-05-05 19:03:57 -05:00
commy2
dfd7eee681
Merge pull request #6868 from acemod/hideEjectSetting 
Aircraft - add setting to hide Eject action from action menu
 2019-05-03 19:49:41 +02:00
PabstMirror
e4c9440c34
Update addons/aircraft/XEH_preInit.sqf 
Co-Authored-By: commy2 <commy-2@gmx.de>
 2019-05-03 19:13:54 +02:00
commy2
585e919b35 grey out scripted eject action if eject actions are hidden 2019-05-03 17:47:40 +02:00
commy2
58ece34149 manual merge 2019-05-03 17:18:32 +02:00
commy2
64e640bcf2 revert a variable 2019-05-03 17:09:16 +02:00
commy2
744b9778df temporarily re-allowDamage when using setHit(PointDamage) 2019-05-03 17:03:17 +02:00
ace3mod
f8b9429e70 [Docs] Update component dependencies 
Automatically committed through Travis CI.

[ci skip]
 2019-05-03 16:58:44 +02:00
commy2
050cd0a1f9 remove weather dependancy from winddeflection (#6975) 2019-05-03 16:56:56 +02:00
commy2
36688ac040
Merge pull request #6974 from acemod/plusequal-magwells 
+= for magwells
 2019-05-03 16:46:04 +02:00
commy2
fba39bebd0 += for magwells 2019-05-03 13:07:04 +02:00
PabstMirror
6d1eb914c4 Update fnc_onMedicationUsage.sqf 2019-05-02 11:25:08 -05:00
PabstMirror
1c4ee3e804 disable calls to extension 2019-04-30 11:15:06 -05:00
mharis001
796d71c594
Apply suggestions from code review 
Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
 2019-04-27 14:50:15 -05:00
PabstMirror
94afb63caf Merge branch 'master' into limping 2019-04-27 14:15:32 -05:00
ace3mod
0e09879528 [Docs] Update component dependencies 
Automatically committed through Travis CI.

[ci skip]
 2019-04-27 21:14:30 +02:00
PabstMirror
847d2d4179
Medical - Improve adjustment calcs / wound blood loss / medications (#6910) 
* Improve adjustment calcs / wound blood loss / medications

fix func descriptions

Calc wound blood loss on events

reorder includes so scritpmacroMed has global effect

trivial optimization for getCardiacOutput

Fix var

Fix wounds not reopening (nil _category)

Fix surgical kit inherting canBandage conditional

debug hitpoints

Update ACE_Medical_Treatment_Actions.hpp

Use woundBleeding for IS_BLEEDING macro

rework medication vars

comments

Reset var in init / fullHeal

Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
 2019-04-27 14:12:11 -05:00
PabstMirror
6e71338e3a Fix args for setDead call in actionPlaceInBodyBag 2019-04-27 14:10:12 -05:00
PabstMirror
7b641508e9 Merge branch 'master' into medical-treatment-work 2019-04-27 14:06:31 -05:00
PabstMirror
2cfe7ebd0c
FCS - Skip adding firedEH until needed (#6965) 2019-04-27 14:04:47 -05:00
PabstMirror
0d7709673a
Medical Feedback - Fix DISABLE_VANILLA_DAMAGE_EFFECTS (#6966) 
* Medical Feedback - Fix DISABLE_VANILLA_DAMAGE_EFFECTS

* Keep compatibilty with old ace_medical_lastDamageSource var name
 2019-04-27 14:04:31 -05:00
PabstMirror
65601b4081 Merge branch 'limping' of https://github.com/acemod/ACE3 into limping 2019-04-27 11:11:10 -05:00
PabstMirror
fe07ea026c formating, rename bone images 2019-04-27 11:10:51 -05:00
mharis001
9fe16f8049
Apply suggestions from code review 
Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
 2019-04-27 11:08:08 -05:00
PabstMirror
338772bcc6 cleanup 2019-04-27 09:33:30 -05:00
Dedmen Miller
50e3d8b3fe Fix macro argument counts (#6962) 2019-04-27 06:05:29 -07:00