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,003 Commits 73 Branches 88 Tags 752 MiB
9641fe490b
Commit Graph

563 Commits

Author SHA1 Message Date
Grim
55566fd60f
Interaction/Dragging - Remove actions from scripted weaponHolders (#9541) 
remove actions from scripted holders
 2023-10-19 20:24:38 -04:00
PabstMirror
d8eb97f4ec
Tools - Fix configs for hemtt1.9.0 (#9423) 2023-09-23 11:37:41 -05:00
jonpas
742626ff1a
General - Relative script_component.hpp includes (#9378) 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-09-12 20:58:10 +02:00
Apricot
c1c1433c44
Translations - Improve and Add Japanese (#9357) 
* update japanese

* full-width to half-width

* more tweak
 2023-08-31 11:24:35 -05: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
jonpas
43cded706c
Interaction - Use assignTeam instead of deprecated CBA event (#9326) 2023-08-16 14:15:44 +02:00
BaerMitUmlaut
52ed0fc6be
Medical Engine - Prevent automatic unloading of dead or unconscious units (#7959) 
* Lock seats of unconscious or dead units

* disable pullOutBody if medical is loaded

* fix undefined var and switch to objectParent

---------

Co-authored-by: Salluci <salluci.lovi@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2023-07-22 09:41:20 +03:00
Dystopian
1b8c56f0be
Interaction - Add actions to access and allow carrying inventory holders (#6029) 
* Add interaction to inventory holders

* Add Take Weapon action

* Add Drag/Carry actions

* Fix menu position

* Add Inventory action also to unconscious

* Underwater: Fix menu position, disable gear action

* Add dead body weapons carrying with workaround

* Disable man gear action in water

* Optimize position code

* Fix macro using

* Use macro and power

* Restrict max dragged items count

* Remove superfluous condition, Add Take action to all holders

* Cleanup XEH

* Remove weapon carry-drop workaround

* code style changes

* code style changes

* brackets, isEqualTo, vehicle check

* code style changes

* brackets, isEqualTo, vehicle check

---------

Co-authored-by: Salluci <salluci.lovi@gmail.com>
 2023-07-10 05:49:37 +03:00
Abogado
3d3aa8d877
Update Spanish translation (#9203) 
An update of the spanish to the text strings that have been added lately.
 2023-05-29 18:22:37 -05:00
PabstMirror
79925b2f76
Interaction - Fix opening locked doors for GM buildings (#9154) 
* Interaction - Fix opening locked doors for GM buildings

Fix #9143

* Update addons/interaction/functions/fnc_openDoor.sqf
 2023-04-30 16:56:39 -05:00
BrettMayson
a40b0d48f2
HEMTT v10 Compatibility (#9105) 
* HEMTT v10 Compatibility

* Update addons/field_rations/CfgUIGrids.hpp

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

* fix PabstMirror review

* optionals

* End empty macro definitions with semi-colon (HEMTT v0.10)

* Adapt to HEMTT v0.10.0-a14

* Revert End empty macro definitions with semi-colon

* Disable old HEMTT build step in CI

* Add missing include and fix macro usage and include casings

* End empty macro definitions with semi-colon (HEMTT v0.10)

* Update addons/disarming/functions/fnc_showItemsInListbox.sqf

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

* cleanup test code

* arty - keep style same as before

* fix fire screams

* Update script_component.hpp

* Keep old hemtt/workflow/sqfc

* Update arma.yml

* Update arma.yml

* Update CfgUIGrids.hpp

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
 2023-02-01 23:28:55 -06:00
Smith
dc9a3eb064
Translations - Russian (#9095) 
* Add missed & fix existed

* Fix russian translation when renaming
 2022-12-03 13:57:43 -06:00
mharis001
56df203477
Interaction - Fix handle animation name for carrier doors (#8909) 2022-05-13 00:24:41 -04:00
Psycool
61f74831a1
Korean Translation 100% done (#8899) 
* Korean Translation 100% done

fixed typos, changing the Korean transliteration of proper nouns, and changing the meaning of the original to a more understandable interpretation without compromising the transmission of the original

* Something Edited

edit incorrect translation and add typo correction
 2022-05-09 20:28:28 -05:00
RcINS
7197be2f49
Localization - Improve Simplified Chinese (#8781) 
* Improve Chinese translation

* Optional Compat SOG and Tracers Simplified Chinese

* Fix settings string not correctly localized

* Fix mode of heli minigun have no realistic name

* Fix Regex replace flaw

* fix merge

* Various improvements

* Translate CSW, fix short name not short

* Trim

* Magazines naming

* Minor tweak

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2022-02-14 15:57:50 -06:00
jtj5283449
4d53d9ce44
Translation - Korean v2.0 (#8768) 
* Add files via upload

* Add files via upload

* Delete stringtable.xml

* Delete advanced_ballistics directory

* Add files via upload

* Add files via upload

* Add files via upload

* Normalize line endings

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2022-01-12 14:41:09 -06:00
Serg Vergun
af86109c2b
General - Utilize isNotEqualTo command (#8732) 
* Utilize isNotEqualTo command

* fix pr validation
 2021-12-18 17:15:32 -06:00
mihuan-0
ce6e0d48a1
Translations - Add missing Simplified Chinese translation and change a few existing ones (#8731) 
* Add files via upload

* Delete stringtable.xml

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Apply suggestions from code review

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-12-18 17:13:43 -06:00
PabstMirror
4b12047a79
Interaction - Fix PlasticCase_01_base_F UBC (#8681) 2021-11-14 12:36:23 -06:00
PabstMirror
7bc6fdfa66
Cleanup - Trim all trailing whitespace (#8651) 2021-10-30 16:42:03 -05:00
Nilia119
d86ddb41d6
Translations - Add Missing German (#8592) 
* Added German Translation

Added German Translation

* Added German Translation

Added German Translation

* Added German Translation

Added German Translation

* Added German Translation

Added German Translation

* Added German Translation

Added German Translation

* Update addons/arsenal/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/ballistics/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/ballistics/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/cargo/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/cargo/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update addons/common/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/common/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/common/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/ui/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/vehicle_damage/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/vehicle_damage/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/vehiclelock/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/common/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/cookoff/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/cookoff/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/explosives/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/explosives/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/field_rations/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/field_rations/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/field_rations/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/fire/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/field_rations/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/fortify/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/gforces/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/grenades/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/gunbag/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/hellfire/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/hellfire/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/interact_menu/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/interaction/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/magazinerepack/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/map_gestures/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/map_gestures/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/map_gestures/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/map_gestures/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/map_gestures/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/map_gestures/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/markers/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/markers/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/markers/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/markers/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/markers/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/medical_damage/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/medical_damage/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/medical_engine/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/medical_engine/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/medical_feedback/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update stringtable.xml

* Update addons/medical/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Apply suggestions from code review

Co-authored-by: Jo David <github@jonathandavid.de>

* Update stringtable.xml

* Update addons/explosives/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/gforces/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/medical/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/medical_engine/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

Co-authored-by: Jo David <github@jonathandavid.de>
 2021-10-28 00:10:19 -05:00
Dedmen Miller
7b32edff09
Add PlasticCase OpenBox interaction (#8605) 2021-10-26 18:06:04 -05:00
Krzyciu
05c16b3250
Translations - Add Polish (#8597) 
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
 2021-10-24 19:22:27 +02:00
Beeperz
c00c6b826c
Added some russian translations (#8565) 
* Added some russian translations

* replace tabs

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-10-20 13:34:43 -05:00
Elgin675
958a0bf9ec
Translations - Update French Translations (#8562) 
* Add french translation of EnableSpeedIndicator keys

* Add french translation of EpilepsyFriendlyMode keys

* Add french translation (SpecterOS, SpecterOS 7.62, Burris XTR II, EOTech XPS3)

* Add french translation of the cargo renaming fonctionality (added in PR8023)

* Fix typo in 127x99_API_Mag_NameShort translations

* Add french translation of `LocationsBoostTraining_Description` key

* Add french translation of `interactWithTerrainObjects_Description` key

* Add french translation of `repackLoadedMagazines` keys

* Add french translation of `Rename group` self-interact fonctionality (added in PR8346)

* Add french translation of `Medical_Feedback_EnableHUDIndicators` keys

* Add french translation of Vehicle Towing fonctionality (Added in PR8380)

* Fix English and Japanese translation of length rope (18.3, 27.4 and 36.6 meters)

* Add french translation of customize Medical GUI colors settings (added in PR8350)

* Add french translation for additional progress bar information feature (added in PR8428)

* Add french translation in multiple modules.

* Fix French translation of `STR_ACE_Overheating_cookoffCoef_description` key.
 2021-10-19 15:30:46 -05:00
Björn Dahlgren
b12af1e0b5
General - Format config classes with consistent spacing (#8550) 2021-10-18 11:56:43 -05:00
jonpas
37c16afe9c
Interaction - Fix Open Door keybind (#8547) 
* Interaction - Fix Open Door keybind
Reach distance calculation didn't give position to

* getPosASL is redundant
 2021-10-17 16:58:35 -05:00
classic
e9912a4c33
Update of Japanese translation (#8530) 2021-10-15 22:48:18 -05:00
Dystopian
0c58d8b20b
Interaction - Add interaction with terrain objects (#8103) 
* Add interaction with terrain objects

* Optimize with new commands

* Handle z-position under ground

* Add warning for setting

* Add parentheses to condition

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

* Add comments

* Add parentheses to condition

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

* Add parentheses to condition

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>

* Add replacement configs to dragging

This reverts commit afc5abe6cd.

* Fix validator error and optimize condition

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-10-12 14:36:33 -05:00
Seb
88e774c30d
Interaction - Rename group self-interact (#8346) 
* Group renaming self interact

* UI base

* Custom UI solution (looks terrible)

* Improve GUI, optimise functions

* Add exitWith return value to fnc_renameGroup

* tabs to spaces

* Small tweaks

* newlines

pre-empting newline gestapo

* input prompt caps

* Implement suggestions

* Remove already inherited value

* Per-side group name handling

* Add same group case sensitive changes.

* Suggestions

- Use ace_common_fnc_displayTextStructured
- Formatting
- Phrasing of strings

* replace spawn with CBA_fnc_execNextFrame

* Update addons/interaction/initSettings.sqf

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

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-10-12 12:53:35 -05:00
GhostIsSpooky
998f86f034
General - Move to CBA Settings (#8461) 
* first pass

* second pass

* third pass

* final pass

* missing commas

* newlines

* switch to cba eventhandler

* newlines, formatting

* laser - movedToSQF

* add logging to ace_common_fnc_cbaSettings_loadFromConfig

* Update initSettings.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-10-11 15:48:30 -05:00
Serg Vergun
af66a9881c
Interaction Menu - Add triage colors to icons at passengers list (#8366) 2021-10-11 11:51:05 +02:00
Krzyciu
4f0fea8d67
Translations - Polish (#8497) 
Add missing Polish translations
 2021-10-11 00:27:06 +02:00
Ozan Eğitmen
2a7eb07803
Use modelToWorldVisualWorld (#8489) 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-10-10 15:37:05 +02:00
PabstMirror
efe09682cc
Add SQFC support (#8235) 
* sqfc

compile_script
cba 3.15.5 and update make.py

* \n

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

* Update make.py

Co-authored-by: jonpas <jonpas33@gmail.com>
 2021-09-03 19:08:34 -05:00
Kyle Mckay
56123591a0
Update contribution documents (#8382) 
* Update code guidelines for script_component

* Update contributing documents for pull requests

- Reflect true attribution practices
- Reflect true merge process (this changed a long time ago)

* Remove listed maintainer from component readmes

We have almost never used these and serve as a source of confusion for
new contributors.
 2021-08-16 20:17:56 +01:00
mharis001
97ac12039f
Interaction - Disable open box action when inventory is locked (#8285) 2021-06-27 15:24:41 -05:00
Elgin675
e4a96b7229
Update French Translation and Fix Typo (#8262) 2021-05-23 16:57:36 -05:00
Abogado
f96b410fa0
Translations - Spanish (#8229) 
Complete to date spanish translation.
 2021-04-26 11:48:02 -05:00
classic
7112bebaa7
Update Japanese translation (#8150) 2021-03-06 14:27:35 -06:00
Dystopian
69c3d2bb65
Add Weapon Attachments interaction (#7706) 
* Add Weapon Attachments interaction

* Apply recommended changes

* Format addPEH

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>

* Remove toLower

* Update required CBA version

* Rename category to Accessories

* Change setting var name

* Add setting description

* Fix notification size

* Optimize with new commands

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
 2021-03-04 11:43:11 -06:00
Neviothr
75f7ed7532
Utilize isNotEqualTo (#7929) 
* Utilize isNotEqualTo

* undo changes to some files

* redo some changes, fix based on @Vdauphin 's comment

* fix validator issues

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-02-27 11:05:05 -06:00
Dystopian
b151148542
Replace canAdd with CBA_fnc_canAddItem (#8012) 2021-02-27 10:26:12 -06:00
PabstMirror
e8693c8db9
Various - Use configOf command for faster lookup (#8100) 
* configOf

* replace some use of CBA_fnc_getObjectConfig
 2021-02-18 12:58:08 -06:00
BaerMitUmlaut
260706cb9f
Fix door opening for buildings with 10+ doors (#7975) 2020-11-02 12:22:53 -06:00
Joko
153644b77a
Reload/Interaction - Fix 2 hemtt ingame errors (#7924) 
* fix 2 hemtt ingame errors

* Extract broken calls to function

* Update addons/interaction/functions/fnc_doRemoteControl.sqf

Co-authored-by: Dystopian <sddex@ya.ru>

Co-authored-by: Dystopian <sddex@ya.ru>
 2020-10-21 11:17:42 -05:00
Taha
e53bc23ebf
Turkish Language Update (#7909) 
Added missing translation to Turkish
 2020-10-04 10:57:46 -05:00
Taha
35e4c2ae35
Turkish Language Update (#7690) 
* Fatal

Turkish Language Update

* Update AUTHORS.txt

* Update stringtable.xml

Problems solved

* Update stringtable.xml

Problems solved

* Update stringtable.xml

Problems solved

* Update stringtable.xml

Problems solved

* Fix medical_treatment

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2020-05-09 12:26:27 -05:00
Filip Maciejewski
25e212cfa3
Interaction - Show current team color in Team Management menu (#7650) 
* Show current team in interaction menu

* Use nametags color for Team Management icon color

* Use nametags color in Join team action icons colors

* Update addons/interaction/functions/fnc_modifyTeamManagementAction.sqf

Co-Authored-By: jonpas <jonpas33@gmail.com>

* Apply suggestions from code review

Co-authored-by: jonpas <jonpas33@gmail.com>
 2020-04-30 11:39:03 -05:00
classic
7cc168e1b9
Updated japanese translation (#7668) 2020-04-27 11:24:34 -05:00