Commit Graph

1608 Commits

Author SHA1 Message Date
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
9ff5d34ce7 Common - Add cache to fnc_isModLoaded (#8794)
* add isModLoaded cache

* add missing brackets

* missed one

* Update fnc_handlePunjiTrapDamage.sqf

* Update fnc_isModLoaded.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-01-30 11:56:20 -06:00
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
3aab21da43 Translations - Add german translations (#8771)
* Added german translations for common

* Added german translations for fire

* Added german translations

* Added german translations

* Update on german translation

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

* Updated german translation

Co-authored-by: Jo David <github@jonathandavid.de>
2022-01-12 12:35:56 -06:00
af86109c2b General - Utilize isNotEqualTo command (#8732)
* Utilize isNotEqualTo command

* fix pr validation
2021-12-18 17:15:32 -06:00
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
a9296f66d5 Medical - Update setDead to use setHitpointDamage instigator param (#8397)
* Redoing this

* Revert "Redoing this"

This reverts commit 80ff709676.

* Do this properly

* Update fnc_handleKilled.sqf

* use setDead function directly

* Handle scripted camera

* redo #8387

I'm dumb.

* try this

* if construct outside of ctrlSetEventHandler

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

* tweak disableUserInput / handleKilled

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-11-15 09:31:56 -06:00
9c946727cc General - Setting category cleanup (#8640)
* General - Setting category cleanup

- Localize ACE Uncategorized
- Add subcategories for everything in Uncategorized
- Put colors in subCategory (alphabetically last)
- Add extra info on ViewDistance settings descriptions
- Move all settings to initSettings.sqf

* Update initSettings.sqf
2021-10-30 16:42:47 -05:00
7bc6fdfa66 Cleanup - Trim all trailing whitespace (#8651) 2021-10-30 16:42:03 -05:00
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
08dff76593 Fire - Add drop weapon setting (#8578)
* Fix casing of stringtable keys

* Use CBA_fnc_addSetting

* Move burn reactions to function, add setting for weapon throwing

* Fix stringtable keys in settings

* Use stringtable entries from common component

* Update addons/fire/stringtable.xml

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

* Update addons/fire/stringtable.xml

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

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2021-10-26 14:09:45 +02:00
05c16b3250 Translations - Add Polish (#8597)
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
2021-10-24 19:22:27 +02:00
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
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
8cdf0b2c68 Revert "Common - Fix calling getVar on null object in canInteractWith (#8532)" (#8564)
This reverts commit a0e9f6015b.
2021-10-19 13:17:59 -05:00
a0e9f6015b Common - Fix calling getVar on null object in canInteractWith (#8532)
* Common - Fix calling getVar on null object in `canInteractWith`

* why was this added dedman?
2021-10-16 17:15:37 -05:00
e9912a4c33 Update of Japanese translation (#8530) 2021-10-15 22:48:18 -05:00
93b7722716 General - Cleanup CfgPatches unit/weapon arrays (#8524)
* General - Cleanup CfgPatches unit/weapon arrays
add test tool
fix refuel pump
fix flashlight pistol transport type
fix iDAB reammo box

* Update config.cpp
2021-10-15 13:48:33 -05:00
916346ae59 General - Format config class defines to coding guidelines (+tool) (#8520)
* General - Format config class defines to coding guidelines (+tool)

* Update tools/config_style_checker.py

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

* Update tools/config_style_checker.py

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

Co-authored-by: jonpas <jonpas33@gmail.com>
2021-10-15 13:47:05 -05:00
257d9536cc Cargo - Add ability to add custom name to cargo objects (#8023)
* First Push

Added the ability to edit cargo objects (crates/boxes only) names. Either via in-game action on the object it self or via 3den attributes.

Added a single function which spawns the UI to edit the name and also edits it. This is an scripted UI, it could be changed to a config version if wanted, but as I'm not good in UI coding I left it on this simple version mainly for testing.

Added 4 new stringtable entries, 2 for action and 2 for 3den attributes.

* Add extra stringtable

Forgot to add the UI to the stringtable.

* Update fnc_renameObject.sqf

fixing tabs

* Show custom name only behind

Added new function "getNameItem" that will get the items name.
Put the custom name behind the original name between brackets "[...]".

* Added "Hide Rename Action" setting

Also removed an unused _itemClass from postInit.

* Apply suggestions from code review

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

* Update AUTHORS.txt

Added my name

* Applied the sugesstions.

* Fixed function crash

* Moved to dialog.

* Removed unused comment/code

* Update renameMenu.hpp

Fixed tabs to spaces.

* Update renameMenu.hpp

* move rename to common

* Update addons/arsenal/ui/RscAttributes.hpp

* style and use addActionToObject

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-12 17:42:38 -05:00
e4be783f80 Repair - Add Locations Boost Training Setting (#8349)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-12 22:53:45 +02:00
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
81b4c276f5 Common - Fix arithmeticGetResult hash values extraction (#8503) 2021-10-11 13:57:15 -05:00
4f0fea8d67 Translations - Polish (#8497)
Add missing Polish translations
2021-10-11 00:27:06 +02:00
97deef5617 General - Use engine hashmaps (#8468)
Co-authored-by: Dedmen Miller <dedmen@users.noreply.github.com>
2021-10-10 18:55:14 +02:00
1b318433a2 Common - Add settings for additional progress bar information (#8428)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-10 18:49:41 +02:00
6128b8ef06 Common - Only switch side if necessary on person loading (#6334)
Co-authored-by: Serg Vergun <1197314+severgun@users.noreply.github.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
2021-10-10 16:26:36 +02:00
64decdd189 Cargo - Add Option to Reopen Menu After Unload (#8487)
Co-authored-by: jonpas <jonpas33@gmail.com>
2021-10-10 15:37:16 +02:00
2a7eb07803 Use modelToWorldVisualWorld (#8489)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-10 15:37:05 +02:00
d780c02ef1 Misc - Adjust some functions to be more compatible with sqfvm (#8494) 2021-10-09 15:32:53 -05:00
536ab0568f Update of Japanese translation (#8492) 2021-10-08 09:05:06 -05:00
78f9fc964a Common - Take container into account when replacing items (#8379)
* make registerItemReplacement add to proper container

* cleanup, fix variable in itemReplacements namespace

* add exception for not having room in original container
2021-10-07 00:10:19 -05:00
8d804cf76d Common - Add epilepsy friendly mode (#8452)
* Add epilepsy friendly mode

* Disable LSD vehicles in epilepsy friendly mode
2021-10-05 12:29:22 -05:00
48912be73c Captives - Disallow ACRE/TFAR radio usage on surrender/handcuff (#8388)
* Block radio on captive/surrendered/unconscious via status effect

* missing semicolon

* Don't broadcast setVar if radio addon doesn't exist

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-09-25 11:16:15 -05:00
f9d064e5f4 Add TFAR 1.0 support (#8392) 2021-09-25 11:14:17 -05:00
a4f24cbe3d CSW - Fix AI reloading from GroundWeaponHolder (#8399)
* fix fnc_ai_handleFired

* remove debug messages

* use banana instead of FakePrimaryWeapon

* switch from dummy item to new weaponholder

* use exitWith instead of break
2021-09-25 10:39:03 -05:00
58730b82fd Common - Fix getAwakAnim for some vehicles (#8435) 2021-09-13 16:33:56 -05:00
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
0c1d7177c0 Common - Block user input on headbug fix (#8398)
* Common - Block input on headbug fix

* keep return
2021-08-28 14:56:13 -05:00
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
08eadc7c19 Fix issues with action Eject on non local vehicles (#8291) 2021-07-23 17:25:00 -05:00
ec0d950a3d Common - Fix addToInventory replacing existing weapon (#8329)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-07-23 22:35:52 +02:00
5e56885b1e Fix category duplication in Russian (#8326) 2021-07-22 11:59:17 -05:00
e870e2f1f9 Common - Improve vehicle icon caching implementation (#8318)
* Use native hashmap for common vehicle icon caching

Should be more optimised
2021-07-18 18:26:23 +01:00
59e3b07c36 Common - Fix gesture anim lockout for some launchers (#8282) 2021-06-28 00:01:32 -05:00
9291d9b714 Medical - Hide cursor when unconscious (#8269)
* Hide cursor when blocking inputs

* Update addons/common/DisableMouseDialog.hpp

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

* Update addons/common/functions/fnc_disableUserInput.sqf

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

* Update addons/common/DisableMouseDialog.hpp

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-06-27 15:39:17 -05:00
88b1c5b917 Tools - Add script to check sqf/config with sqfvm (#8137) 2021-04-20 12:39:05 +02:00
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
22faa51233 Common - Fix Gesture mutex for scroll-wheel reloads (#8142)
* Common - Fix Gesture mutex for scroll-wheel reloads

* simplify gvars and add comments
2021-03-03 15:31:07 -06:00
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