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

13073 Commits

Author SHA1 Message Date
Will/KJW
90d855c2c5
Nightvision - Improve NVG Brightness adjustment limits (#10136) 
* Update fnc_changeNVGBrightness.sqf

* Update XEH_postInit.sqf

* Update addons/nightvision/XEH_postInit.sqf

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

* Update XEH_postInit.sqf

* Update fnc_changeNVGBrightness.sqf

* Update nightvision-framework.md

* load order independence

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

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-08-02 09:52:44 -03:00
johnb432
6a25e9365a
Safemode - Refactor (#10111) 
* Refactor safemode

* Further improvements and fixes

* Update XEH_postInit.sqf

* Don't allow binoculars to be set to safe

* Add API for getting weapon safety status

* Update fnc_jamWeapon.sqf

* Added doc

* Update fnc_playChangeFiremodeSound.sqf

* Update addons/overheating/functions/fnc_jamWeapon.sqf

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

* Update addons/weaponselect/functions/fnc_selectWeaponMode.sqf

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

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2024-08-02 13:59:18 +02:00
Enrico Machado
4e56d58210
Translations - Add and Improve Portuguese (#10155) 2024-07-30 20:45:31 -05:00
lambdatiger
8c68f131fa Debug sphere conditional was missing in frago 2024-07-30 19:10:50 -05:00
lambdatiger
40921773f9 Removed unused stringtable items 2024-07-30 16:22:53 -05:00
lambdatiger
2e67d5d843 Updated function documentation 2024-07-30 16:08:59 -05:00
lambdatiger
25cc22bf77 removed extra newlines and double spaces 2024-07-30 13:36:56 -05:00
lambdatiger
22ca38fc2c legability formatting 2024-07-30 13:22:52 -05:00
lambdatiger
7b282ec96c add newline and fix blacklist 2024-07-30 13:22:16 -05:00
lambdatiger
61a1770384 missed comma, going to bed, sorry 2024-07-29 23:55:26 -05:00
lambdatiger
ed36b6a4c8 Alternative way to address shot parent self-harm issue 2024-07-29 23:46:21 -05:00
lambdatiger
5059cb283d accidentally committed script_component.hpp w/ debug enabled 2024-07-29 23:17:05 -05:00
lambdatiger
bee8eee8d8 Jank fix so that the unit firing can get hit with it's own fragments 2024-07-29 23:12:21 -05:00
lambdatiger
57454553a0 fixed target sphere visability 2024-07-29 22:49:40 -05:00
lambdatiger
cfdf29154f added target point debug spheres 2024-07-29 22:09:21 -05:00
lambdatiger
0ef399141c command capitalization 2024-07-29 22:09:10 -05:00
lambdatiger
8b29b86924
Merge branch 'acemod:master' into Event-hanlder-replacement 2024-07-29 21:06:55 -05:00
lambdatiger
3659aff634 added debug draw mode to DEBUG_ENABLED_FRAG define check 2024-07-29 21:05:57 -05:00
lambdatiger
72a6cfffcc removed unused variables, implemented fixes from full rewrite PR, and fixed math errors 2024-07-29 21:05:38 -05:00
lambdatiger
33a06535eb fragmenting projectile velocity isn't used anywhere 2024-07-29 21:04:55 -05:00
lambdatiger
5df635cd61 removed _fragCount reference in newly backported debug functions 2024-07-29 21:04:36 -05:00
lambdatiger
613784923d removed "class eventhandler" references 2024-07-29 21:04:11 -05:00
lambdatiger
3efaef09ec removed unused variables & EHs and set defaults in the case debug mode draw isn't used 2024-07-29 20:40:39 -05:00
johnb432
98da279e8f
Medical AI - Give blood in Cardiac Arrest before doing CPR (#10154) 
Give blood in CA if needed before doing CPR
 2024-07-29 15:04:59 +02:00
PabstMirror
7e93715bcc
Medical - Gracefully handle bad configs in testHitpoints (#10156) 2024-07-29 15:04:36 +02:00
PabstMirror
a6ab050a07
Dogtags - Rename inventory items via CBA (#10130) 
* Dogtags - Rename inventory items via CBA

* Update addons/dogtags/XEH_postInit.sqf

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

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-07-28 11:43:03 -05:00
johnb432
56eae4060c
CSW - Improve function headers & comments (#10149) 
Code formatting changes from 9234
 2024-07-27 19:42:31 +02:00
PabstMirror
e3d8f40538
Interaction - Show all possible modes for an attachment (#8154) 
* Interaction - Show all possible modes for an attachement

* Move attach & detach actions under item action

* Remove switching from PIP to regular 2D

* Remove attachment name from attach/detach actions

* Fixed typo in variable name

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-07-27 19:37:33 +02:00
PabstMirror
aa6e5c30ec
Fire - Fix medical macros in compiled sqfc (#10147) 
* Fire - Fix medical macros in compiled sqfc

* Update addons/fire/functions/fnc_burnSimulation.sqf

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

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-07-27 19:16:49 +02:00
johnb432
b7cd72e936
CSW - Fix belt linking (#10148) 
* fix unloading to units with full inventory

* fix belt linking issues

* Enhance workaround

* Use unit instead if magSource is null

---------

Co-authored-by: Salluci <salluci.lovi@gmail.com>
 2024-07-27 19:15:50 +02:00
PabstMirror
ba22c407e3
Common - Add ace_common_fnc_switchAttachmentMode (#10135) 
* Common - Add `ace_common_fnc_switchAttachmentMode`

* Update addons/common/functions/fnc_switchAttachmentMode.sqf

* Update addons/common/functions/fnc_switchAttachmentMode.sqf

* playSound only for ACE_player

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

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-07-27 19:15:28 +02:00
johnb432
8eefffe811
Recoil - Code cleanup (#10150) 
* Recoil code cleanup

* Store recoil values as numbers in config, only `compile` if needed

* Updated header

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2024-07-27 14:43:07 +02:00
johnb432
b85150e6eb
Explosives - Only add "detonate all" action for dead man switch when necessary (#10146) 
Only add detonate all when necessary
 2024-07-25 20:34:26 +02:00
johnb432
e99d6d9381
Medical AI - Make AI take tourniquets into account when medicing (#10142) 
* Make AI take tourniquets into account when medicing

* Update fnc_healingLogic.sqf
 2024-07-25 07:49:45 +02:00
johnb432
bfbaae65e1
Arsenal - Fix mission and campaign insignia (#10143) 2024-07-24 20:17:22 -03:00
johnb432
74de646a02
Medical AI - Fix splints not being applied in special circumstance & setting adding multiple EH (#10141) 
Several medical AI fixes

- Not applying splints if too many medications were taken
- Potential nil for _target
- Setting could add multiple EH, require mission restart
 2024-07-24 15:04:53 +02:00
johnb432
cb3c18c2fb
Medical AI - Header fixes (#10140) 
Header fixes for medical AI
 2024-07-23 15:28:40 +02:00
johnb432
43c1f97dfa
Laser - Remove unnecessary EGVAR (#10139) 
Remove unnecessary EGVAR
 2024-07-22 19:27:26 +02:00
johnb432
db339ab8e3
Cargo - Reenable UAV AI when on ground when paradropped (#10137) 
Reenable UAV AI when on ground when paradropped
 2024-07-22 19:15:43 +02:00
johnb432
b6e9cabc34
Cargo & Dragging - Disable UAV AI when being dragged, carried or cargo (#10100) 
* Disable UAV AI when being dragged, carried or cargo

* Update addons/common/functions/fnc_disableAiUAV.sqf

* Improve dragging/carrying conditions, fixed duplicate JIP
 2024-07-22 08:38:39 +02:00
PabstMirror
05c7f84b01
Medical Engine - Allow disabling seat locking on vehicle types (#10123) 2024-07-21 14:31:57 -05:00
johnb432
3f5a2ee64b
RHS Compats - Remove silent ace_hearing dependency from RHS compats (#10134) 
Remove hearing silent hearing dependency from RHS compats
 2024-07-20 21:19:18 +02:00
johnb432
f6c5425733
RHS Compats - Add common to loadorder (#10133) 
Add common to RHS compat loadorder
 2024-07-20 21:10:16 +02:00
johnb432
4cb358ebf2
Dogtags - Add missing private (#10132) 
Update fnc_getDogtagItem.sqf
 2024-07-20 10:26:01 +02:00
johnb432
a7ce63a536
Fire - Remove medical_engine dependency (#10122) 
* Remove medical dependency from fire

* Update initSettings.inc.sqf
 2024-07-20 08:37:04 +02:00
johnb432
5d133bd793
Dogtags - Code cleanup (#10097) 
* Clean up dogtags

* Only allow taking of dogtags if unit has space

* Fixed upper case T

* Stop throwing error

* Reverted to case insensitive method of checking

* Remove unused files

* More cleanup & fixes

- Better check for taking dog tags until 2.18 comes
- Changed parent condition from `canTakeDogtag` to `canCheckDogtag`
- Register EH only where necessary

* Update CfgEventHandlers.hpp

* More header cleanup
 2024-07-20 08:29:17 +02:00
johnb432
05ab1bbe99
Dragging - Fix dragging/carrying failing for items in ViV (#10128) 
* Unload ViV before dragging/carrying

* Update addons/dragging/functions/fnc_carryObject.sqf

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

* Use lazy eval to check if item was unloaded

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2024-07-20 08:26:53 +02:00
johnb432
8ab36f64ff
Quickmount - Fix quickmount for vehicle interactions (#10126) 
* Fix quickmount for vehicle interactions

* Update addons/quickmount/functions/fnc_getInNearest.sqf
 2024-07-20 08:15:15 +02:00
johnb432
5cada7d397
General - Remove "SwitchWeapon" spam (#10113) 
* Remove "switchWeapon" spam

* Update fnc_startDragLocal.sqf

* Don't add invalid fire modes

* Tweaks & fix
 2024-07-20 08:13:42 +02:00
johnb432
68738316c2
Dragging - Remove weight calculation workaround (#10117) 
* loadAbs has been fixed

* Update fnc_getWeight.sqf
 2024-07-19 19:13:44 +02:00
johnb432
37d7c4c544
Interaction - Hide push interaction if target is in ViV cargo (#10127) 
Hide push interaction for ViV cargo
 2024-07-19 18:26:14 +02:00
lambdatiger
160bb15962 Merge remote-tracking branch 'upstream/master' into Event-hanlder-replacement 2024-07-19 10:51:23 -05:00
lambdatiger
e4d36c6819 fixed small errors 2024-07-19 10:47:49 -05:00
lambdatiger
2713acdd38 Optimized loop to find spall position using larger steps and fewer operations per loop 2024-07-19 00:12:14 -05:00
lambdatiger
f57f6f5a06 clarified parts of the spall event chain 2024-07-19 00:01:55 -05:00
lambdatiger
c344130f9b increased code legiblity and optimized some randomizations 2024-07-18 22:58:52 -05:00
lambdatiger
4f251767d7 updated some defne names and usages 2024-07-18 22:33:19 -05:00
lambdatiger
1480715111 fixed timing and other spall issues 2024-07-18 22:28:56 -05:00
lambdatiger
48e299663b fixed errors in frag with downgrade 2024-07-18 21:12:23 -05:00
lambdatiger
437f6c1eef mass must be in grams in this version I guess 2024-07-18 21:10:54 -05:00
lambdatiger
8da5e47dcf changed debug colors 2024-07-18 21:10:20 -05:00
lambdatiger
783c2aa8ce fixed debug def names 2024-07-18 19:36:49 -05:00
lambdatiger
39e7f7f438 unfucked a comma 2024-07-18 19:30:30 -05:00
lambdatiger
3595f827a1 removed more magic numbers 2024-07-18 19:28:11 -05:00
lambdatiger
3fcf6f7100 removed magic numbers and code with no effect 2024-07-18 19:19:43 -05:00
lambdatiger
9c8e9e30a2 removed commented out debug information from nouber 2024-07-18 19:18:52 -05:00
lambdatiger
682568fd87 updated defines to match implementation 2024-07-18 19:16:28 -05:00
lambdatiger
04c4bd4679 updated search pattern to one discussed in PR #9728 2024-07-18 19:07:47 -05:00
lambdatiger
fbca98328e All spalling in current version is local 2024-07-18 18:56:00 -05:00
lambdatiger
842b818aff updated config path to be relevant to post-EH version 2024-07-18 18:55:46 -05:00
lambdatiger
a20274a2c2 made addBlackList remove projectile EHs 2024-07-18 18:55:19 -05:00
Dart
8f84df77d0
Sitting - Add config overwrite for random animation pool (#10120) 
* Add config property animation overwrite

* Update addons/sitting/functions/fnc_getRandomAnimation.sqf

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

* Fix header

* Update addons/sitting/functions/fnc_getRandomAnimation.sqf

* Update function call

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-07-18 16:53:34 -05:00
johnb432
f4272f0e36
Spectator - Remove spectator lights when exiting spectator (#10114) 
Remove spectator lights when exiting spectator
 2024-07-17 10:42:37 +02:00
lambdatiger
20b1ab7e64 remove fragCount from config 2024-07-17 02:21:54 -05:00
lambdatiger
2c5b0582ec missed comma 2024-07-17 01:56:35 -05:00
lambdatiger
b656ef6467 Initial rollback to old frag simulation and spalling simulation. Updated spall to function and helpter functions as well 2024-07-17 01:53:40 -05:00
Dart
66c31928ab
General - Fix case in event handler commands (#10121) 2024-07-17 01:12:01 -05:00
lambdatiger
15de0d9a3a fixed more useless trailing {} 2024-07-16 23:42:44 -05:00
lambdatiger
0269039dee Didn't know that PBO project needed trailing {} on class inheritance structures 2024-07-16 23:28:37 -05:00
lambdatiger
32af820e77 Fixed config path in shouldFrag 2024-07-16 23:21:43 -05:00
lambdatiger
15d5256dcd
Merge branch 'acemod:master' into master 2024-07-16 23:06:16 -05:00
lambdatiger
1ae4fc792d fixed frame offset to avoid hitting dead targets 2024-07-16 22:53:20 -05:00
lambdatiger
04e844fecf fixed small mistakes in names and function calls 2024-07-16 22:40:13 -05:00
lambdatiger
cd4d2a9cf6 Fixed calls for shouldFrag and got rid of old initRound.sfq (maybe back after 2.18) 2024-07-16 22:03:15 -05:00
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
V1nsyara
ec5b84c278
Translation - Small update Russian (#10115) 
* Translation - Update Russian for new features

* Up to date translate RU

* Small update medical treatment

* resolve problem

* i`m cry

i hate this conflict
 2024-07-14 21:46:14 -05:00
Apricot
63d1ab82a7
Translations - Improve Japanese (#10112) 
* Improve Japanese

* Tweaks

* bit tweak

* even more tweak

* Update stringtable.xml

* Update stringtable.xml
 2024-07-13 19:22:06 -05:00
johnb432
f65138f65e
Casings - Fix settings (#10110) 2024-07-07 11:41:10 -03:00
johnb432
edc7e9af3e
Dogtags - Add context menu action to check dog tag (#10101) 
* Broadcast dogtag info globally so that arsenal can use it

* Broadcast changes incrementally

* Add context menu option for dogtags
 2024-07-04 00:39:08 -07:00
johnb432
3745305323
Dogtags - Fix arsenal not showing dogtag info in multiplayer (#10095) 
* Broadcast dogtag info globally so that arsenal can use it

* Broadcast changes incrementally

* Update addons/dogtags/XEH_postInit.sqf

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

* Update addons/dogtags/functions/fnc_getDogtagItem.sqf

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

* Add EH only on necessary machines

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2024-07-04 00:32:37 -07:00
johnb432
4d0641abb8
Dogtags - Improve displaying dogtags from bodies with no name (#10096) 
Improve displaying dogtags from bodies with no name
 2024-07-03 09:50:08 -07:00
johnb432
dae2c5b465
Common - Clean up ace_common_fnc_hasItem & ace_common_fnc_hasMagazine functions (#10108) 
* Clean up hasItem & hasMagazine functions

* Replace EFUNC

* Update fnc_hasItem.sqf
 2024-07-03 08:39:04 -07:00
johnb432
7b0e5b6416
Common - Fix ace_common_fnc_uniqueItems (#10107) 
Fix `ace_common_fnc_uniqueItems`
 2024-07-03 08:30:41 -07:00
johnb432
b714c8bce2
Nametags - Only display talking waves when unit is alive and conscious (#10106) 
Only display waves when unit is alive and conscious
 2024-07-03 02:02:43 -07:00
johnb432
ee0e947611
General - Use ace_common_fnc_isAwake where possible (#10098) 
* Use `ace_common_fnc_isAwake` where possible

* Revert bad change
 2024-07-02 12:38:14 -07:00
johnb432
516eb48c93
Dogtags - Stop throwing error when trying to take dog tags (#10103) 
Stop throwing error
 2024-07-02 11:16:28 -07:00
Psycool
45f9301019
Korean translation updated (#10104) 
* KoreanTranslation

Someone has returned all the translations in Korean to English. there is no need to return them.

* koreantranslation

* Korean Typo Fix

* Korean Translation

* Update stringtable.xml

* Korean Translation Added

Added Korean translation related to Cargo Refuel

* Merge branch 'master' of https://github.com/Psycool3695/ACE3

* Korean translation Add/Updated

* Fixed wrong strings

* Korean translation improved

* Korean translation updated

* Korean translation updated

* Fix Merge

* Update stringtable.xml

* Update stringtable.xml

* Korean translation updated

* Korean translation minor fix

* Korean translation fixed

* Korean translation updated

* Update stringtable.xml

* Spacing fixed

* Korean translation updated

* Spacing fixed

* Korean translation updated

* Korean translation updated

* Korean translation updated

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2024-07-02 13:14:19 -05:00