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,891 Commits 73 Branches 88 Tags 752 MiB
168728b2ca
Commit Graph

13891 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
McDiod
e25b02263a
switchUnits - Fix switching units not working (#6188) (#7676) 2020-06-07 18:25:11 -05:00
dependabot[bot]
c99e122d84
Bump websocket-extensions from 0.1.3 to 0.1.4 in /docs/src (#7749) 
Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4.
- [Release notes](https://github.com/faye/websocket-extensions-node/releases)
- [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-06 09:24:28 -05:00
mharis001
7746dbcc75
Spectator - Add display loaded and unloaded events (#7720) 2020-06-05 20:13:10 -05:00
Fyuran
eaa23cc84f
-fix to RHS USAF ACE Compatibility Mod Error - no entry 'bin\config.bin/CfgVehicles/RHS_CH47F/UserActions/OpenCargoDoor.displayName'. #7708 (#7711) 2020-06-05 20:01:59 -05:00
PabstMirror
1b94b25ff6
Trenches - Fix mission placed trench interactions (#7672) 
Assume progress is 1 if undefined
define placeData if undefined
 2020-06-05 18:35:32 +02: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
Filip Maciejewski
6fb8991bd6
Medical - Prevent packing into bodybag for bodies in vehicle (#7731) 
* Prevent packing into bodybag for bodies in vehicle

* Fix comment
 2020-05-28 23:07:26 -05:00
Abogado
19523f028a
Crew served weapons - Add spanish translations (#7728) 
* Update stringtable.xml

-Added spanish translations
-Minor corrections
-"Armas de manejo colectivo" could be more appropriate.
https://www.linguee.co/ingles-espanol/traduccion/crew-served+weapons.html
https://www.defensa.com/en-abierto/armamento-ligero-colectivo-pesado-infanteria-marina-espanola-20

* Update addons/csw/stringtable.xml

Co-authored-by: Ferran Obon <ferran@idi-systems.com>

Co-authored-by: Ferran Obon <ferran@idi-systems.com>
 2020-05-24 06:36:58 +02:00
Abogado
a06e230f7f
Translations - Spanish Cookoff (#7725) 
* Update stringtable.xml

Added translations to cook-off

* Update addons/cookoff/stringtable.xml

Co-authored-by: Ferran Obon <ferran@idi-systems.com>

Co-authored-by: Ferran Obon <ferran@idi-systems.com>
 2020-05-24 06:36:19 +02:00
Abogado
6a814ac468
Translations - Improve Artillery Tables (#7723) 
* Update stringtable.xml

Little correction to the traslation, so now it has more sense.

* Update addons/artillerytables/stringtable.xml

Co-authored-by: Ferran Obon <ferran@idi-systems.com>

Co-authored-by: Ferran Obon <ferran@idi-systems.com>
 2020-05-24 06:35:02 +02:00
Abogado
7c6de719be
Translations - Spanish (#7722) 
* Update stringtable.xml

Added spanish translation to most strings.

* Update addons/arsenal/stringtable.xml

Co-authored-by: Ferran Obon <ferran@idi-systems.com>

* Update addons/arsenal/stringtable.xml

Co-authored-by: Ferran Obon <ferran@idi-systems.com>

* Update addons/arsenal/stringtable.xml

Co-authored-by: Ferran Obon <ferran@idi-systems.com>

* Update addons/arsenal/stringtable.xml

Co-authored-by: Ferran Obon <ferran@idi-systems.com>

* Update addons/arsenal/stringtable.xml

Co-authored-by: Ferran Obon <ferran@idi-systems.com>

* Update addons/arsenal/stringtable.xml

Co-authored-by: Ferran Obon <ferran@idi-systems.com>

* Update addons/arsenal/stringtable.xml

Co-authored-by: Ferran Obon <ferran@idi-systems.com>

* Update addons/arsenal/stringtable.xml

Co-authored-by: Ferran Obon <ferran@idi-systems.com>

Co-authored-by: Ferran Obon <ferran@idi-systems.com>
 2020-05-24 06:33:10 +02:00
Abogado
eae28f35d3
Update stringtable.xml (#7729) 
-Minor corrections
 2020-05-23 10:59:40 +02:00
Abogado
b754956b61
Update stringtable.xml (#7724) 
Added some shotgun shells translations.
 2020-05-22 18:30:16 +02:00
Joko
d32d8e8fb5
Fix inheritence issue for m14ebrri for RHS 0.5.1 (#7705) 2020-05-10 17:20:56 +02: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
Elgin675
9286d9727e
Translations - Add French CSW StaticM2ShieldBag key (#7696) 2020-05-09 12:21:31 -05:00
Jo David
29ccd9c362
MG3 is not by Heckler&Koch (#7697) 2020-05-08 17:11:39 +02:00
Jo David
3c9a5d71ea
Fix german abbr of Ozelot Wiesel (#7698) 2020-05-08 16:55:38 +02:00
mharis001
f73a71dd50
Wiki - Fix arsenal framework section headings (#7695) 2020-05-08 09:26:52 -04:00
Neviothr
f718fd20f0
Nightvision - Increase max amount of IR rays to 64 (#7669) 
* increase max amount of IR rays to 64

* comment
 2020-05-07 11:34:41 -05:00
Michael Warr
ab3af34be4
Advanced Fatigue consumes SwayFactor setting again (#7680) 2020-05-07 11:31:46 -05:00
PabstMirror
7311e644a2
FCS - Fix not working in MP (#7675) 
also fix TRACE_10 macro
 2020-05-07 11:28:32 -05:00
regiregi22
64de0388c7
Translations - Spanish (#7687) 
* Update stringtable.xml

* restore english str

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2020-05-06 17:39:01 -05:00
regiregi22
66a6fa444e
Update stringtable.xml (#7689) 2020-05-06 17:38:24 -05:00
regiregi22
d17f4cc2ed
Update stringtable.xml (#7688) 2020-05-06 17:37:33 -05:00
regiregi22
7b652dd502
Update stringtable.xml (#7686) 2020-05-06 17:34:58 -05:00
regiregi22
167200b799
Update stringtable.xml (#7685) 2020-05-06 17:34:21 -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
Konrad Szumiec
e2157ac4c2
Hearing - Fix for "MrapAttenuation" (#7664) 
* Hearing: MRAP Attenuation Fix

Hearing: MRAP Attenuation Fix

* Update addons/hearing/functions/fnc_updatePlayerVehAttenuation.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2020-04-30 20:01:34 -05:00
commy2
1304b67570
Add 'how to report an issue' flowchart (#7582) 
* add 'how to report an issue'-flowchart

* move the files

* Add to issue template and wiki, move to user folder

* update chart with suggestions

* Make issue flowchart image smaller

Co-authored-by: jonpas <jonpas33@gmail.com>
 2020-04-30 18:55:38 +02:00
PabstMirror
58bc4b7ed8
CSW - Add configs for 1.98's M2 Turret (#7619) 2020-04-30 11:40:57 -05:00
PabstMirror
a84f59091e
Map - Only add BFT PFEH if enabled and fix missing markers (#7674) 2020-04-30 11:40:18 -05:00
Filip Maciejewski
25e212cfa3
Interaction - Show current team color in Team Management menu (#7650) 
* Show current team in interaction menu

* Use nametags color for Team Management icon color

* Use nametags color in Join team action icons colors

* Update addons/interaction/functions/fnc_modifyTeamManagementAction.sqf

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

* Apply suggestions from code review

Co-authored-by: jonpas <jonpas33@gmail.com>
 2020-04-30 11:39:03 -05:00
Elgin675
ff252a5bf9
Translations - fix some french keys (blood status and trenches) (#7670) 
* Translations: fix some french "blood lost" status

* Translations: fix some french "trenches" keys
 2020-04-30 11:37:56 -05:00
TyroneMF
ef7a98a7ee
Documentation - Add Medical Rewrite settings explanations and presets (#7657) 
* Update Medical System Document

- Explanations of settings
- Example "Basic" and "Advanced" medical setups.

* Cleanup

- Minor changes to the way certain things were written.
 2020-04-28 10:23:06 +02:00
classic
7cc168e1b9
Updated japanese translation (#7668) 2020-04-27 11:24:34 -05:00
billw2012
8f1dc1d252
New group side in Leave Group interaction is same as original group side (#7667) 
Previously it would be `side player`, now it is `side group player`, which is more consistent (as unit and group sides are not necessarily the same).
 2020-04-27 06:22:48 +02: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
PabstMirror
11f1c2b626 Update version.html for ace3.13.2/acex3.5.2 2020-04-22 09:36:04 -05:00
PabstMirror
fea3bcd569 Merge branch 'release-3.13.2' 2020-04-22 09:33:35 -05:00
Jo David
a182a01c47
clear up medical documentation and remove outdated info, add "curated" medical settings (#7597) 2020-04-21 11:51:14 -05:00
PabstMirror
a17f108ea8 Prep 3.13.2 Build 49 2020-04-21 11:01:45 -05:00
PabstMirror
b682e8fb6a Merge branch 'master' into release-3.13.2 2020-04-21 11:01:08 -05:00
Elgin675
123ac52404
Translations - Add French Dragging_RaiseLowerRotate key (#7656) 2020-04-21 09:48:53 -05:00
PabstMirror
c824163fff Prep 3.13.2 - Build 48 2020-04-20 10:51:17 -05:00
PabstMirror
d898b7de81 Merge branch 'master' into release-3.13.2 2020-04-20 10:50:45 -05:00
Jo David
3b15014099
Dragging - Add possiblity to rotate a carried object (#7640) 
* Add possiblity to rotate a carried object

* simplify the code by using cba_events_control instead of a custom set variable

* le ACE and don't save frames
 2020-04-20 17:45:59 +02:00
PabstMirror
21c927195a
Cargo - Re-enable damage on unloaded tanks (#7655) 2020-04-20 17:45:27 +02:00