Commit Graph

173 Commits

Author SHA1 Message Date
PabstMirror
477bdd0184 Merge branch 'master' into pr/8215 2023-10-06 19:41:13 -05:00
LorenLuke
a5a8b5387a
Laser - Add Individual Laser Code Digit Control (#9434)
* Initial Commit

* Use DIK Codes

* Update headers and dev code for new default frequency

---------
2023-10-02 12:29:38 -05:00
Psycool
94ceed201c
Korean translation Updated (#9436)
* KoreanTranslation

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

* koreantranslation

* Korean Typo Fix

* Korean Translation

* Update stringtable.xml

* Korean Translation Added

Added Korean translation related to Cargo Refuel

* Merge branch 'master' of https://github.com/Psycool3695/ACE3

* Korean translation Add/Updated
2023-09-27 13:28:04 -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
Krzyciu
4a12f61352
Translations - Add Polish Translations (#9391)
Translation - Add Polish Translation

When merged this pull request will:
Add Missing Polish Translations
Fix Spelling in existing translations
2023-09-11 21:33:48 -05:00
Nilia119
4ce6fcb3cc
Translation - Add German Translation (#9390)
Added German Translation
2023-09-11 20:37:20 -05:00
PabstMirror
2c0a7209bf Merge branch 'master' into pr/8215 2023-09-09 11:24:44 -05: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
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
Grim
628d62d329
Laser - Cleanup laser designator config and code (#9289)
* cleanup laser designator code

* condition

* use macro for IDC

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

* IDC to macro

* switch to _currentShooter

* hide CA_Distance even if fade fails

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-07-30 04:41:46 +03:00
LorenLuke
2578ead13b
Laser - Add Aircraft Laser Spot Tracker and Point Locking (#8453)
* Initial commit

* optimize/clean, add ignoreOwners param

* locality, PFH condition

---------

Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2023-07-28 07:03:02 +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
7727fee1d0 Fix hemmit merge 2023-02-24 14:00:34 -06:00
PabstMirror
16dee0a280 Merge branch 'master' into pr/8215 2023-01-19 22:35:23 -06:00
Smith
dc9a3eb064
Translations - Russian (#9095)
* Add missed & fix existed

* Fix russian translation when renaming
2022-12-03 13:57:43 -06: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
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
PabstMirror
2041c88cee Merge branch 'master' into pr/8215 2022-05-24 12:00:12 -05:00
PabstMirror
ada486448c
Aircraft - Drone Tools (#8276)
* Aircraft - Drone Tools

* Update addons/aircraft/functions/fnc_droneAddActions.sqf

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

* Update addons/aircraft/functions/fnc_droneAddMapHandler.sqf

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

* Update fnc_droneAddActions.sqf

* Move map drawing to laser and make it work on any source

Co-authored-by: Dystopian <sddex@ya.ru>
2022-05-05 11:07:54 -05:00
Wakbub
70641c39a1
Laser/Laserpointer - Fix localization of laser (#8885)
Add
- `laser`: Add Hungarian translation of laser.

Fix
- `laser`: Fix capitalization of laser.
- `laserpointer`: Fix Japanese translation of laser.
2022-05-02 18:53:18 -05:00
PabstMirror
76bb679acf Merge branch 'master' into pr/8215 2022-04-15 22:25:18 -05:00
zharf
72774c909a
Laser - Fix seeker owner return value (#8862)
* Fix laser seeker return value

Back to consistent with the documentation

* Pick the owner with most hits instead of the last one in the hashmap
2022-04-06 17:02:39 -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
Brandon Danyluk
9452de5f07 Merge branch 'master' of https://github.com/acemod/ACE3 into missileDynamics 2022-01-01 19:37:49 -07: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
b40903b16a Merge branch 'master' into pr/8215 2021-11-12 19:55:11 -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
PabstMirror
7f398a82af Merge branch 'master' into pr/8215 2021-10-21 12:16:33 -05:00
Brandon Danyluk
2dfbaa90b0
Fix hashmap bug in laser seeker (#8531)
* fix bug in laser

* use `hashValue`
2021-10-16 13:29:57 -05:00
Brandon Danyluk
10c2019818 change back 2021-10-15 22:02:39 -06:00
Brandon Danyluk
17e211ed59 Merge branch 'laserRevert' into missileDynamics 2021-10-15 21:49:45 -06:00
Brandon Danyluk
0123216803 fix bug in laser 2021-10-15 21:47:15 -06:00
Brandon Danyluk
120d16cd0d small changes 2021-10-15 21:35:25 -06: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
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
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
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
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
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
PabstMirror
a9a69ac4ff
Headers - Fix function names in examples (#7663) 2020-04-25 08:41:45 +02:00
Whigital
7fe5401f6a conform isnil checking: laser 2020-02-12 17:28:41 +01: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
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
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