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
14,913 Commits 73 Branches 88 Tags 752 MiB
66deb59037
Commit Graph

14913 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PabstMirror
e6a8222966
Map - Update map lighting effect every frame (#9349) 
Map - Update lighting effect every frame
 2023-08-29 12:32:44 -03:00
johnb432
528539210e
Reload/Reload Launcher - Fix headers (#9347) 
Header fixes
 2023-08-28 17:20:53 -03:00
johnb432
b90d0379ca
Reload Launcher - Improve various aspects (#9335) 
* Add notifications to reloadLauncher

- Add notifications to reloadLauncher
- Also set _reloadTime to `magazineReloadTime min 2.5` instead of just 2.5 if there is no `buddyReloadTime` set

* Change message format

* Add setting displayStatusText for reloadLaunchers

* reloadlauncher improvements

* Comments

* Updated so it's similar to reload addon

* Added failure message

* Update addons/reloadlaunchers/functions/fnc_reloadLauncher.sqf

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

* Changed reload conditions

* Tweaked notifications

---------

Co-authored-by: Drofseh <Drofseh@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-08-28 15:14:45 -03:00
johnb432
59ee36560f
Reload Launchers - Code cleanup (#9334) 
* reloadlaunchers cleanup

* Update fnc_canLoad.sqf
 2023-08-28 14:27:01 -03:00
johnb432
44e0fdb6fa
Reload - Code cleanup and various improvements (#9343) 
* Reload code cleanup

* Update fnc_startLinkingBelt.sqf

* Update addons/reload/functions/fnc_getAmmoToLinkBelt.sqf

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

---------

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
 2023-08-28 14:26:24 -03:00
johnb432
519b1cbeb4
Repair - Improve wheel repair interaction position (#9345) 
Update fnc_addRepairActions.sqf
 2023-08-28 09:52:21 -03:00
johnb432
0bee7614ad
Common - Improve weapon unloading (#9344) 
Fix weapon unloading
 2023-08-26 12:04:31 -04:00
PabstMirror
582f6e32ed
Slideshow - Add support for maps as textures (#9150) 
* Slideshow - Add support for maps as textures

* Update script_mod.hpp

* Update fnc_mapImage.sqf

* cleanup

* Update fnc_mapImage.sqf

* Apply suggestions from code review

Co-authored-by: jonpas <jonpas33@gmail.com>

* mapImage_init comments

* Update fnc_mapImage.sqf

* Apply suggestions from code review

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

* add support for mission config maps

---------

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
 2023-08-25 10:33:42 -05:00
PabstMirror
65d5ccf600
Medical GUI - Dynamically create any number of action buttons (#9332) 
* Medical Gui - Dynamically create any number of action buttons

* Fix right alignment, add h-spacing, fix 2.14 select
 2023-08-25 10:32:39 -05:00
PabstMirror
59fa842527
Map Tools - Fix for 2.14 aspect ratio changes (#9219) 
Close #9176
 2023-08-25 10:25:00 -05:00
olimolly
6c0797eaa2
Add french translation for new painUnconsciousTreshold setting (#9341) 2023-08-24 09:37:13 -05:00
JonBons
2709490efd
Cookoff - Move canHaveFireJet logic into vehicle_damage (#9060) 
* Moved ace_cookoff_canHaveFireJet config logic into vehicle_damage as a param passed into cookoff to improve modularity

* Use original arg order

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-08-23 12:37:17 -05:00
PabstMirror
8e25472d5b
Night Vision - Use default effects when controlling UAVs (#9338) 2023-08-21 14:23:53 -05:00
PabstMirror
fabd9c5fdb
Weather - Fix number in fnc_calculateWindChill.sqf (#9340) 
Update fnc_calculateWindChill.sqf
 2023-08-21 14:23:21 -05:00
PabstMirror
9c25fea548
Tools - Update includes tools, ignore .hemttout in str validator (#9337) 
Tools - update includes tools, ignore .hemttout in str validator
 2023-08-21 00:00:24 -05:00
Grim
d33a158e2e
Arsenal - Favorites System (#9307) 
* improve page handling

* drop MAX_STATS_PER_PAGE for now

* hide stats box when empty

* improve hiding

* improve _fnc_hideUnused

* condition

* prevent page overflow

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

* favorites var

* function prep

* favorites only

* improve favorites adding, add include

* fix stupid

* fix color setting (todo: lnb color)

* add button, finalize

* setting tooltip

* stringtable again

* fix setting overwrite, improve tooltip

* fix losing weapon items

* fix macro

* fix setting to intended overwrite

* remove unnecessary private

* docs

* more docs

* is

* improve button text

* docs

* fix tooltip not showing unless menuBar was clicked

* improve weapon accessory lookup

* empty line

* update refresh calls

* fix left panel

* cleanup currentCargo

* use BI string for favorites

* BI strings again

* no favorites for face/voice/insignia

* stringtable again

* add missing setColorRight

* Add comment for favorites setup

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-08-19 23:56:59 -04:00
Grim
2f8d92701f
Arsenal - Fix magazine misc items categorization (#9336) 
fix stupid
 2023-08-20 00:43:22 -03:00
Grim
8f3a1c5694
Arsenal - Fix changing stats via script (#9312) 
* fix addStat

* fix removeStat

* improve priority sorting

* change append to pushBack
 2023-08-19 22:45:07 -04:00
Grim
007995612d
Arsenal - Fix virtual non-weapon magazines in inventory being treated as unique (#9309) 
* sigh

* add comment in scanConfig

* fix misc magazines

* improve magazine misc items check

* check player loadout first for uniqueItems
 2023-08-19 22:38:06 -04:00
PabstMirror
4b7ee55588
Nametags - Cleanup unused crew info component (#9333) 2023-08-19 21:20:27 -05:00
Grim
42101e8fa2
Fastroping - Fix equipping FRIES during vehicle init (#9299) 
* delete fries with vehicle

* FUNCK -> FUNC

* Delay 1 frame so setVar won't fail if ran before initpost

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-08-19 01:38:47 -04:00
johnb432
682ae05f59
Medical Status - Remove status effects upon death/featureCamera (#9301) 
* Update fnc_handleKilled.sqf

* move to function

* Removed skipSetHidden

* Revert "Removed skipSetHidden"

This reverts commit 452c5216a7.

* Update addons/medical_status/XEH_postInit.sqf

* add comment, force git to run actions

---------

Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2023-08-18 13:16:20 -04:00
Grim
55cc755542
CSW - Disable non-CSW rearm actions for CSW vehicles (#9255) 
* improve CSW integration

* do this more cleanly

* code style

* revert ammo handling check change
 2023-08-18 13:10:15 -04:00
johnb432
a168330550
Arsenal - Add arsenal actions addition and removal via functions (#9318) 
* Add and remove arsenal actions via functions

* Fixed header

* Update addons/arsenal/functions/fnc_addAction.sqf

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

* Update fnc_addSort.sqf

* Update addons/arsenal/functions/fnc_removeAction.sqf

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

* Update addons/arsenal/functions/fnc_removeAction.sqf

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

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2023-08-18 12:33:56 -04:00
PabstMirror
d290ca3d63
Aircraft - Use COMPILE_SCRIPT macro (#9331) 2023-08-17 21:52:29 +02:00
Kyle Mckay
e47e18001f
Docs - Update my display name everywhere (#9330) 
* Update display name in team

* Update display name everywhere

* order

https://youtu.be/VYycQTm2HrM

---------

Co-authored-by: BrettMayson <brett@mayson.io>
 2023-08-17 12:02:17 +02:00
Bailey Danyluk
ef23310aec
Docs - Change name (again) (#9328) 2023-08-16 19:18:01 -04:00
PabstMirror
8517a6ef73
Fastroping - Add compatibility with 2.12 (#9327) 
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
 2023-08-16 21:00:52 +02:00
Will/KJW
3e35984610
Medical GUI - Improve Selected Category colouration (#9324) 
Co-authored-by: jonpas <jonpas33@gmail.com>
 2023-08-16 20:32:53 +02:00
jonpas
0cef0ba6e9
Fastroping - Add Auto add FRIES setting (#9319) 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
 2023-08-16 14:16:44 +02:00
Will/KJW
9abb43ad3a
Fastroping - Improve AI flight height (#9270) 
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2023-08-16 14:16:29 +02:00
Mike-MF
9bcd990dd0
Nightvision - Add White Phosphor NVGs (#9321) 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-08-16 14:15:53 +02:00
jonpas
43cded706c
Interaction - Use assignTeam instead of deprecated CBA event (#9326) 2023-08-16 14:15:44 +02:00
PabstMirror
8c5ab18350
Various - Misc Cleanup (#9317) 
* Various - Misc Cleanup

* Update addons/common/functions/fnc_canDig.sqf

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

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2023-08-13 14:13:02 -05:00
Grim
7c70ded9bc
CSW - Fix mag multiplication in multiplayer (#9232) 2023-08-12 21:31:30 +02:00
Grim
fdbcc62c74
Repair - Make headlights repairable (#9306) 2023-08-11 19:44:12 +02:00
PabstMirror
eb53e7a2fe
Tools - document_functions.py: handle header sub indexs for arguments (#9303) 
* tools - handle header sub indexs for arguements

* convert remaining

* Update coding-guidelines.md
 2023-08-08 22:51:20 -05:00
johnb432
f941e0217b
Arsenal - Improve sorting (#9314) 
Tweaked arsenal sorting
 2023-08-09 06:25:18 +03:00
johnb432
8d7cc09586
Arsenal - Fix unique explosives showing up in the "all magazines" tab (#9308) 
Check all magazines last
 2023-08-05 22:07:19 +03:00
Sergey Vergun
96a4a8cf8e
Medical - Add Pain Unconscious Threshold setting (#8394) 
* Add PAIN_UNCONSCIOUS slider

Add PAIN_UNCONSCIOUS slider to ACE Medical settings

* fix GVAR name

* Update addons/medical_damage/stringtable.xml

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

* Update addons/medical_damage/stringtable.xml

Co-authored-by: jonpas <jonpas33@gmail.com>

* stringtable

* remove setter in preInit and cleanup PAIN_UNCONSCIOUS_DEFAULT

---------

Co-authored-by: Salluci <69561145+Salluci@users.noreply.github.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-08-05 15:32:21 +03:00
johnb432
a591aa9508
Advanced Fatigue - Add cap to muscle damage (#9302) 
Update fnc_mainLoop.sqf
 2023-08-04 21:07:12 -05:00
PabstMirror
6fb9161ecc
Medical Engine - Fix unloading dead units in vehicles and handle deleted units vehicles (#9283) 
* Medical Engine - Unlock when dead

* Update fnc_unloadPersonLocal.sqf

* Update addons/common/functions/fnc_unloadPersonLocal.sqf

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

* fix actually unloading people to found emptyPos

* handle deleted units

* handle dead units

ref 179957c39d

* vehicle -> objectParent

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2023-08-02 08:59:46 +03:00
johnb432
6bc1ae453b
Update fnc_loadUnit.sqf (#9300) 2023-08-01 11:35:55 -05:00
Grim
628d62d329
Laser - Cleanup laser designator config and code (#9289) 
* cleanup laser designator code

* condition

* use macro for IDC

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

* IDC to macro

* switch to _currentShooter

* hide CA_Distance even if fade fails

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-07-30 04:41:46 +03:00
Dystopian
14e92dfb7f
Repair - Add enable setting (#8070) 
* Add enable setting

* Optimize eden expressions

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* Add debug

* Update addons/repair/functions/fnc_addRepairActions.sqf

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

* Fix strange indent

* Optimize bool to number conversion

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

* Prevent run before setting is ready

* Move postInit to EH

* remove all transportRepair = 0

* remove requiredAddons

---------

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
 2023-07-29 07:53:05 +03:00
johnb432
7ef9d19bc5
Update fnc_replaceUniqueItemsLoadout.sqf (#9297) 2023-07-29 01:01:42 +03:00
johnb432
add312cbf1
Logistics wirecutter - Add wirecutter stats to ACE arsenal (#9296) 
* Added wirecutter stats to arsenal

* Update addons/logistics_wirecutter/ACE_Arsenal_Stats.hpp

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

* Update addons/logistics_wirecutter/ACE_Arsenal_Stats.hpp

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

* Update ACE_Arsenal_Stats.hpp

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-07-29 01:01:25 +03:00
Grim
2f0ed27d93
Arsenal - Improve stats display (#9290) 
* improve page handling

* drop MAX_STATS_PER_PAGE for now

* hide stats box when empty

* improve hiding

* improve _fnc_hideUnused

* condition

* prevent page overflow

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

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-07-29 01:00:05 +03:00
Grim
4fea9669bb
UI - Fix UAVs not being considered vehicles for HUD elements (#9288) 
* consider UAVs as vehicles for UI display

* fix condition

* readd reload ui condition

* improved UAV check

* use getConnectedUAVUnit

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

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-07-29 00:44:14 +03:00
PabstMirror
7f24dc2282
Extensions - Fix gtest branch change (#9014) 2023-07-28 22:47:22 +02:00