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,699 Commits 73 Branches 88 Tags 752 MiB
f65fcbf44f
Commit Graph

15699 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lambdatiger
f65fcbf44f updated initialization and should frag to check for submunitions since we no longer rely on init EH 2024-07-16 21:45:41 -05:00
lambdatiger
9df2e5b181 added fired EH and moved projectile tracking to be local to projectile 2024-07-16 21:30:17 -05:00
lambdatiger
cf1860d162 Changed blacklist to acting on local projectiles to match initial performance 2024-07-16 21:08:18 -05:00
lambdatiger
a6cfcbf697 Removed event handlers 2024-07-16 21:07:50 -05:00
lambdatiger
d6adfb717c Merge remote-tracking branch 'upstream/master' 2024-06-20 00:11:32 -05:00
lambdatiger
7050afb8c8 Merge branch 'master' of https://github.com/lambdatiger/ace_frag-overhaul 2024-06-20 00:04:39 -05:00
lambdatiger
eedbb0b5bc Revert to 60a0dae, merge conflict wasn't resolved properly 2024-06-20 00:04:34 -05:00
lambdatiger
d0df8e5e1f Merge branch 'acemod:master' into master 2024-06-19 23:49:01 -05:00
lambdatiger
60a0daef66 removed feet hitpoints & tightened multishot submunitions. 
Feet hitpoitns aren't used since calculation for trajectory doesn't account for drag, fragments aimed at feet won't hit
 2024-06-19 23:23:02 -05:00
