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
15,408 Commits 73 Branches 88 Tags 752 MiB
0a6046627b
Commit Graph

15408 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
johnb432
0a6046627b Merge branch 'fire-refactor' into add-fire-sources-to-wrecks 2024-06-06 10:21:47 +02:00
johnb432
a4968b52d7 Minor tweaks and cleanup 2024-06-06 10:21:17 +02:00
johnb432
209d3ff1b8 Update XEH_postInit.sqf 2024-06-06 10:00:57 +02:00
johnb432
8c3dacc74c Update fnc_cookOffServer.sqf 2024-06-05 22:24:38 +02:00
johnb432
dcbefb23b5 Merge branch 'master' into fire-refactor 2024-06-05 22:24:33 +02:00
johnb432
c44a1e7ea7
Cookoff - Mini-Rewrite (#9758) 
* Cook-off improvements

* More changes

* Update fnc_getVehicleAmmo.sqf

* Better engine fire placement

* Update fnc_detonateAmmunition.sqf

* Update XEH_postInit.sqf

* Update fnc_getVehicleAmmo.sqf

* Update events-framework.md

* Various improvements

* Separate effect handling

* Tweaks

* Update XEH_postInit.sqf

* Prevent double ammo detonation

* Fixed objects not being able to cook-off again

* Added incendiary rounds as source of box cookoff

* Converted enable setting to bool

* Fixed brackets

* Update fnc_cookOff.sqf

* Update CfgEden.hpp

* Removed GVAR(enable), added GVAR(enableFire) back

* Update initSettings.inc.sqf

* Update events-framework.md

* Update addons/cookoff/functions/fnc_cookOffEffect.sqf

* Restructured, redid API events

* Fix effect for JIP, minor optimisations

* Removed `cbaSettings_settingChanged`

* Renamed variables, tweaked string table entries

* Update fire damage #9991

* Capitalize comments again

* Fix cookoff for very short durations and fix effect removal being too quick
 2024-06-05 12:36:39 -07:00
johnb432
73111fa0fd
Nametags - Add documentation (#10055) 
Create nametags-framework.md
 2024-06-05 08:51:14 -07:00
johnb432
738a32dba9
Gunbag - Optimise weapon taking/storing code (#10053) 
Optimise gunbag code
 2024-06-05 06:22:19 -07:00
johnb432
06f47e600d
Cookoff - Change cook-off fire damage (#9991) 
Increase cookoff fire damage
 2024-06-05 06:22:09 -07:00
johnb432
de652d5382 Update comment to bring up to standard 2024-06-05 08:54:38 +02:00
johnb432
29728352e2
Rearm - Optimise getting magazine names (#10052) 
* Optimise getting rearm magazine names

* Replace using regex and localize CSW entries

* Added comments about prefix
 2024-06-04 23:32:41 -07:00
Mike-MF
7c689bdff7
Compat WS - Update realistic names (#10014) 
* Compat WS - Update realistic names

* Fix duplicate class

* WS 1.1.3

* alter SLR para barrel length

* RPG-32
 2024-06-03 05:52:59 -07:00
PabstMirror
fe9f59bed7
Refuel - Fix for SOG/SPE (#10049) 
* Refuel - Fix SOG/SPE Compats

* fix export

* Added missing fuel sources, improved some existing hook positions

* Removed outdated todo

* Add default code if refuel isn't loaded

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-06-03 02:00:12 -07:00
johnb432
94acbf2dc9 Update initSettings.inc.sqf 2024-06-02 12:23:45 +02:00
johnb432
acc9e09de1 Merge branch 'master' into fire-refactor 2024-06-02 12:21:39 +02:00
johnb432
0f24464658 Minor tweaks 2024-06-02 12:21:29 +02:00
johnb432
a93c0b46a3 Added TRACE macros 2024-06-02 12:19:28 +02:00
johnb432
48f3d192e2 Update compats 2024-06-02 12:00:38 +02:00
johnb432
60eabda47e
Vehicle Damage - Add API to prevent AI from dismounting from immobile vehicles (#9990) 
* Add API to prevent AI from dismounting from immobile vehicles

* Update vehicledamage-framework.md
 2024-06-01 09:55:56 -07:00
johnb432
99bb6983bb
Common - Improve addWeapon (#10051) 
Improve `addWeapon`
 2024-06-01 09:52:18 -07:00
johnb432
1cca2db964
General - Cleaned up cbaSettings_settingChanged (#10050) 
Adapted `cbaSettings_settingChanged`
 2024-05-31 13:20:21 -07:00
johnb432
dc56cdbd8b
Vehicle Damage - Fix applying medical damage to non-local and invulnerable units (#9988) 
* Make medical damage apply to non-local units

* Update addons/vehicle_damage/functions/fnc_medicalDamage.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* Update addons/vehicle_damage/functions/fnc_medicalDamage.sqf

* Update fnc_medicalDamage.sqf

* Specify reason for death

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2024-05-31 13:15:46 -07:00
johnb432
9f2ee9fb6f
Common - Add setDead API (#10045) 
* Added `setDead` API

* Update XEH_PREP.hpp

* Update fnc_setDead.sqf

* Update addons/common/functions/fnc_disableUserInput.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Update fnc_setDead.sqf

* Added warning for non-local units

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-05-31 13:07:50 -07:00
PabstMirror
5a1e3bc585
Zeus - Add a translation (#10047) 2024-05-30 07:58:46 -05:00
PabstMirror
d30c01aee9
Hearing - prevent audio from stacking when tabbed out (#10048) 2024-05-30 01:34:19 -07:00
johnb432
98f4b51c52
Hearing - Fix deafness reducing when game is paused (#10039) 
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-05-29 18:55:17 +00:00
Mike-MF
d9a2aa01a4
Realistic Names - Add missing classes (#10013) 
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-05-29 15:51:18 -03:00
Fabio Schick
8c0d0944c6
Parachute - Make Jet Ejection Seats use Non-Steerable Parachutes (#9963) 2024-05-29 15:50:18 -03:00
johnb432
120589512e
Headless - Improve group transfer and add API (#9874) 2024-05-29 15:49:59 -03:00
mharis001
440b9d5721
Zeus - Add spectator module (#6202) 
Co-authored-by: Ozan Eğitmen <ozan@egitmen.net>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-05-29 15:48:34 -03:00
johnb432
0034f4b9cc
Arsenal - Fix insignia not reapplying after switching vests & backpacks (#10046) 
Fix insignia not reapplying
 2024-05-29 11:40:41 -07:00
johnb432
e535988479
Hearing - Code cleanup (#10041) 
* Hearing cleanup

* Update fnc_updateHearingProtection.sqf

* Fixes + tweaks

* Update initSettings.inc.sqf

* Update fnc_removeEarplugs.sqf
 2024-05-29 10:01:39 -07:00
johnb432
be61424fed
Hearing - Fix volume being force updated when loadouts are set on AI (#10044) 
* Update XEH_preInit.sqf

* Update XEH_preInit.sqf
 2024-05-29 08:40:32 -07:00
johnb432
be9797d11d
Grenades - Add grenade rolling (#10005) 
* Add grenade rolling

* Added some safeguards

* Use `setVectorDirAndUp` instead of rotation

* Don't allow players to roll grenades when in vehicles

* Grenades - Rolling only add PFEH when needed (#10015)

* Grenades - Rolling only add PFEH when needed

* Corrected minor typo, moved variable init in preInit, fixed bugs

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Don't switch modes if grenade can't be thrown

* Minor tweaks

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2024-05-27 02:19:52 -07:00
johnb432
9546ca2963 Update fnc_cookOffEffect.sqf 2024-05-26 10:08:10 +02:00
johnb432
4b3d28338c Update XEH_PREP.hpp 2024-05-26 10:04:03 +02:00
johnb432
201366cb7f Merge branch 'master' into fire-refactor 2024-05-26 10:03:30 +02:00
JonBons
be77ef233e
Cookoff - Delay full vehicle destruction (#9061) 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-05-24 20:06:33 -03:00
johnb432
d7c1984a5a
Grenades - Fix not being able to switch throw modes in FFV (#10012) 2024-05-24 20:06:13 -03:00
johnb432
dc3753893f
Hearing - Improve and cleanup code (#9933) 
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-05-24 20:05:19 -03:00
PabstMirror
22c6621878
Refuel - Cleanup compats (#10011) 
* Refuel - Cleanup compats

* add `XEH_INHERITED`
 2024-05-24 17:59:59 -05:00
PabstMirror
05ebe1f48f
Medical Treatment - Allow diagnosing cardiac arrest with clear language (#9997) 2024-05-23 17:25:59 -05:00
johnb432
c634bbe1ab
CSW - Force QGVAR(handleExtraMagazinesType) to be respected (#9903) 
Force QGVAR(handleExtraMagazinesType) to be respected
 2024-05-23 21:56:28 +02:00
johnb432
c0d74ba703
Refuel - Fix fuel source disabling (#9995) 
* Add enable setting

* Exclude man class init

* Fix multiplayer terrain pump fuel sync

* Add terrain pumps positions

* Add vanilla fuel cargo restoring before destroying

* Add Livonia positions by bux

* Fix terrain pumps destruction

* Improve settings init

* Fix double settings category

* Check enabled var in public functions

* Fix fnc_makeSource

* Handle recent CUP Terrains changes

* Update includes

* Fix issues introduced in #9133

* Change warning

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Optimisations and cleanup

- Use hashmaps wherever possible
- Reduced pump search radius by ~30%
- Sorted pumps alphabetically and sorted positions by "smallest" first, for consistency

* Add init debug trace

* compileScript in dev

* yoda conditions & DFUNC macro

* Wait until CBA settings are ready

* Update Chernarus 2020 and add more maps configs

* Remove vanilla fuel cargo restoring before destroying

* Update fnc_makeSource.sqf

---------

Co-authored-by: Dystopian <sddex@ya.ru>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-05-23 21:56:08 +02:00
Dystopian
7c65f8503d
Refuel - Add enable setting (#7613) 
* Add enable setting

* Exclude man class init

* Fix multiplayer terrain pump fuel sync

* Add terrain pumps positions

* Add vanilla fuel cargo restoring before destroying

* Add Livonia positions by bux

* Fix terrain pumps destruction

* Improve settings init

* Fix double settings category

* Check enabled var in public functions

* Fix fnc_makeSource

* Handle recent CUP Terrains changes

* Update includes

* Fix issues introduced in #9133

* Change warning

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Optimisations and cleanup

- Use hashmaps wherever possible
- Reduced pump search radius by ~30%
- Sorted pumps alphabetically and sorted positions by "smallest" first, for consistency

* Add init debug trace

* compileScript in dev

* yoda conditions & DFUNC macro

* Wait until CBA settings are ready

* Update Chernarus 2020 and add more maps configs

* Remove vanilla fuel cargo restoring before destroying

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-05-23 21:47:19 +02:00
PabstMirror
f97f11d224
AdvThrowing - Fix showing wind info when no grenades in inventory (#10008) 
AdvThrowing - Fix showing wind info if no grenades in inventory
 2024-05-22 21:19:40 -05:00
johnb432
67fe22a5a6
Grenades - Make flashbang detonation sound configurable via config (#9985) 
* Added configurable flashbang detonation sound

Updated documentation by filling missing information in

* Update grenades-framework.md

* Update grenades-framework.md
 2024-05-22 13:38:59 -07:00
johnb432
e1137ac903
Fire - Remove unused plant integration (#9993) 
Removed unused plant integration in fire
 2024-05-22 13:37:24 -07:00
johnb432
c03e08e51b
Grenades - Change damage from M14 incendiary grenade (#9992) 
Doubled damage from M14 incendiary grenade
 2024-05-22 13:08:09 -07:00
johnb432
052f1c95a3
Cargo - Add checks for adding cargo via config (#9999) 
* Add checks for cargo via config

* Update fnc_initVehicle.sqf

* Use loaded number instead of intended number
 2024-05-22 01:32:46 -05:00