Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,612 Commits 73 Branches 88 Tags 752 MiB
aee506db99
Commit Graph

13612 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dfr1238
aee506db99 Update tchinese (#7461) 2020-01-13 23:32:46 -06:00
Elgin675
273d4ac161 fix translations: removes Blood_IV "keep cold" (#7457) 
* fix translations: removes the words "keep cold" from `Blood_IV` keys

* Update addons/medical_treatment/stringtable.xml

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

Co-authored-by: Jo David <github@jonathandavid.de>
 2020-01-13 23:32:24 -06:00
SimichRE
3ba441509d Russian translation (#7442) 
* Translation: Russian

Added missing translation to Russian

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml
 2020-01-13 23:31:33 -06:00
Filip Maciejewski
ad579bf5e4 Fix missing earplug actions (#7464) 
Fix bug introduced in #7400
 2020-01-13 18:34:42 +01:00
jonpas
3a65a73e94
Tools - Run Release Drafter only on original ACE3 repository (#7450) 2020-01-11 19:48:13 +01: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
AgentPiTi
4bfa882eb7 Polish Translations (#7449) 
* PL Translations

Done some of new Polish translations

* Fix doubles

* Apply suggestions from code review

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

* Polish Translations

Missing polish translations

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
 2020-01-11 09:49:30 -06:00
commy2
08a83840dc
Merge pull request #7416 from Dahlgren/feature/cook-off-event 
Cook Off - Change Cook Off events to global and add to events docs
 2020-01-11 11:02:03 +01:00
commy2
382a60ced7
Merge pull request #7444 from acemod/fixBrrrrt 
Aircraft - Fix ACE_Gatling_30mm_Sub class
 2020-01-11 09:42:43 +01:00
PabstMirror
12cb0993cf Aircraft - Fix ACE_Gatling_30mm_Sub class 2020-01-10 23:14:55 -06:00
Jo David
c7255e928c
Merge pull request #7441 from SimichRE/patch-2 
Russian Translations
 2020-01-11 06:11:15 +01:00
SimichRE
d5e2eb3a17
Translation: Russian 
Added missing translation to Russian
 2020-01-10 18:54:30 +03:00
PabstMirror
4fd927ff6b
remove array from cookoff doc event 2020-01-10 09:51:14 -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
AgentPiTi
9d525f8b42 Polish Translations (#7410) 
* PL Translations

Done some of new Polish translations

* Fix doubles

* Apply suggestions from code review

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-09 22:56:13 -06:00
Elgin675
daa8a05ab8 Translations: fix medical_treatment order introduce on #7430 (#7435) 
Moves `AllowSelfPAK_Description` below the display name.
 2020-01-09 22:29:26 -06:00
jonpas
3daf78441b Medical - Fix epinephrine wake-up chance boost string (#7407) 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2020-01-09 14:44:55 -06:00
Dedmen Miller
8f1bf259e3 Fixed: RHS Compatibility - Remove scope adjust from ACOG Scopes (#7375) 
* Remove scope adjust from RHS ACOG Scopes

* Set RHS ACOG ScopeAdjust to zero

For ACE Arsenal stats
 2020-01-09 14:42:54 -06:00
Broström.A | Evul
028a0cb3f0 Changed: Scripted calls to putInEarPlugs/joinTeam won't show hint (#7400) 
* Added ability to suppress hint message

* Adjustments based on request
 2020-01-09 14:40:34 -06:00
Elgin675
36a6c9c2b3 Translations: French (#7414) 
* Add french translation of 'ClearTraumaAfterBandage_Description' key

* Add french translation of 'GatlingDescriptions' keys

* Add french translation of 'AllowSelfPAK' keys

* Update french translation on medical_treatment module
- AdvancedDiagnose_Description
- AdvancedMedication_Description
- LitterCleanupDelay_Description

* Fix french translation on medical_treatment module

- 'AllowLitterCreation_Description' key
- 'LitterCleanupDelay_Description' key

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2020-01-09 12:36:51 -06:00
dfr1238
9833bfd37d Update tchinese string (#7433) 
Update tchinese on aircraft,medical_treatment
 2020-01-09 09:38:11 -06:00
jonpas
34c24dbc76
Medical Treatment - Fix Checking Pulse progress bar text (#7406) 2020-01-09 07:40:53 +01:00
Jo David
016d0d6d20
Use Head and Torso wording instead of Head and Body (#7399) 
* Use Head and Torso wording instead of Head and Body

title

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: classic <skyburunave@gmail.com>

* Update addons/medical_statemachine/stringtable.xml

Co-Authored-By: classic <skyburunave@gmail.com>

* fix indentation

* change italian translation

Co-authored-by: classic <skyburunave@gmail.com>
 2020-01-09 07:39:11 +01:00
Jo David
91c40e4407
Changed: German translation for Medical Rewrite (#7430) 
* Changes to be committed:
Updated german stringtables for new med_rewrite

* Changes to be committed:
Updated german stringtables for new med_rewrite

* Update addons/medical/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/stringtable.xml

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

* Update addons/medical_blood/stringtable.xml

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

* Update addons/medical_blood/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_damage/stringtable.xml

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

* Update addons/medical_blood/stringtable.xml

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

* Update addons/medical_blood/stringtable.xml

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

* Update addons/medical_blood/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_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_feedback/stringtable.xml

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

* Update addons/medical_statemachine/stringtable.xml

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

* Update addons/medical_statemachine/stringtable.xml

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

* Update addons/medical_statemachine/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/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_statemachine/stringtable.xml

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

* Update addons/medical_statemachine/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/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_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update stringtable.xml

Stell ein

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update addons/medical/stringtable.xml

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

* Update addons/medical_blood/stringtable.xml

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

* Update addons/medical_blood/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_blood/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_statemachine/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_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update addons/medical_treatment/stringtable.xml

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

* Update stringtable.xml

added a missing string

* Update stringtable.xml

* Update stringtable.xml

* remove and merge duplicate keys

Co-authored-by: padddyyy <50599448+padddyyy@users.noreply.github.com>
 2020-01-09 07:35:57 +01: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
commy2
a31000bc82
Merge pull request #7417 from diwako/fix_pain_suppression_basic_medication 
Fix suppression for basic medication
 2020-01-08 19:52:25 +01:00
Björn Dahlgren
941d46b334 Cook Off - Change Cook Off events to global and add to events docs 2020-01-08 00:25:52 +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
diwako
35d99ddc7e Fix suppression for basic medication 2020-01-07 20:35:22 +01:00
Jo David
e1221f2bdd
Merge pull request #7411 from acemod/existingTranslations-and-targets 
Improve "How to translate.." page
 2020-01-06 08:40:38 +01:00
Jo David
0616e397a3
Add section about looking for existing translation PRs, don't let them leave our homepage 2020-01-06 07:19:19 +01:00
Taha
ddbc0221f6 Turkish Traslations (#7390) 2020-01-05 18:37:48 +01:00
mharis001
62fccd6ff0 Medical Treatment - Add self PAK setting (#7382) 2020-01-04 12:42:51 +00:00
mharis001
e00cb53911 Fix incorrect reopening chance for QuikClot on large abrasions (#7383) 2020-01-04 12:33:49 +00:00
PabstMirror
97d8be94ce
Goggles - Skip rain effects on snow maps (#7373) 
* Goggles - Skip rain effects on snow maps

* Update XEH_postInit.sqf
 2020-01-03 11:24:05 -06: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
commy2
b7a69eeaaf
Merge pull request #7118 from LorenLuke/patch-1 
Changes A-10/A-164 Cannon Values
 2020-01-03 10:22:35 +01:00
Brandon Danyluk
fc13775786 Update CSW RHS compat for new Mk-19 ammo type (#7354) 
* Update RHS compat for new Mk-19 ammo type

* Formatting fix
 2020-01-02 21:57:30 -06:00
Toni Vicente
77ce88e1ac Update spanish translation (#7366) 
* Update spanish translation

Added spanish translation entries

* Update spanish translation

Added spanish translation entries

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2020-01-02 21:56:02 -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
Alexey Tretyakov
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
LorenLuke
a3ab0a0b17 Fix typo 2020-01-02 16:37:24 -08:00
LorenLuke
602341b535 Added missing magazine and ammunition definitions. 2020-01-02 16:20:31 -08:00
LorenLuke
153805a138
Fixes Typo 
Review Ready.
 2020-01-02 16:15:47 -08:00
IllidanS4
1716006f4d Czech medical typos and grammar (#7359) 2020-01-02 16:26:25 +01:00
mharis001
f1cd3551f8 Medical Treatment - Settings cleanup (#7345) 2020-01-02 11:14:39 +00:00
jonpas
c7f58c1832
Include master in Release Drafter 2020-01-02 05:20:55 +01:00
jonpas
70a315d80e
Fix Release Drafter replacer (#7348) 2020-01-02 05:13:29 +01:00
TBakerBR
b2731d79d2 Portuguese Translations (#7347) 2020-01-02 03:53:52 +01:00
jonpas
b73b47453e
Improve Release Drafter configuration (#7344) 2020-01-01 23:03:08 +01:00