Commit Graph

1605 Commits

Author SHA1 Message Date
johnb432
0bee7614ad
Common - Improve weapon unloading (#9344)
Fix weapon unloading
2023-08-26 12:04:31 -04: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
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
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
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
Grim
4f4389dd59
Common - Fix loading units into FFV cargo seats (#9280) 2023-07-22 09:12:42 +03:00
Grim
39e4f9340b
Common/Medical - Change vehicle checks to objectParent (#9281)
* switch to objectParent

* use objectParent in unloadUnit

* fix derp

* allow unload patient on dead units
2023-07-22 09:11:58 +03:00
johnb432
9505d4c47e
Dragging - Fix unintended Cargo dependency and improve ragdoll/disconnection handling (#9272)
* Improvements

* fix unintended cargo dependency

* stringtable

---------

Co-authored-by: Salluci <salluci.lovi@gmail.com>
2023-07-22 07:01:30 +03:00
Grim
35ce8d1883
Common - Add variable to block item replacement temporarily (#9265)
* add blocking item replacement

* don't add if player changed

* re-curse instead of fake item

* compileFinal

* Update fnc_registerItemReplacement.sqf

* move to separate function

* remove fakeitem replacement

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-07-22 06:31:30 +03:00
Grim
e5dc124fe8
Dragging - Add additional weight checks on inventory modification (#9225)
* Allow run when carrying light-weight objects

* Use global var instead of macro

* add weight check, improve getWeight & conditions

* changes from review

* changes from review - postInit

* add param to ignore PhysX mass

* add settings

* BI issue tracker in comment

* change defaults, remove overweight setting

* remove public variable

* setting name changes

* updating case in statusEffect_addType

* move to XEH

* derp

* Add some extra checks for closed events

* Update XEH_postInit.sqf

* conditions

---------

Co-authored-by: Dystopian <sddex@ya.ru>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-07-22 06:30:40 +03:00
johnb432
c8404f496e
Arsenal - Add/Fix/Improve/Change numerous aspects (#9040)
* Arsenal update

* Fixes

* Update fnc_onSelChangedLeft.sqf

* Update fnc_updateUniqueItemsList.sqf

* Header fixes

* Fix for defines.hpp

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

* Moved fnc_baseWeapon, filtered invalid items

* Update addons/arsenal/functions/fnc_scanConfig.sqf

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

* Fixes and tweaks

- Sorting is guaranteed to give a fixed order
- Dog tags no longer throw errors when reloading the ACE arsenal mission when you had some saved in your loadout before quitting the last time you played.

* Cleanup, bug fixes and additions

- Added the ability to add items from "CfgMagazines" into the "Misc. items" or custom tabs.
- Added "baseWeapon" class support for weapon attachments. If a weapon attachment has the config property "baseWeapon" defined, it will take that item and show that in the arsenal.
- Added stronger filtering on item scopes (scope > 0 at least for every item)
- Added "descending" (default, as it is now) and "ascending" sort order as a drop down menu,
- Unique backpacks in containers can now be removed with either the "-" or "clear all items" button.
- When sorting by a number, 2 decimal points have been added, so that when you sort by weight it returns the correct order.

* More fixes and tweaks

- Converted the arsenal to partially work with hashmaps instead of arrays (for configItems and virtualItems, currentItems is still an array).
- Because of the above, performance of FUNC(addVirtualItems) and FUNC(removeVirtualItems) has improved immensely.
- Sorting now caches results, reducing repeated sorting times drastically.
- CBA disposable launchers are handled differently now: Within the arsenal, you can change weapon attachments on disposable launchers, but you can't change their magazines (primary or secondary). Item info on the right and the stats show correct information.
- FUNC(addSort) now checks if the new sorting method already exists and doesn't add it if it does.
- FUNC(removeSort) now exists. You can't remove the default sort type (alphabetically) to avoid problems with the arsenal.
- Both FUNC(addStat) and FUNC(compileStats) actually taken priority into account now. Because of that priority on several stats needed to be tweaked.
- FUNC(removeStat) ensures that there are no gaps within the stat array (so if there is an empty spot in the stats page, it's because there is a stat, but the condition for it being shown hasn't been met).

* Update fnc_replaceUniqueItemsLoadout.sqf

* Update fnc_onSelChangedLeft.sqf

* Update fnc_scanConfig.sqf

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

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

* Minor cleanup

* Baseweapon filtering

* Improvements + better unique items support

* Update fnc_fillRightPanel.sqf

* Update fnc_onSelChangedLeft.sqf

Fixed: Switching between weapons with incompatible primary magazines while a compatible secondary magazine is loaded doesn't equip the new weapon's primary magazine.

* Update addons/common/functions/fnc_uniqueUnitItems.sqf

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

* undefined variable

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

* fix undefined loadout var

* Update fnc_fillLoadoutsList.sqf

---------

Co-authored-by: Dystopian <sddex@ya.ru>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-07-21 21:25:25 +03:00
Grim
8032ccacfc
Common - Add FUNC(hasZeusAccess) (#9252)
* add fnc_hasZeusAccess

* header

* Update addons/common/functions/fnc_hasZeusAccess.sqf

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-07-10 06:45:22 +03:00
johnb432
1aa7eb2a1a
Update fnc_codeToString.sqf (#9249) 2023-07-09 23:41:12 +03:00
Dystopian
8b94d765aa
Dragging - Allow run when carrying light-weight objects (#8338)
* Allow run when carrying light-weight objects

* Use global var instead of macro

* Update addons/common/XEH_postInit.sqf

---------

Co-authored-by: jonpas <jonpas33@gmail.com>
2023-06-28 14:43:10 +03:00
Wakbub
117c3092f8
Common - Fix added throwables not being throwable (#9186)
Replace
- addMagazineCargoGlobal with addItemTo(Uniform/Vest/Backpack to make added throwables throwable.
2023-06-24 05:09:30 +03:00
Grim
49f4ea23e7
Docs - Add Grim to maintainers (#9223)
* secret handshake?

* fix my name

* new github username
2023-06-19 16:31:17 +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
fedefd5799
SOG Compat - Fix compatibility with grad trenches (__has_include) (#9189) 2023-05-01 19:40:16 +02:00
jonpas
48a4e9682c Forbit use of (optional) in function headers, always require a value 2023-05-01 17:33:07 +02:00
PabstMirror
19e88aa8e7
Common - Fix script error in fnc_getVehicleCargo (#9156)
* Update fnc_getVehicleCargo.sqf

Close #9155

* change var name

Co-Authored-By: commy2 <6576312+commy2@users.noreply.github.com>

---------

Co-authored-by: commy2 <6576312+commy2@users.noreply.github.com>
2023-04-30 16:56:26 -05:00
PabstMirror
fbe23ee45f
Optionals - Load dynamically based on presence of mod (__has_include) (#9116)
* Optionals - Load dynamically

* Update XEH_preStart.sqf

* Update pboproject.yml

* Update script_macros.hpp

* use addon.toml for hemtt

* Update pboproject.yml

* update all actions

ref
Node.js 12 actions are deprecated. Please update the following actions to use Node.js 16: actions/checkout@v2, actions/upload-artifact@v2.

* Update arma.yml

* Update arma.yml

* Update arma.yml

* Update arma.yml

* Update arma.yml

* Update arma.yml

* Apply suggestions from code review

Co-authored-by: Björn Dahlgren <bjorn@dahlgren.io>

* Update settings.json

* cleanup interm hemtt changes

* Update .github/workflows/arma.yml

* Apply suggestions from code review

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

---------

Co-authored-by: Björn Dahlgren <bjorn@dahlgren.io>
Co-authored-by: jonpas <jonpas33@gmail.com>
2023-04-30 16:53:43 -05:00
jonpas
76e1aafb33
Use function documentation script (#6897)
Co-authored-by: Björn Dahlgren <bjorn@dahlgren.io>
2023-04-30 23:03:35 +02:00
PabstMirror
b78f8684b7
Common - switch getTurretConfigPath to use cba func (#9180) 2023-04-14 17:42:57 -05:00
Psycool
d87e16e87e
Korean Translation Improved (#9164)
* 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
2023-03-10 19:17:36 -06:00
mharis001
67ebb15e07
Dragging - Improve weapon reselect behaviour (#9052)
* Dragging - Improve weapon reselect behaviour

* Add and use func to getFiremodeIndex

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-02-13 22:01:51 -06:00
JonBons
86d79b2fc1
Common - Fixed CBA keybinds not working with progress bar (#9139)
* Fixed CBA keybinds not working on the progress bar after cursor hiding change

* Removed fallback value for uiNamespace lookup

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

---------

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
2023-02-13 21:57:32 -06:00
PabstMirror
cac223c6ec
Common - Use hashmap variable for canDig surfaces (#9147)
* Common - Use hashmap variable for canDig surfaces

* Update XEH_preInit.sqf

* Update fnc_canDig.sqf

* Update fnc_canDig.sqf
2023-02-09 13:16:42 -06: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
mharis001
b4005bca43
Common - Fix disableUserInput blocking respawn (#9053) 2023-01-31 17:14:50 -06:00
JonBons
6b3aa3e0a2
Common - Hide cursor during progress bar (#9128)
* Common - Hide cursor during progress bar (w/ CBA setting)

* Fix base class define

* Removed CBA setting for disabling hiding of the cursor for the ACE progress bar

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-01-24 13:57:10 -06:00
Smith
dc9a3eb064
Translations - Russian (#9095)
* Add missed & fix existed

* Fix russian translation when renaming
2022-12-03 13:57:43 -06:00
PabstMirror
cc3bad3c56
XM157 (NGSW-FC Smart Scope) Framework (#8897)
* XM157 (NGSW-FC Smart Scope)

* Update addons/common/functions/fnc_rscObjectHelper.sqf

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

* Update addons/xm157/functions/fnc_weaponInfo_draw.sqf

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

* Headers

* Handle prone-deploy weapon bank

* Disable Reticle picker for now

* some localizations

* Change font

looks like CUP modifies EtelkaMonospaceProBold for some reason??

* Create xm157-framework.md

* Formating

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
2022-09-01 13:44:19 -05:00
BrettMayson
438a90b63d
Common - Add CBA extended loadout (#8923)
* extended loadouts - earplugs, gunbag, and arsenal identity

* arsenal - maintain default loadout size check

* restore comment

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

* fix forgotten example

Co-authored-by: jonpas <jonpas33@gmail.com>
2022-08-25 11:56:54 -05:00
RcINS
904310c99a
Translation - Add Simplified Chinese translation (#8984)
* Complete Simplified Chinese translation

* Slight tweak translation
2022-07-30 18:08:44 -05:00
Psycool
44ccc7b185
Korean Typo Fix (#8968)
* KoreanTranslation

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

* koreantranslation

* Korean Typo Fix
2022-07-19 17:09:08 -05:00
Psycool
088e5ebb6d
Added Korean Translation for new stuff (#8960)
* KoreanTranslation

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

* koreantranslation
2022-07-08 20:15:04 -05:00
Krzyciu
cce1700f9c
Translations - Add Missing Polish (#8921)
* Translations - Add Missing Polish

When merged this pull request will:

- Add missing Polish Translations

* Missing space

* Typo

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

* Typo

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-05-28 12:30:28 -05:00
Apricot
74e49d1f5a
Translations - Add and Improve Missing Japanese (#8924)
* Japanese Translation Update

Fill missing Japanese translation and Weird translation fixes made long ago.

* Remove Corner Bracket and change it to apostrophe

* Update STR_ACE_Common_unloadWeapon

* Update SunflowerSeeds Description
2022-05-27 14:06:51 -05:00
Drofseh
86f08af250
Common - Add keybind and function to unload unit's weapon/muzzle (#8735)
* add keybind and function to unload unit's weapon/muzzle

- add keybind and function to unload unit's weapon/muzzle
- requires https://github.com/CBATeam/CBA_A3/pull/1527

* change function name

* rename the file too

* Create common-framework.md

* Set REQUIRED_CBA_VERSION to 3.15.7

* Update required CBA version

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

* Apply suggestions from code review

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-05-18 13:07:47 -05: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
Tim Beswick
27c5464654
Common - Add separate blockSpeaking status for acre direct (#8904)
* Add separate blockSPeaking status for acre direct

* Move TFAR code to new blockSpeaking handler

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-05-08 13:20:15 -05:00
jonpas
3442a47942
General - Remove deprecated functions (#8878) 2022-04-17 08:27:19 +01:00
diwako
51b703a746
Common - Fix undefined variable (#8872)
Moved ace_common_isModLoadedCache from postinit to preinit. The hash object can be used before post init which then produces errors.
2022-04-10 15:27:10 -05:00
GhostIsSpooky
68ed19911a
General - Change object config lookups to configOf (#8795)
* configOf lookups

* forEach, missed configOf

* revert handcuff distance change

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

* optimize condition

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

* capitalization

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

* use object in getVehicleIcon

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

* add return comment

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

* remove extra brackets

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

* add missing brackets

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

* add return comment pt2

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

* revert to cursorTarget

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-03-08 21:41:21 -06:00
PabstMirror
ed228c54ac
Common - Block radio status effect without blocking direct voice (ACRE) (#8659)
* Common - Block radio status effect won't block PTT voice (ACRE)

* Update addons/common/XEH_postInit.sqf
2022-03-08 16:40:48 -06:00
GhostIsSpooky
a4ae61f1fc
CSW - Add reloading from nearSupplies (#8776)
* allow players to reload from nearSupplies

* limit reloading to friendly sides

* add handling for ai getting inside empty weapon

* configOf for lookup

* add getin handler, hammer out remaining bugs

* configOf lookup

* improve friendly/object filter

* more configOf lookups

* Capitalize settings, add ammo storage setting

* remove systemChat

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

* fix TRACE

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

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-03-07 12:29:19 -06:00
Brett
90d63475d5
Medical Treatment - Add preferred seats for loading patients (#8789)
* Medical Treatment - Add preferred seats for loading patients

* load patients in reverse order

* add option for reverse fill

* Update addons/medical_treatment/functions/fnc_loadUnit.sqf

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

* Update docs/wiki/framework/medical-treatment-framework.md

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

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-02-17 11:14:39 -06: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
GhostIsSpooky
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
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
Eduard Schwarzkopf
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
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
GhostIsSpooky
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
PabstMirror
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
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
Filip Maciejewski
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
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
PabstMirror
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
PabstMirror
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
classic
e9912a4c33
Update of Japanese translation (#8530) 2021-10-15 22:48:18 -05:00
PabstMirror
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
PabstMirror
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
Jasper
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
GhostIsSpooky
e4be783f80
Repair - Add Locations Boost Training Setting (#8349)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-12 22:53:45 +02: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
Whigital
81b4c276f5
Common - Fix arithmeticGetResult hash values extraction (#8503) 2021-10-11 13:57:15 -05:00
Krzyciu
4f0fea8d67
Translations - Polish (#8497)
Add missing Polish translations
2021-10-11 00:27:06 +02:00
GhostIsSpooky
97deef5617
General - Use engine hashmaps (#8468)
Co-authored-by: Dedmen Miller <dedmen@users.noreply.github.com>
2021-10-10 18:55:14 +02:00
GhostIsSpooky
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
BaerMitUmlaut
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
Ozan Eğitmen
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
Ozan Eğitmen
2a7eb07803
Use modelToWorldVisualWorld (#8489)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-10 15:37:05 +02:00
PabstMirror
d780c02ef1
Misc - Adjust some functions to be more compatible with sqfvm (#8494) 2021-10-09 15:32:53 -05:00
classic
536ab0568f
Update of Japanese translation (#8492) 2021-10-08 09:05:06 -05:00
GhostIsSpooky
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
BaerMitUmlaut
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
Salluci
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
Salluci
f9d064e5f4
Add TFAR 1.0 support (#8392) 2021-09-25 11:14:17 -05:00
Salluci
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
PabstMirror
58730b82fd
Common - Fix getAwakAnim for some vehicles (#8435) 2021-09-13 16:33:56 -05: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
PabstMirror
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
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
Joko
08eadc7c19
Fix issues with action Eject on non local vehicles (#8291) 2021-07-23 17:25:00 -05:00
JoramD
ec0d950a3d
Common - Fix addToInventory replacing existing weapon (#8329)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-07-23 22:35:52 +02:00
Serg Vergun
5e56885b1e
Fix category duplication in Russian (#8326) 2021-07-22 11:59:17 -05:00
Kyle Mckay
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
PabstMirror
59e3b07c36
Common - Fix gesture anim lockout for some launchers (#8282) 2021-06-28 00:01:32 -05:00
BaerMitUmlaut
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
PabstMirror
88b1c5b917
Tools - Add script to check sqf/config with sqfvm (#8137) 2021-04-20 12:39:05 +02: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
PabstMirror
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
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
mharis001
5bc43fe247
Common - Improve getPylonTurret by using getAllPylonsInfo (#8087)
* Improve getPylonTurret by using getAllPylonsInfo

* Fix indentation

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-02-23 10:57:57 -06:00
PabstMirror
0570c0b861
Update fnc_cbaSettings_loadFromConfig.sqf (#8118) 2021-02-19 11:18:21 -06:00
TyroneMF
f85632cbbd
initial push (#8099) 2021-02-18 12:58:26 -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
PabstMirror
b50a49c287
Convert all true/false in configs to 0/1 (#8095) 2021-02-08 04:14:45 +01:00
BaerMitUmlaut
ad75c7c9b8
Common / Medical - Fix loading patients into turret only seats (#7980)
* Fix loading patients into turret only seats

* Fix cargo logic, adjust function for captives (#8000)

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-11-15 12:57:27 -06:00
Taha
e53bc23ebf
Turkish Language Update (#7909)
Added missing translation to Turkish
2020-10-04 10:57:46 -05:00
mharis001
0f08a18f89
Medical - Add force walk option to fracture setting (#7852)
* Medical - Add force walk option to fracture setting

* Add French translation

Co-authored-by: Elgin675 <elgin675@hotmail.com>

* Reduce calls to statusEffect_set (#7865)

* Reduce calls to statusEffect_set

* statusEffect_addType fracture to forcewalk

Co-authored-by: Elgin675 <elgin675@hotmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-08-22 19:37:15 -05:00
Mysteryjuju
02a242b6e7
Enable trenches on snow on Thirsk Winter map (#7830)
Signed-off-by: Mysteryjuju <mysteryjuju42@gmail.com>
2020-08-04 09:21:29 -05:00
mharis001
553bba8ece
Common - Fix disableUserInput blocking already open Zeus display (#7757) 2020-06-19 10:36:24 -05:00
Smith
7a8a17b924
Add Russian translation (#7742)
* Russian translation

* Update AUTHORS.txt

* CSW Fix Russian translation

* Fix RU translation mistakes

* Small fixes RU translation
2020-05-31 16:04:21 -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
Dominik Butschek
7a7485e016
Translations - Add missing Czech translation strings (#7683)
* add missing Czech translation strings

* improve ClearTraumaAfterBandage translation
2020-05-06 17:33:44 -05:00
PabstMirror
a9a69ac4ff
Headers - Fix function names in examples (#7663) 2020-04-25 08:41:45 +02:00
commy2
1d407b314b
fix Unknown name (#7662) 2020-04-24 23:59:47 +02:00
PabstMirror
1e2b88f170
Minor RPT cleanup (#7658) 2020-04-22 10:05:22 -05:00
mharis001
58a0cd860b Common - Add isNotUnconscious canInteractWith condition 2020-02-22 17:07:32 -05:00
Whigital
1a2487d61f
Medical Feedback - Set volume and radio usage based current unit (#7529) 2020-02-22 21:24:47 +01:00
Whigital
8c2f53ac14 Revert quotation on string args 2020-02-12 22:07:19 +01:00
Whigital
80352519e1 conform isnil checking: common 2020-02-12 17:28:18 +01:00
PabstMirror
dd7ae389f9 Common - Fix canDig returning non-bool (#7516) 2020-02-08 19:43:42 -06:00
M3ales
71da4360b8 Changed version to versionStr as fix for #7478 (#7479)
Ensures return value of string is preserved.
2020-01-18 11:15:49 -06:00
Taha
d8f18c685b Turkish Language Update (#7446)
* Fatal

* Fatal

* Fatal

Turkish Language Update

* Fatal

* Update AUTHORS.txt

* Fatal

Fix

* Update AUTHORS.txt

* Update

* Delete stringtable.xml

* Update stringtable.xml

* Delete stringtable.xml

* Revert "Delete stringtable.xml"

This reverts commit 704c1e838c.

* Update stringtable.xml

* Fix

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-01-16 21:14:23 -06:00
Jo David
245a60fbbc Changed: Spanish translations updated (#7432)
* Updated spanish traslation

* Updated spanish traslation

* Updated spanish traslation

* Updated spanish traslation

* Updated spanish traslation

* Spanish traslation updated

* Spanish traslation updated

* Spanish traslation updated

* Spanish translation updated

* Spanish traslation updated

* Spanish traslation updated

* Spanish traslation updated

* Spanish translation updated

* Spanish translation updated

* Merge patch-12

* Laser - Spanish translation updated

* Logistics_uavbattery - Spanish translation updated

* Apply suggestions from code review

Co-Authored-By: Ferran Obon <magnetar5891@gmail.com>

Co-authored-by: ArgA-Maxtor <martincardozo@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Ferran Obon <ferran@idi-systems.com>
2020-01-11 10:08:35 -06:00
Patryk Zachnik
edb53084b3 Polish Translation (#7397)
* Polish Translation

Updated Polish Translation

* remove dupes

* Update stringtable.xml

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-01-09 23:14:45 -06:00
Italiandrache
05e99c5154 Changed: Updated italian translation (#7405)
* Updated italian translation

* Minor corrections

* Some corrections

* Other corrections

* Minor translation
2020-01-09 06:02:41 +01:00
Keewayz
e908345eae Additions to Polish Translation (#7374)
* Addition to Polish translation

*added missing polish translation up to adv_ballistic, adv_fatigue, ballistics, common, cookoff, explosives, grenades, medical_statemachine, medical_treatment, rearm, spectator, switchunits, weather

* Next Addition to Polish translation

#some missing stuff

* Apply Code Review Suggestions

Co-Authored-By: Filip Maciejewski <veteran29q+github@gmail.com>

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
2020-01-07 13:53:02 -06:00
Taha
ddbc0221f6 Turkish Traslations (#7390) 2020-01-05 18:37:48 +01:00
classic
1aec991f54 Update Japanese translation (#7371)
* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation
2020-01-03 10:07:52 -06:00
D3L7A01
14b1ca5b83 Italian Translations (#7346)
* Add some translation eng to ita

* Translation eng-ita completed

Translation completed from English to Italian finally completed, I hope there is no problem but I would like to communicate that during the translation I carelessly "translated" and placed two names in objects, I leave you the id
1. STR_ACE_Medical_Blood_EnabledFor_Description
2. STR_ACE_Tracers_100Rnd_580x42_Drum_yellow
I hope I haven't done any damage :)
PS: Thanks again for this wonderful mod
Good luck with all upcoming updates

* Some erros(?)

Some erros(?) Rows 3 to 5 are highlighted red I hope there is no problem XD

* fix tabs first

* re-add moved

* fix merge

* Update stringtable.xml

* fix STR_ACE_Medical_Blood_EnabledFor_Description

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-01-02 21:52:40 -06:00
TBakerBR
b2731d79d2 Portuguese Translations (#7347) 2020-01-02 03:53:52 +01:00
dfr1238
f918b53caa Update Tchinese String (#7340)
* [Tchinese]Medical - Group Bandage Items

like title.
-make all bandage name on tch look like : bandage (%Type) 
-make all iv name on tch look live :IV(%Type %amount)

* Update tchinese translate
2019-12-29 20:57:28 -06:00
Elgin675
50f64eef20 French translation of the latest updates (#7321)
* Add description for 'showCheckAirTemperature' setting (weather)

* Add french translation for '(show)CheckAirTemperature' in weather module

* Add description for 'SettingShowClearGlasses' setting (goggles module)

* Add french translation for 'SettingShowClearGlasses' in goggles module

* Add localization for 'rangetables' categoriy settings (artillerytables module)

* Add french translation for artillerytables module

* Add french translation for Shotguns ammunition in ballistics module

* Add french translation for CTS 7290 in grenades module

* Minor modification of french translation for medical_treatment module

* Add french translation for 'SettingShowCheckAmmoSelf' in reload module

* French translation : correction of a typing error in advanced_throwing module

* Minor modifications of french translation for chemlights module
Homogenization of presentation, to be absolutely identical to the presentation of the vanilla glow sticks.

* French translation : reformulation of the overheating module menu text, which was redundant with the title.

* Changing the order of the overheating menu (logical grouping).

* Add description tooltip on 'quickmount' settings

* Add localization for 'fastrope' subcategory settings (Uncategorized Menu)

* Minor modifications/corrections of french translation :

- fastroping module
- magazinerepack module
- microdagr module
- overheating module
- switchunits module

* FIXED Previous commit ==> Add description tooltip on 'quickmount' settings

* Add french translation for quickmount tooltip menu

* move showActionInSelfInteraction to common

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2019-12-28 09:58:52 -06:00
Moonstroke82
8e24d95b37 Spanish translations (#7235)
* Spanish Dogtags added

* Spanish: UI / AI 7 Vehicles / Weapons / Zeus

Added some more translations into spanish for ai,ui,vehicles, weapons and zeus

* Turkish Translation Started

Turksih Translation for AI Aircraft Main Map and Medical Feedback started

* Apply Suggestions

Co-Authored-By: Ferran Obon <themagnetar@users.noreply.github.com>

* Isolate just spanish for now

* pt2

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Ferran Obon <ferran@idi-systems.com>
2019-12-26 15:49:15 -06:00
Dominik Butschek
39c42d6a7d Added missing Czech translation strings (#7323) 2019-12-21 19:34:06 +01:00
Dominik Butschek
331d47c04e Addition to Czech translation (#7319)
* czech translation up to exlosives

* The rest of czech translation

* restore some lost in merge

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2019-12-20 13:38:53 -06:00
dfr1238
f5535f9a26 Update tchinese translate (#7320)
add new string on tchinese
2019-12-20 13:37:47 -06:00
Elgin675
bd0ecd7edf French translation (#7298)
* Cleaning and reorganizing of some stringtable files (WIP) :

- Duplicate entries have been removed, and the arrangement improved, to help future translators.
- Some ACE_Settings.hpp files have been modified because they were not up to date.
- Minor french translation correction.

* Added French translation and / or correction for :

- Weaponselect module,
- Weather module,
- Winddeflection module,
- Yardage450 module,
- Zeus module.

* Convert Tabs to Spaces

* Minor corrections ; arrangement improved for few stringtable.xml files.

* Improved French translation, and adjust fews settings.

- Nombreuses corrections mineures, en vérifiant chaque menu un à un, puis chaque
  option dans le jeu lui-même. Ca m'a permit de constater qu'il y a certaines
  absurdités, y compris en anglais, qui ont donc été retraduites dans toutes les
  langues, mais qui ne correspondent pas vraiment à l'option telle qu'implémentée.
  Par exemple, le système de réarmement dans Eden est traduit de manière très
  étrange.

- Modification du fichier "addons/overheating/ACE_Settings.hpp", afin de changer
  l'ordre du menu "ACE Surchauffe". En effet la case "activé" était tout en bas,
  aussi je l'ai mise tout en haut (comme c'est déjà le cas pour toutes les options).

- Modification du fichier "addons/finger/ACE_Settings.hpp", concernant le pointage
  du doigt ACE, afin d'y ajouter une description dans les réglages des addons.
  Il y en avait déjà une (peu utile) dans les paramètres des commandes, mais pas
  dans les options des addons, ce qui rend l'option peu explicite pour un débutant.

* Corrections mineures

* correction erreurs

* correction erreurs (nametags)

* correction erreurs et modules obsolètes (nametags)

* correction erreurs et modules obsolètes (common)

* Mise en commentaire d'éléments obsolètes

* correction key error

* Added Vdauphin suggestions :).

* French translation - Replaced "Faction" (faction) to "Camp" (side)

addons/captives/stringtable.xml
addons/switchunits/stringtable.xml
addons/zeus/stringtable.xml

* Minor correction of french Concertina_wire translation

* - (PabstMirror suggestions) Replace tabs by spaces, in addons/common/stringtable.xml
- (PabstMirror suggestions) Replace xml comments by french plain text, in addons/common/stringtable.xml

- Replace xml comments by french plain text, addons/explosives/stringtable.xml
- Replace xml comments by french plain text, addons/nametags/stringtable.xml

* Removed accented capital letters for objects in french translation :

Capital accented letters were a problem because they were not classified alphabetically.
Thus in Eden or in the arsenal, objects starting with a capital accented letter were systematically at the top of the list.

modified:   addons/chemlights/stringtable.xml
modified:   addons/huntir/stringtable.xml

* Correction of a typing error (french concertina_wire translation
2019-12-19 11:08:31 -06:00
jonpas
b6a1ce9b30
Fix version comparison (CBA Settings transfer) (#7313) 2019-12-18 21:43:40 +01:00
PabstMirror
8e3fd45500
Artillery rangletables (universal) (#6853)
* Initial

* Update artillerytables.cpp

* Pass by value, remove c17 features

* Tweak accuracy

* SQF work

- improve compat with a3 mlrs with remote cam (animationSourcePhase)
- handle non [0] turrets (rhs prp)
- add config entries
- use vectorCos to fix fp error (thanks commy)

* Support per mag air friction

* tweak friction

* Integrate with mk6

* more acos fixes

* Handle invalid memPointGunOptic (CUP_BM21_Base)

* Cleanup

* cleanup/tweaks

* Update checkConfigs.sqf

* Finish cleanup of ace_mk6mortar

* Update stringtable.xml

* fix bwc for ACE_RangeTable_82mm

* Update fnc_rangeTableCanUse.sqf

* build 32dll, fix some headers

* strncpy and move testing to seperate file

* Move to sub-category

* Update for ACE_Extensions changes and add warning to ace_common

* Update stringtable.xml

* Update addons/common/functions/fnc_checkFiles.sqf

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

* Update stringtable.xml

* Update stringtable.xml

* test extension.yml update logical operator

* Revert "test extension.yml update logical operator"

This reverts commit b1871724ad.

* more guess and test
2019-12-17 10:14:45 -06:00
Wakbub
79e3de623f Use STRING macros (#6576) 2019-12-07 22:40:44 +01:00
PabstMirror
29a0732b0c
Common - Network safe claim (#7258)
* Common - Network safe claim

* Update fnc_claimSafeServer.sqf
2019-12-07 15:18:50 -06:00
Josuan Albin
5ae0ef6bbe Replace remaining lineIntersects with lineIntersectsSurfaces (#6898)
* Fix explosive placement while underwater

* Apply suggestions from code review

Co-Authored-By: alganthe <alganthe@live.fr>

* Change placeApprove header to reflect changes

* Replace lineIntersectsWith in isInMedicalFacility

* Replace linesIntersects in isInRepairFacility, fix params

Public func, params should have an expected type.

* Replace linesIntersects in spallTrack

* Replace lineIntersects in getFirstObjectIntersection and findReflection

* Replace lineIntersects in advanced throwing

grenades can pass glass underwater now, I bet all of 0 person will be glad that horrendous bug is now fixed.

* Fix possible issue in pointing while underwater

* Fix possible issue while underwater in attach

* Replace count with isEqualTo in lineIntersectsSurfaces replacements

* Fix inverted conditions

* Fix drawArc

* Fix fnc_attach

* Reverse advanced_throwing and spallTrack lineIntersects changes

* Fix issues raised from code review
2019-12-07 14:58:21 -06:00
Elgin675
ec27cee1ac French translation Update / Added (#7213)
* French MicroDAGR Translation Update

* French Missile Guidance Translation Update

* French missionmodules Translation Update

* French mk6mortar Translation Update

* French MicroDAGR Translation Update

* French Missile Guidance Translation Update

* French missionmodules Translation Update

* French mk6mortar Translation Update

* French Advanced Ballistics Translation Update

* French Advanced Fatigue Translation Update

* French Ai Translation Update

* French Arsenal Translation Update

* French Ballistics Translation Update

* French Captives Translation  Update

* French Cargo Translation Update

* French Common Translation Update

* French Cookoff Translation Update

* French CSW Translation Update

* French Dagr Translation Update

* French Dogtags Translation Update

* French Dragging Translation Update

* French Dragon Translation Update

* French Explosives Translation Update

* French Explosives Translation Update - update

* French Fastroping Translation Update

* French FCS and Finger Translation Update

* French MicroDAGR Translation Update

* French Missile Guidance Translation Update

* French missionmodules Translation Update

* French mk6mortar Translation Update

* French Advanced Ballistics Translation Update

* French Advanced Fatigue Translation Update

* French Ai Translation Update

* French Arsenal Translation Update

* French Ballistics Translation Update

* French Captives Translation  Update

* French Cargo Translation Update

* French Common Translation Update

* French Cookoff Translation Update

* French MicroDAGR Translation Update

* French CSW Translation Update

* French Dagr Translation Update

* French Dogtags Translation Update

* French Dragging Translation Update

* French Dragon Translation Update

* French Explosives Translation Update

* French Explosives Translation Update - update

* French Fastroping Translation Update

* French FCS and Finger Translation Update

* Update French Explosives Translation Update

* Update addons/advanced_ballistics/stringtable.xml

Co-Authored-By: Vdauphin <vdauphin@outlook.fr>

* Update addons/advanced_fatigue/stringtable.xml

Co-Authored-By: Vdauphin <vdauphin@outlook.fr>

* Update addons/cargo/stringtable.xml

Co-Authored-By: Vdauphin <vdauphin@outlook.fr>

* Update addons/arsenal/stringtable.xml

Co-Authored-By: Vdauphin <vdauphin@outlook.fr>

* Update addons/advanced_fatigue/stringtable.xml

Co-Authored-By: Vdauphin <vdauphin@outlook.fr>

* Update frag/gestures/goggles/grenades/gunbag french translation

* Update hearing french translation

* Added French update translation and / or correction for :

- Frag Module
- Gestures Module
- Goggles Module
- Grenades Module
- Gunbag Module
- Hearing Module
- Hellfire Module
- Hitreactions Module
- Hot Module
- Interact_Menu Module
- Interaction Module
- Inventory Module
- Laser Module
- Laserpointer Module
- Magazinerepack Module
- Map Module
- Map_gesture Module
- Maptools Module
- Markers Module
- Maverick Module

* Added French update translation and / or correction for :

- Interaction Module
- Medical Module
- Medical_damage Module
- Medical_feedback Module
- Medical_gui Module
- Medical_statemachine Module
- Medical_treatment Module
- Microdagr Module

* Added French update translation and / or correction for :

- Missileguidance Module
- Missionmodules Module
- Nametags Module
- Nightvision Module
- Nlaw Module
- Noradio Module
- Optionsmenu Module

* Added French update translation and / or correction for :

- Overheating Module
- Overpressure Module
- Parachute Module
- Pylons Module
- Quickmount Module
- Rangecard Module
- Realisticnames Module
- Rearm Module
- Refuel Module
- Reload Module

* Adding French translation and correction for the Repair Module

* Correction typo mineure

* Adding French translation and / or correction for :

- Respawn Module
- Safemode Module
- Sandbag Module
- Scopes Module

* Minor corrections of the French translation for the ACE arsenal

* Minor corrections of the French translation for the Medical_treatment Module

* Correction de quelques anomalies dans les options ACE pour Eden.

Remplacement de la mention "Est infirmier" par "Qualification médicale", dans les options ACE de l'éditeur de mission.
En effet, il n'y a pas (plus ?) de case à cocher, mais un menu "direct", avec les choix "Par défaut/Aucune/Infirmier/Médecin.
Cela est donc bien plus approprié ;).

De même pour la mention "Est ingénieur", remplacée par "Qualification technique", là aussi bien plus appropriée.

Il a également fallu que je remplace la valeur "Ingénieur avancé" par "Ing. avancé" (Adv. Engineer en anglais), pour des raisons de place : la dénomination complète déborderait de la case / serait tronquée.

* Added French translation and / or correction for :

- Slideshow Module,
- Spectator Module,
- Spottingscope Module,
- Swichunits Module,

Minor correction on Nametags Module

* Correction ponctuation

* Added French translation and / or correction for :

- Tacticalladder Module,
- Tagging Module,
- Trenches Module,
- Tripod Module.

* Added French translation and / or correction for :

- UI Module,
- Vehiclelock Module,
- Vehicles Module.

Minor correction on Tacticalladder Module

* Added French update translation and / or correction for Viewdistance Module
2019-12-07 13:48:47 -06:00
dfr1238
ab99435bac
Update /common/stringtable.xml
fix dup string
2019-11-29 17:01:20 +08:00
dfr1238
ba8bd11dab
Update /common/stringtable.xml
add missing string on tchinese
2019-11-29 16:54:57 +08:00
mharis001
2b4d807acc Add stringtable validation tool (#7274)
* Add stringtable validation tool

* Add to CI
2019-11-18 12:48:40 -06:00
BaerMitUmlaut
bb0461be16 Fast medical item replacement (#7224)
* Add item replacement framework

* Correctance of English

Co-Authored-By: Dedmen Miller <dedmen@users.noreply.github.com>

* Remove unecessary code

* Use new item replacement framework for medical items

* minor fixes, support GVAR(convertItems) setting

* use forEach, convert atropine to epi

* replace with adenosine
2019-10-11 15:00:25 -05:00
mharis001
13ffc07f27 Common - Optimize arithmeticGetResult function (#7232)
* Optimize arithmeticGetResult

* Add element to default array, safer function

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-10-07 19:41:46 -05:00
PabstMirror
99db6802bb
Inventory - Adjust for changes to medical (#7112)
* Inventory - Adjust for changes to medical

* Add medical replacement items

* adjust for change to medical-replacementItems
2019-10-06 11:10:56 -05:00
Dedmen Miller
d1b840fc2d Log checkPBO errors to server log (#7210) 2019-10-04 19:56:25 -05:00
PabstMirror
c426103f23 Extension changes for Medical Rewrite and Linux compilation (#6909)
* Fix Medical HandleDamageWounds memory leak (#6809)

* Use strncpy and disable MSVC unsafe warnings (#7171)
* Set 64-bit correctly from generator string, Disable SSE2 flag on 64-bit (non-existent)

* Tweaks for Linux extensions (#5762)
* Tweak CMakeLists for Linux compilation
* Conform SQF extensions check for Linux server extensions support
* Add *.so to tools
* Split extension check into Windows and Linux
* Disable Medical extension loading for now
* Add client/server separation to extension loading
* Add Arma config documentation on extension creation
2019-09-28 23:03:55 +02:00