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,465 Commits 73 Branches 88 Tags 752 MiB
316fbfe7b9
Commit Graph

13465 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PabstMirror
366f49295f
Medical Blood - Small optimizations (#6984) 2019-05-08 12:50:00 -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
e05c90767d Merge branch 'master' into cbaDisposable 2019-05-06 10:07:58 -05:00
PabstMirror
5eead2fc6e Merge branch 'master' into cbaDisposable 2019-05-06 10:05:35 -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
commy2
2cffe92848 don't disable remove mag if disposable replacement is disabled 2019-04-28 10:04:42 +02:00
commy2
9b57ef2111 adjustments for disposable enabled setting 2019-04-28 09:56:42 +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
PabstMirror
5265e8bd84 Merge branch 'cbaDisposable' of https://github.com/acemod/ACE3 into cbaDisposable 2019-04-26 16:41:45 -05:00
PabstMirror
6250cd6505 Arsenal - Don't unload disposables 2019-04-26 16:41:42 -05:00
commy2
534abdede1 nlaw disposable realistic weight 2019-04-26 23:31:56 +02:00
commy2
6af3628e6f fix baseWeapon 2019-04-26 19:19:34 +02:00
commy2
20853d2b20 let cba replace mags 2019-04-26 09:48:31 +02: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
commy2
cfe40ccd3f fix launchers in cargo 2019-04-25 18:30:35 +02:00
commy2
d3f9280e5d fix some copy paste leftovers 2019-04-21 19:03:42 +02:00
commy2
74229224d6 switch NLAW to CBA disposable system 2019-04-21 18:58:20 +02: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