lambdatiger
474321ba7c Converted all positions for doFrag to AGL since we're converting to that now 2024-06-19 23:21:49 -05:00
lambdatiger
130037d7e8 Added default fragCount fallback value based on current ACE frag range calculation 2024-06-19 23:20:37 -05:00
Grim
c8be3a4e05
Docs - Clarifiy ! operator usage in Coding Guidelines (#10080) 
coding guidelines brackets
 2024-06-18 12:26:24 -03:00
Mike-MF
1c6c4d6bff
All - Fix parentheses around code (#10073) 
* Fix Brackets around code

* Update fnc_handleFired.sqf

* Shouldn't have changed this one

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-06-18 14:08:03 +00:00
johnb432
8fc093de8f
Grenades - Code cleanup (#9979) 
* Improved various aspects of grenades

* Update addons/grenades/functions/fnc_flashbangExplosionEH.sqf

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* Update addons/grenades/functions/fnc_incendiary.sqf

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* Update addons/grenades/functions/fnc_incendiary.sqf

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* Update fnc_flashbangExplosionEH.sqf

* More cleanup

* Update fnc_incendiary.sqf

* Update fnc_incendiary.sqf

* Update fnc_flashbangThrownFuze.sqf

* Update fnc_flashbangThrownFuze.sqf

* Update addons/grenades/functions/fnc_nextMode.sqf

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

* Update addons/grenades/functions/fnc_flashbangExplosionEH.sqf

* Update addons/grenades/functions/fnc_incendiary.sqf

* Removed fix that is included in another PR

* Update fnc_incendiary.sqf

* Messed up merge conflict resolution

---------

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-06-18 01:05:01 -07:00
Grim
95b7951919
General - Use variable for checking if medical is enabled (#10063) 2024-06-18 00:07:38 +00:00
johnb432
421071027e
Common - Add wheel hitpoint function (#10075) 
* Add wheel hitpoint function

* Moved cache to missionNamespace
 2024-06-17 10:31:35 -07:00
PabstMirror
c28a3d6cdf
Kill Tracker - Add setting to show kills from vehicle to crew (#10069) 
* Kill Tracker - Add setting to show kills from vehicle to crew

* Update addons/killtracker/XEH_postInit.sqf

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

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-06-16 22:04:40 -05:00
johnb432
f3722bf5e8
Cookoff - Fix engine fire not starting (#10074) 
Fix engine fire not starting
 2024-06-15 20:59:01 -05:00
Mike-MF
2dc0cd4fc4
Documentation - Remove Hashes from Coding guidelines (#10072) 
Remove Hashes from Coding guidelines
 2024-06-14 16:21:53 -05:00
johnb432
7a6c837f1b
Headless - Add warning about duplicate loadout validation (#9878) 
* Warn users about duplicate loadout validation

* Update XEH_postInit.sqf
 2024-06-14 20:02:13 +02:00
johnb432
34362d48eb
Grenades - Fix incendiary grenades damaging invulnerable objects (#10068) 
Disable damage from incendiaries when object is invulnerable
 2024-06-13 09:49:31 -07:00
PabstMirror
d4d69b9141
Medical Engine - Fix death animation hash keys (#10067) 2024-06-13 14:11:21 +02:00
Mike-MF
690ee55369
Compat CUP Units - Goggles Compatibility (#10065) 2024-06-13 14:10:20 +02:00
PabstMirror
70b0a4c434
Medical - Cleanup refs to hdBracket (#10064) 2024-06-11 14:37:43 -03:00
Grim
59af3e1f6d
General - Change CBA Namespaces to HashMap (#8801) 
* medical_treatment

* advanced_throwing

* common, csw

* Update fnc_replaceRegisteredItems.sqf

* Sanitised numerous components

* Update XEH_postInit.sqf

* Update XEH_postInit.sqf

* FUNC -> LINKFUNC

* Changed tagging hashmap

* Reverted some changes

* Reverted some changes

* Update XEH_clientInit.sqf

* Tweaks and fixes

* Fix number replacements

* Minor cleanup

* Update fnc_getMagazineName.sqf

* Update fnc_getMagazineName.sqf

* Minor improvement

* Made factions case-sensitive and added `toLowerANSI` to be safe

* Update fnc_getDetectedObject.sqf

* Update addons/common/functions/fnc_actionKeysNamesConverted.sqf

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

* Throw error if item doesn't exist

---------

Co-authored-by: Salluci <69561145+Salluci@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-06-11 12:34:32 -03:00
PabstMirror
898daff7f6
General - Cleanup event capitalization (#10062) 2024-06-11 08:00:50 -07:00
johnb432
9760095c42
Grenades - Fix how incendiary grenades do damage to vehicles (#9983) 
* Allow incendiary grenades to damage multiple vehicles

Disable incendiaries damaging invulnerable vehicles

* Apply fire damage to vehicles even after grenade detonation

* Update fnc_damageEngineAndWheels.sqf

* Update fnc_incendiary.sqf

* Update fnc_damageEngineAndWheels.sqf

* british people don't exist

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-06-11 07:59:36 -07:00
Grim
2bd1f39de7
Medical - Add ace_medical_enabled variable for future-proofing API (#9996) 
* add ace_medical_enabled setting

* Update addons/medical_engine/XEH_preInit.sqf

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

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-06-11 11:46:14 -03:00
Grim
a85074a797
Medical Engine - Remove ACE_HDBracket hitpoint (#9732) 
* Medical Engine - Remove ACE_HDBracket hitpoint

* skip context 4

* move checks to vars

* skip uav/logic entities

* add check for arm/leg hitpoints

* Update addons/medical_engine/functions/fnc_handleDamage.sqf

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* don't skip context 2

* clearer custom hitpoint array name

* reenable compile cache

* remove debug mode

* lazy eval

* whitespace

* update comment

* Update fnc_handleDamage.sqf header

* Update addons/medical_engine/functions/fnc_handleDamage.sqf

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

* Update addons/medical_engine/XEH_postInit.sqf

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

* update hitpoint test

* missing "

* Update addons/medical/dev/test_hitpointConfigs.sqf

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

---------

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-06-11 11:11:28 -03:00
Apricot
c862c47617
Translations - Improve Japanese (Mortar and some) (#10061) 
Tweaks
 2024-06-10 21:29:28 -05:00
V1nsyara
41d6cae93b
Translation - Update Russian for new features (#10060) 2024-06-10 21:28:30 -05:00
Nilia119
d66c3904d0
Translation - Add Missing German (#9975) 
* Added Missing German Translation

* Improved German Translation

* Update Medical_treatment

* Update Medical_treatment stringtable.xml

* Update addons/common/stringtable.xml

Co-authored-by: BaerMitUmlaut <BaerMitUmlaut@users.noreply.github.com>

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update addons/arsenal/stringtable.xml

---------

Co-authored-by: BaerMitUmlaut <BaerMitUmlaut@users.noreply.github.com>
Co-authored-by: Mike-MF <TyroneMF@hotmail.com>
 2024-06-09 18:21:36 -05:00
Apricot
46e840b5a2
Translations and Compat - Improve Japanese and CDLC WS/RF localization (#10058) 
* Update Japanese

* rename smoke

* Leo2SG

* Rename FAL Para to FAL OSW Para

* Fix wood as woodland in japanese

* change camo to aaf camo in jp

* Rename RF R1 to equalize with WS R1

* Add dedicated name config VRCO-S

* Add stringtable for VRCO-S
 2024-06-09 18:21:00 -05:00
PabstMirror
97bc371f5c
Common - Add addPlayerEH for adding EHs to ace_player (#10056) 
* Common - Add `addPlayerEH` for adding EHs to ace_player

* Update fnc_addPlayerEH.sqf

* convert ui to use new func
 2024-06-09 18:20:39 -05:00
PabstMirror
130348d3a5
Hit Reactions - Prevent AI's hitpart EH running on all clients (#10057) 
also dynamically add ehs
 2024-06-09 18:20:17 -05:00
Mike-MF
565d64d50e
Reaction Forces Compatibility (#10016) 
* Reaction Forces Compatibility

* Fix Desert Eagle Name, add RAM 1500 variants

* Mortars, Drone and lower cased Ram because thats how baer likes it
 2024-06-06 16:12:49 -05:00
Will/KJW
33dc7e3dbd
Hit Reactions - Add weapon dropping on arm hit (#9539) 
* Create fnc_checkWeaponDrop.sqf

* Update fnc_checkWeaponDrop.sqf

* Create XEH_postInit.sqf

* Update XEH_postInit.sqf

* Update XEH_postInit.sqf

* Update fnc_checkWeaponDrop.sqf

* fix spelling issue

* Update initSettings.sqf

Add weaponDropEnabled setting

* Update stringtable.xml

* Update fnc_checkWeaponDrop.sqf

* Update initSettings.sqf

Forgot a bracket

* Add weapon drop chance setting

* Update XEH_postInit.sqf

* Update CfgEventHandlers.hpp

actually make it run postinit

* Update XEH_PREP.hpp

* Update stringtable.xml

* Update initSettings.sqf

No need, set chance to 0

* Update XEH_postInit.sqf

already comparing against chance, can just set to 0

* Update initSettings.sqf

* Update stringtable.xml

* Update XEH_postInit.sqf

* add arm hit chance

fix weapon thing too

* Update stringtable.xml

* Update addons/hitreactions/functions/fnc_checkWeaponDrop.sqf

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

* Update addons/hitreactions/functions/fnc_checkWeaponDrop.sqf

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

* appearance stuff

* Update addons/hitreactions/initSettings.sqf

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

* Update addons/hitreactions/functions/fnc_checkWeaponDrop.sqf

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* kjw's poor arithmetic

* Update fnc_checkWeaponDrop.sqf

wrong check

* remove systemchat debug

whoops

* Update fnc_checkWeaponDrop.sqf

* Update XEH_postInit.sqf

* Update fnc_checkWeaponDrop.sqf

* Early exit, wait for clear

* Make default setting 0

* Update script_component.hpp

* Update XEH_postInit.sqf

* Update script_component.hpp

* Update XEH_postInit.sqf

* Update XEH_postInit.sqf

* Update addons/hitreactions/functions/fnc_checkWeaponDrop.sqf

* Update XEH_postInit.sqf

Unsure if exitWith in postInit is proper? Seems better than nesting all of that in another scope imo

* Update XEH_preInit.sqf

* Update fnc_checkWeaponDrop.sqf

* Update addons/hitreactions/XEH_preInit.sqf

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

* Update hitreactions.md

* Update hitreactions.md

* Update addons/hitreactions/functions/fnc_checkWeaponDrop.sqf

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

* Update addons/hitreactions/functions/fnc_checkWeaponDrop.sqf

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

* Update addons/hitreactions/initSettings.sqf

* Update XEH_postInit.sqf

* Update addons/hitreactions/XEH_postInit.sqf

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

* Update addons/hitreactions/XEH_postInit.sqf

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

* Update addons/hitreactions/functions/fnc_checkWeaponDrop.sqf

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

* Update addons/hitreactions/functions/fnc_checkWeaponDrop.sqf

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

* Update XEH_postInit.sqf

* Update XEH_postInit.sqf

* Update fnc_checkWeaponDrop.sqf

* Spacing fixes

* Update addons/hitreactions/XEH_postInit.sqf

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

* Take _hitEntity into account if exists

* Update fnc_checkWeaponDrop.sqf

_didHitGun will no longer ever be true

* Minor component cleanup

* Removed gun hits, added double hit detection

* Decouple AI and player probabilities

* Tweaks and fixes

* Update XEH_PREP.hpp

* Add missing param

* Fixed bugged state AI are in after using TakeWeapon

* Fixes and cleanup

* Made API clear, moved undroppable to config entry

* Update fnc_checkWeaponDrop.sqf

* Check for Zeus RC and avoid `setUnitLoadout`

* Expand `addWeapon`'s capabilities

* Cleaned up `addWeapon`

* Removed weapon replacement as it's apparently not necessary

* Defined undefined variable

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-06-06 04:49:15 -07: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
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
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