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,071 Commits 73 Branches 88 Tags 752 MiB
56b0baf97c
Commit Graph

15071 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Björn Dahlgren
56b0baf97c
ci: Update 7zip function to extract game data (#9666) 2023-12-01 15:28:58 +01:00
johnb432
f94197b1c3
Arsenal - Disable action buttons when hidden (#9664) 
Update fnc_handleActions.sqf
 2023-11-27 19:15:09 -06:00
Mr. Zorn
65be883eea
Weather - Add variable to temporarily pause wind simulation (#9057) 
* added exit condition

This would enable mission maker to temporarily disable the execution of setWind every second.
Currently, a temporary pause isnt possible.

* Update weather-framework.md

* Apply suggestions from code review

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

* actually disable wind simulation

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
 2023-11-23 15:16:55 -03:00
Grim
3f61a41be3
Common/CSW - Use status effect for enableWeaponDisassembly (#9413) 
* uuse weaponDisassemblyEnabled

* convert to status effect

* fix edge conditions

* Update addons/common/functions/fnc_claim.sqf

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

* Update addons/common/XEH_postInit.sqf

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

* Update addons/common/XEH_postInit.sqf

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

* Update XEH_postInit.sqf

* Update addons/common/functions/fnc_claimSafeServer.sqf

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

* Update fnc_claimSafeServer.sqf

* change status effect key

* status effect key

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2023-11-22 21:16:42 -03:00
Enrico Machado
3f6a93195a
Translations - Add & Improve Portuguese entries (#9609) 
* Fixed Portuguese typos

* Partial Portuguese translation

* Partial Portuguese translation

* Update addons/ai/stringtable.xml

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

* Update addons/arsenal/stringtable.xml

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

* Update addons/arsenal/stringtable.xml

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

* Update addons/cargo/stringtable.xml

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

* Update addons/gunbag/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/cargo/stringtable.xml

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

* Update addons/common/stringtable.xml

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

* Update addons/fieldmanual/stringtable.xml

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

* Readded accidently removed entry

* Update stringtable.xml

* "and" -> "e"

* Update stringtable.xml

* Partial Portuguese translation

* Fixed corrupted merge

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
 2023-11-22 20:33:30 -03:00
Grim
6741822480
Interaction - Allow unloading patients, bodies, and captives from inside vehicles (#9645) 
* add unloading from inside vehicles

* Update addons/common/functions/fnc_findUnloadPosition.sqf

* Update fnc_findUnloadPosition.sqf
 2023-11-22 19:38:52 -03:00
johnb432
bae63636b7
Zeus - Add Zeus modules for unloading cargo (#9661) 
Added unload cargo zeus module

Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
 2023-11-21 20:44:08 -03:00
johnb432
73807c261f
XM157 - Fix zeroing for secondary muzzles (#9652) 
* Update fnc_keyPress.sqf

* Update fnc_keyPress.sqf

* Update addons/xm157/functions/fnc_keyPress.sqf

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

* Update addons/xm157/functions/fnc_keyPress.sqf

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

---------

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-11-21 17:50:46 -03:00
Fabio Schick
852e08f8b5
Hunter Killer - Enable on Rooikat 120 and add italian translations (#9658) 
* Enable HK on Tanks DLC Rooikat 120

* Italian Translations
 2023-11-21 14:34:22 -06:00
johnb432
2e7f56ee39
Dragging - Fix captives (#9660) 
Fixes and cleanup
 2023-11-21 17:18:19 -03:00
Grim
3904240153
Cargo - Add item index and damage to cargo menu (#9655) 
* add index and damage to cargo menu

* Update addons/cargo/functions/fnc_onMenuOpen.sqf

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

* Update addons/cargo/functions/fnc_onMenuOpen.sqf

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

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2023-11-21 01:46:16 +00:00
Grim
99ccf31807
Repair - Use object with lowest damage for changing wheels/tracks (#9648) 
sort claimObject by damage
 2023-11-20 22:43:43 -03:00
johnb432
ac9044f2d6
Zeus - Add medical menu module (#9367) 
* open medical menu from Zeus

* fix function header

* Zeus can use every action, add room for more buttons in medical menu

* Update addons/medical_treatment/functions/fnc_treatment.sqf

* Added zeus treatment time coeff

* Update addons/medical_gui/functions/fnc_canOpenMenu.sqf

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

* Update fnc_canOpenMenu.sqf

* Update initSettings.sqf

* Update fnc_moduleMedicalMenu.sqf

* Added check + documentation

* Update fnc_canTreat.sqf

---------

Authored-by: Brett <brett@mayson.io>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-11-20 13:52:29 -08:00
Apricot
5d8978981a
Translations - Improve Japanese (#9654) 
Update Japanese
 2023-11-17 19:50:33 -06:00
Grim
286f64480c
General/Medical - Lower inventory size for misc items (#9642) 
* weight

* Update CfgWeapons.hpp

* Update addons/medical_treatment/CfgWeapons.hpp

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

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2023-11-17 20:08:13 -03:00
Grim
5e792082ec
Interaction Menu - Show distance to target on vehicle actions (#9644) 
* add distance to action

* sort by distance

* Revert "sort by distance"

This reverts commit 89834613dd.

* show distance for crewed vehicles

* Update fnc_createVehiclesActions.sqf
 2023-11-17 20:07:58 -03:00
johnb432
d1f0dc5e83
Cargo - Improve various aspects (#9617) 
* Update CfgVehicles.hpp

* Cargo cleanup

* Update menu.hpp

* Updated status effect key

* Update fnc_onMenuOpen.sqf

* Update fnc_onMenuOpen.sqf

* fix comment from merge

* nil interaction GVARs on menu close

* fix carry bug

* Fix floating objects in MP

* Updated ace_cargoAdded doc

* Fix progress bar prematurely stopping

* Finer cursor object selection

---------

Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
 2023-11-17 20:07:28 -03:00
johnb432
8f3129a02e
Arsenal - Fix FUNC(removeVirtualItems) for JIP players (#9650) 
* Fix removeItems for JIP

* Different approach

* Update fnc_addVirtualItems.sqf

* Refresh arsenal globally
 2023-11-17 20:06:20 -03:00
johnb432
65c16b6a0a
Arsenal - Fix closing arsenal when ignoring content (#9651) 
* Fix closing arsenal when ignoring content

* Update fnc_removeBox.sqf
 2023-11-16 20:54:52 -03:00
Grim
141410bb47
Update release drafter for new labels (#9641) 
Update release-drafter.yml
 2023-11-12 11:47:17 -03:00
Grim
3fcef89c97
Common - Add support for non-blocking progress bar (#9493) 
* add support for non-blocking-progressbar

* switch to cutRsc

* Remove fade in/out

* Update HintConfig.hpp

* Add param to and cleanup header

* Update addons/common/functions/fnc_progressBar.sqf

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

* remove key handler

---------

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2023-11-11 11:22:17 -03:00
Grim
b53d760f4a
Medical - Change default Fatal Injuries Source setting to Either (#9543) 
change default fatal injuries setting
 2023-11-11 11:21:00 -03:00
johnb432
cf8c847811
Interaction - Add crew status check for some vehicle interactions (#9637) 
* Added check for crew status

If a one or more passenger in a vehicle are conscious, not captive and hostile to the interacting unit, the interactions (passenger, cargo) will not appear.

* Update fnc_canInteractWithVehicleCrew.sqf

* Update fnc_canInteractWithVehicleCrew.sqf
 2023-11-11 09:03:32 -03:00
Dystopian
74be4f1503
Towing - Fix swimming issues (#9401) 
* Fix swimming issues

* Fix fire with rope in hand
 2023-11-10 21:16:11 -03:00
johnb432
4dd2568fe0
Cargo - Remove cargo objects from zeus editable objects (#9400) 
Remove cargo from zeus editable objects
 2023-11-10 21:13:53 -03:00
Crowdedlight
548ab810df
Attach - Add config property to set object orientation (#9623) 
* added possibility to define orientation on attach items in config

* added documentation on attach framework

* whitespace

* changed to use roll and yaw parameters instead of vectordir for easier usage, and to support placement view with rolled objects. Changed vector calculations

* Update addons/attach/functions/fnc_attach.sqf

* Docs and comments

* fix derp

* Update docs/wiki/framework/attach-framework.md

* Update attach-framework.md

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2023-11-10 21:04:22 -03:00
johnb432
0330532cd2
Refuel - Add separate names for jerry can interactions (#9625) 
Fix for #8115
 2023-11-10 19:59:15 -03:00
johnb432
0ae00248c5
Medical Engine - Fix script error for 0 overall hitpoint armor (#9633) 
* Update fnc_getHitpointArmor.sqf

* Update addons/medical_engine/functions/fnc_getHitpointArmor.sqf

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

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2023-11-10 19:49:09 -03:00
Filip Maciejewski
9f9507931f
Dragging - Fix being able to load cargo if the system is disabled (#9639) 2023-11-10 14:56:22 -05:00
johnb432
c850a6a25f
Interaction - Allow pulling bodies out of wrecks (#9618) 
Allow pulling bodies out of wrecks
 2023-11-10 14:55:40 -05:00
Mike-MF
23d7624016
Medical Treatment - Lower suture weight from 1 to 0.1 (#9635) 
Lower suture weight
 2023-11-10 14:55:25 -05:00
Filip Maciejewski
7df63ffe2e
Dragging - Fix being able to load people into vehicles from any distance (#9638) 2023-11-10 14:54:31 -05:00
PabstMirror
6bc5193a79
Tools - Check example funcs in document_functions.py (#9630) 2023-11-08 12:00:05 -06:00
BroBeans
4fb9da7b08
Laser - Revert default code to 1111 (#9588) 2023-11-06 20:16:03 +00:00
Grim
163d750a0d
Arsenal - Use forceUnicode for search functions (#9605) 
* use forceUnicode

* Update fnc_attributeAddItems.sqf

* Update fnc_handleSearchbar.sqf
 2023-11-05 15:16:44 -05:00
PabstMirror
6ce625a52f
Cleanup spaces in config macros (#9621) 
* Cleanup spaces in config macros

* remove extra whitespace before call

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2023-11-05 12:36:00 -06:00
PabstMirror
2c5ef6a6ec
Refuel - Fix infinite recursion for getCapacity on a non-CfgVehicle (#9622) 
* Refuel - Fix infinite recursion for `getCapacity` checking a non-CfgVehicle

Close #9620

* Update addons/refuel/functions/fnc_getCapacity.sqf
 2023-11-04 16:58:17 -04:00
BaerMitUmlaut
30ec1eda16
Goggles - Draw under HUD (requires 2.16) (#9615) 
Goggles - Draw under HUD
 2023-11-04 16:57:38 -04:00
jonpas
c80edd6f8e
NightVision - Draw under HUD (requires 2.16) (#9614) 
* NightVision - Draw under HUD
Fix #6819
Requires Arma 3 v2.16

* Remove unnecessary version check - cutRsc takes extra parameters fine
 2023-11-04 16:57:25 -04:00
Psycool
015b7ab3c2
Translations - Korean fixed (#9624) 
* 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

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-11-04 13:03:01 -05:00
BrettMayson
95e06254eb
Tools: HEMTT ignore has_include (#9613) 
* Tools: HEMTT ignore has_include

* Fix make.py and sqfvmChecker.py for changes

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-11-03 12:30:20 -05:00
Apricot
20676a2f03
Translations - Improve Japanese Medical Localization (#9611) 2023-11-01 19:40:42 +01:00
BrettMayson
836be21f2d
Tools - HEMTT PW3 fixes (#9585) 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-11-01 02:29:59 +01:00
Björn Dahlgren
dc944b1879
CI - Run HEMTT on Windows for binarization (#9590) 2023-11-01 02:29:22 +01:00
jonpas
2dace6eb78
Medical Engine - Fix unconscious animations referencing invalid bones (#9610) 2023-11-01 02:28:17 +01:00
BrettMayson
e2154439a8
Medical Treatment - Add separate actions for colored body bags (#9598) 
* medical treatment: separate actions for each bodybag

* remove extra icons
 2023-10-30 16:54:29 -04:00
johnb432
5ae5e514b1
Documentation - Add johnb432 to maintainers (#9604) 2023-10-28 20:49:26 +00:00
PabstMirror
37c4420da5
Configs - Fix case (#9592) 2023-10-27 20:55:42 -04:00
Grim
cdf6889b7d
Medical GUI - Increase Medical Menu side panel height (#9484) 
taller side panels

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-10-27 20:55:30 -04:00
PabstMirror
3c8cff75d8
Arsenal - Add option to show live search results (#9354) 
* Arsenal - Add option to show live search results

* use onEditChanged

* Update fnc_onKeyDown.sqf

* Update fnc_onKeyDown.sqf

* update script_components

* skip animate on live search
 2023-10-27 20:55:14 -04:00