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,150 Commits 73 Branches 88 Tags 752 MiB
709548c1ef
Commit Graph

13150 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Dedmen Miller
50e3d8b3fe Fix macro argument counts (#6962) 2019-04-27 06:05:29 -07:00
Filip Maciejewski
cc22e95012 Fastroping - Remove FRIES on vehicle deletion / adjust Ghosthawk Fries (#6932) 
* fastroping_fnc_deequipFRIES, remove FRIES on vehicle deletion

* Prevent FRIES from clipping into Ghost Hawk right door

* UNequipFRIES

* Remove fastroping checkVehicleThread

* Document FRIES equip and unequip functions
 2019-04-25 13:31:36 -05:00
PabstMirror
83cd316b2e
Common - Don't add UAV AI to localUnits array (#6951) 
* Common - Don't add UAV AI to localUnits array

* Update addons/common/functions/fnc_setupLocalUnitsHandler.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
 2019-04-25 13:30:43 -05:00
PabstMirror
15401468b9
Refuel - Drop nozzle at unit's feet if no valid pos found (#6957) 
* Refuel - Drop nozzle at unit's feet if no valid pos found

Fix #6944

* Update fnc_dropNozzle.sqf

* Update addons/refuel/functions/fnc_dropNozzle.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
 2019-04-25 13:28:11 -05:00
PabstMirror
1f1d950588
Map - Don't enable map light for parachutes (#6961) 2019-04-25 13:27:53 -05:00
Josuan Albin
28ac653635
Merge pull request #6953 from acemod/cba-disposable-compat 
compatibility with CBA disposable framework
 2019-04-19 14:36:08 +02:00
commy2
07ee2c1d3d compatibility with CBA disposable framework 2019-04-19 14:33:57 +02:00
PabstMirror
56811403f2
Medical - add eh for setUnconscious helper func (#6937) 2019-04-16 16:47:13 -05:00
Josuan Albin
17f4af37fa
Merge pull request #6936 from alganthe/fixArsenalNVGBlacklist 
[ACE Arsenal] Fix NVGs not being subject to blacklisting in loadouts
 2019-04-12 17:29:34 +02:00
Josuan Albin
8fe02a455f Fix #6935 2019-04-12 14:39:28 +02:00
PabstMirror
69dc73ee45 Medical Feedback - fix heart rate effect (#6927) 
* Medical Fedback - fix heart rate effect

and limit setVar for acre/tfar

* Apply suggestions from code review

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

* Update XEH_postInit.sqf

* use "task_force_radio"
 2019-04-09 10:51:59 -07:00
PabstMirror
0926d8508c Ballistics - Remove ace mags from incompatible weapons (#6930) 
Close #6924

Co-Authored-By: drofseh <drofseh@users.noreply.github.com>
 2019-04-09 10:44:20 -07:00
Rutger "RedBery" Meijering
c392236843 Medical activity to non local units is not logged (#6925) 
* Fixes medical events not appearing in MP (when unit is non local)
Adds name to AUTHORS.txt (forgot to do this in other PRs)

* Fixes missing oef line

* Update addons/medical_treatment/XEH_postInit.sqf

Co-Authored-By: redbery <rutger@meijering.me>

* delete rogue character
 2019-04-07 17:41:28 -05:00
PabstMirror
641dee39bd Fix trivial bugs (#6922) 2019-04-07 14:22:25 +02:00
Josuan Albin
d2172c5060
Merge pull request #6921 from acemod/compatCBA2DOptics 
compatibility with CBA scripted 2d optics framework
 2019-04-03 20:46:36 +02:00
commy2
c63310be95 compatibility with CBA scripted 2d optics framework 2019-04-03 20:41:15 +02:00
commy2
039ca9a053 compatibility with CBA scripted 2d optics framework 2019-04-03 20:39:11 +02:00
PabstMirror
6d50667359
Fastroping - Add user setting to confirm cutting ropes (#6876) 
* Fastroping - Add user setting to confirm cutting ropes

* always confirm

* fix

* Update stringtable.xml
 2019-04-03 12:18:55 -05:00
PabstMirror
ece1031c4d
RHS Compat - Add 2 round hellfire to pylon options (#6893) 
* RHS Compat - Add 2 rnd hellfire pylon

Close #5957

* change magwell name

* gvar->addon
 2019-04-03 11:40:14 -05:00
PabstMirror
9588b13942 Zeus/Medical - Fix modules for rewrite (#6914) 
* Zeus/Medical - Fix modules for rewrite

* move wakeup logic to medical_treatment
 2019-04-03 06:17:17 -07:00
Katalam
55a7d53437 Medical - Add condition for surgicial kit (#6916) 
* Added condition canStitch

* Update XEH_PREP.hpp

* Update addons/medical_treatment/functions/fnc_canStitch.sqf

Co-Authored-By: Katalam <39590058+Katalam@users.noreply.github.com>

* Added example, removed arguments information and changed > to isEqualTo

* Added example in canBandage too
 2019-04-03 04:36:37 -07:00
Magnetar
24a533b968 Prevent opening the medical menu if the player is unconscious (#6915) 2019-04-02 08:57:28 -05:00
Dystopian
db6dadb78f Fix config (#6905) 2019-04-01 09:45:36 -05:00
PabstMirror
b907c9d547
Medical - Add self interaction when needed (#6912) 
* Medical - Add self interaction when needed

* Update addons/medical_gui/XEH_postInit.sqf

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

* Update addons/medical_gui/XEH_postInit.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
 2019-04-01 09:40:02 -05:00
brainslush
978049eab1 Add keep engine of vehicles running after getting out (#6885) 
Adds a feature which leaves the vehicle engine running after getting out. So, it requires the driver to switch off the engine of the vehicle.
 2019-04-01 11:17:18 +02:00
PabstMirror
3769679237
Add tool to verify stringtable entries exist (#6889) 
* Add tool to verify stringtable entries exist

* Update circle.yml

* test

* Allow running from root directory as well as from inside the tools directory
 2019-03-31 15:27:51 -05:00
PabstMirror
c7e6549eb2
Cookoff - Reword settings and move to cba (#6892) 
* Cookoff - Reword settings and move to cba

* Update stringtable.xml
 2019-03-30 21:54:12 -05:00
PabstMirror
0052dd3af2
Interaction - Pass Magazine fixes (#6894) 
Use CBA_fnc_compatibleMagazines
Fix nil return if no mags
Ensure target canAdd
 2019-03-30 20:49:59 -05:00
mharis001
30b99fa20a Medical Rewrite - Remove dropDownTriageCard function (#6907) 
* Remove dropDownTriageCard function

* Delete fnc_updateTourniquets.sqf
 2019-03-30 16:06:36 -05:00
SilentSpike
ac1651c6db Prevent bandaging when not bleeding (#6532) 2019-03-30 15:44:58 -05:00
ace3mod
2ea534ae1a [Docs] Update component dependencies 
Automatically committed through Travis CI.

[ci skip]
 2019-03-30 21:21:39 +01:00
PabstMirror
16ed2a82c2
Merge pull request #4064 from acemod/medical-rewrite 
Medical rewrite
 2019-03-30 15:20:15 -05:00
PabstMirror
f2b9bf3a17 Update headers 2019-03-30 11:07:54 -05:00
PabstMirror
7f2ac32180 Fix event for items conversion 2019-03-30 09:56:21 -05:00
Rutger "RedBery" Meijering
f0fb267501 Include medical_feedback settings.sqf file (#6903) 2019-03-30 14:19:41 +00:00