Commit Graph

13872 Commits

Author SHA1 Message Date
601fe7e86a Tools - Update make.py for pboProject 2.63 (#7351)
* Update make.py

for issue
https://github.com/acemod/ACE3/issues/7350

* Restore check_external option with +/- G

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-01-02 21:09:44 -06:00
a3ab0a0b17 Fix typo 2020-01-02 16:37:24 -08:00
602341b535 Added missing magazine and ammunition definitions. 2020-01-02 16:20:31 -08:00
153805a138 Fixes Typo
Review Ready.
2020-01-02 16:15:47 -08:00
1716006f4d Czech medical typos and grammar (#7359) 2020-01-02 16:26:25 +01:00
f1cd3551f8 Medical Treatment - Settings cleanup (#7345) 2020-01-02 11:14:39 +00:00
c7f58c1832 Include master in Release Drafter 2020-01-02 05:20:55 +01:00
70a315d80e Fix Release Drafter replacer (#7348) 2020-01-02 05:13:29 +01:00
b2731d79d2 Portuguese Translations (#7347) 2020-01-02 03:53:52 +01:00
b73b47453e Improve Release Drafter configuration (#7344) 2020-01-01 23:03:08 +01:00
a3ac689aed Add Release Drafter (#7343) 2020-01-01 21:37:12 +01:00
4daec7a350 Merge branch 'release' 2020-01-01 20:57:22 +01:00
91d15b8647 Add ACEREP #00010 (Medical Rewrite) (#7341)
* Add ACEREP #00010 (Medical Rewrite)

* Apply suggestions from code review

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

* Add code base improvements paragraph

* Apply suggestion from code review

Co-Authored-By: Jo David <github@jonathandavid.de>

* Improve settings wording

* Update docs/_posts/2019-12-31-ace3-version3130.md

Co-Authored-By: SilentSpike <silentspike100+Github@gmail.com>

* Update docs/_posts/2019-12-31-ace3-version3130.md

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: Jo David <github@jonathandavid.de>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: SilentSpike <silentspike100+Github@gmail.com>
2020-01-01 13:34:07 -06:00
89b319ffef Merge pull request #7342 from acemod/gpsObjectFix
Maptools - Fix warnings in mapGpsDisplay.p3d
2020-01-01 09:03:45 +01:00
24e9999b34 Maptools - Fix warnings in mapGpsDisplay.p3d 2019-12-31 19:33:52 -06:00
d060185704 Hellfire - Fix missing semi-colon v3.13.0 2019-12-30 20:54:21 +01:00
64838857de Update version on wiki 2019-12-30 20:40:34 +01:00
c59667d0ba Prepare release 3.13.0 (build 2) 2019-12-30 19:33:35 +01:00
ec63321343 Merge branch 'master' into release-3.13.0 2019-12-30 19:33:17 +01:00
f2fff98ad0 Add AGM-114L Active Radar Homing Hellfire (#7337)
* Create AGM-114L

* If we lose LOS dont continue tracking magically Allow for datalinked targets to donate data to the missile.

* Update documentation

* RHS 2x hellfire compatability

* Make ARH more realistic by not allowing to switch targets after firing

* Fix filename. Change Hellfire attack profile to lead target. Switch to two LOS checks.

We check two Line's of Sight to ensure that we are 100% gone from the target. A raw LOS check will be blocked by bushes and light trees while the checkVisibility wont while on the otherhand smoke will block a visiblity check but not a raw LOS check. We get best of both worlds with this.
I changed the attack profile so that it will lead moving targets. This isnt needed with the laser version because the user will "lead" the target if needed, but with the radar scan we have velocity information so we might as well lead the target as much as possible

* Change function calls to FUNC macro. Slightly change radar logic. Up poll frequency to 7hz

Instead of the missile immediately going active when the shooter doesn't have radar, check if targets are in datalink. If they are, use the datalink to guide the missile instead of its internal radar.

* Add logic for missiles launched without target

If a missile is fired without a locked target, it will immediately go active and target the first thing its seeker picks up. This is an incredibly dangerous trait of active radar homing missiles and is so in this implementation. Be careful!

* Change from `exitWith` to basic `then`

Legacy code that never got changed. This is essentially what happened before

* Update CfgMagazineWells.hpp

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2019-12-30 12:29:08 -06:00
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
d0d70c66ed Repair - Handle turret hitpoints with no selection (#7338) 2019-12-28 10:26:57 -06:00
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
af0ab24040 Tagging - Convert to CBA Settings (#7336) 2019-12-26 20:38:36 -06:00
085ebd89db Pass function by reference to Draw3D EH (#7333) 2019-12-26 19:42:48 -06:00
53c53bbdbc Stringtable Validator - Check for tabs and correct spacing (#7332)
* Stringtable Validator - Check for tabs and correct spacing

* Improve error descriptions, Cleanup

* Change encoding to utf-8

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2019-12-26 19:42:30 -06:00
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
50b8e14e92 Register ace arsenal feature camera (#7330) 2019-12-26 15:45:11 -06:00
02f5bfa980 [Tchinese]Medical - Group Bandage Items (#7329)
like title.
-make all bandage name on tch look like : bandage (%Type) 
-make all iv name on tch look live :IV(%Type %amount)
2019-12-25 20:39:32 -06:00
6a89bd5ee4 Medical - Group Bandage Items (#7324) 2019-12-24 23:41:53 +01:00
e24cab12ac Merge pull request #7327 from acemod/fix-sniper-type
Remove cursor config for vanilla sniper rifles
2019-12-24 15:25:38 +01:00
d41dd37a30 Remove cursor config for vanilla sniper rifles - fix #7326 2019-12-24 15:18:59 +01:00
39c42d6a7d Added missing Czech translation strings (#7323) 2019-12-21 19:34:06 +01:00
a60ee716be Merge pull request #7322 from acemod/nlawDisposableNoWell
Disposable - Fix magazineWell problems
2019-12-21 07:52:21 +01:00
9ea50f384a keep well on ready weapon? 2019-12-20 23:04:41 -06:00
6a98a17bc4 Disposable - Remove magWell 2019-12-20 22:47:46 -06:00
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
f5535f9a26 Update tchinese translate (#7320)
add new string on tchinese
2019-12-20 13:37:47 -06:00
41900df610 Realistic Names - Fix IDAB Jeep name (#7318) 2019-12-19 19:40:18 -06:00
833fd26780 Cleanup mk6 and fix nametag strings (#7317) 2019-12-19 13:16:36 -06:00
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
1e1253e38e RHS Compat - Change IHADSS hearing to crew, add pilot visors (#7312)
* change ihadss hearing to crew, add us visors

* add russian visors

* aceify colons in us file

* aceify colons in russian file
2019-12-19 10:20:20 -06:00
15fad1e41b Update Japanese translation (#7316) 2019-12-19 16:36:06 +01:00
af837c4ffa Update new tchinese translate (#7315) 2019-12-19 16:20:18 +01:00
984875525b Merge branch 'master' into release-3.13.0 v3.13.0-rc1 2019-12-18 21:44:00 +01:00
b6a1ce9b30 Fix version comparison (CBA Settings transfer) (#7313) 2019-12-18 21:43:40 +01:00
50dfbeff1c Merge branch 'master' into release-3.13.0 2019-12-18 20:27:30 +01:00
6fb0cd09da Add Medical Rewrite post (#7311) 2019-12-18 19:04:31 +01:00
52e2f2665b Merge branch 'master' into release-3.13.0 2019-12-18 19:03:08 +01:00
f57fe99e9a RKSL compat - Updated with the last RKSL v3.01 (#7310) 2019-12-18 19:00:10 +01:00