Commit Graph

14851 Commits

Author SHA1 Message Date
6963c4c80f Prep 3.13.4 Build 54 2020-08-28 10:35:10 -05:00
5a16aa1e8b Merge branch 'master' into release-3.13.4 2020-08-28 10:34:20 -05:00
49c84e2ce1 Update Japanese translation (#7880) 2020-08-28 10:30:32 -05:00
dd41f3e799 Map Gestures - reduce the size of the procedural texture and don't generate mipmaps (#7876)
* change procedural texture to static texture existing in a3 Assets

* use a smaller and no mimaps in the procedural texture
2020-08-27 10:51:49 -05:00
5ee3424d4b Translations - Update / Fix French Translations (Grenades and Advanced Throwing) (#7871)
* Translation - add/fix french grenades keys

* Translation - fix french convertExplosives and Convert_Fuse keys

* Translations - fix some french keys in Advanced Throwing module
2020-08-27 10:45:39 -05:00
b51cf3575c Arsenal - Fix sorting when using search (#7877)
* fix sorting when using search

* remove unused line

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-08-27 10:44:18 -05:00
241f1aefbd fix face, voice, insignia in arsenal (#7879) 2020-08-27 10:37:20 -05:00
572e61d1cf Arsenal - Fix fire rate sort caused by flashlight (#7878)
* fix firerate sort caused by flashlight

* Update fnc_sortStatement_rateOfFire.sqf

* Update addons/arsenal/functions/fnc_sortStatement_rateOfFire.sqf

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

Co-authored-by: jonpas <jonpas33@gmail.com>
2020-08-27 10:35:55 -05:00
b4f7963434 Prep 3.13.4 Build 53 2020-08-24 19:35:36 -05:00
e9b2087faf mk11 mod 0 ec inheritance (#7874) 2020-08-24 19:34:43 -05:00
fb037c8c1f Tools - Dumbs (#7875) 2020-08-24 19:30:52 -05:00
b4d89e919e Misc - Fix UBCs (#7870) 2020-08-24 13:31:35 -05:00
b21535665b Grenades - Add throwable explosive charges (#7860)
* First pass on adding throwable explosives

* Moved fnc call to postinit

* Disabled gits auto CRLF bs

* Changing fnc name and call

* Move names to string table

* Using vanilla icon and removing explosive depend

* More stringtable conversions

* Missing semi-colons causing RPT error

* Update addons/grenades/stringtable.xml

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

* Remove empty strings

* Update addons/grenades/stringtable.xml

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

* Add compatibility with "realistic names" modules, and add french translation

* Fix little mistake

* Update addons/grenades/stringtable.xml

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

* Add setting

* Change setting name, use ace_settingsInitialized

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Elgin675 <elgin675@hotmail.com>
2020-08-24 12:45:56 -05:00
311dcde5da Tools - Add all optionals to steamWS (#7859) 2020-08-23 09:57:36 -05:00
a919dd70b7 Translations - fix some french keys (ACE Uncategorized menu) (#7866) 2020-08-23 09:05:05 -05:00
61eea98976 Remove "ACE" prefix for Gunbag in Uncategorized menu (#7867) 2020-08-23 14:35:33 +02:00
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
dd2babb833 Translations - Update / Fix French Translations (Arsenal and Map Gestures) (#7863)
* Translation - Add french "Arsenal_sortBy" keys

* Translation - Add / Fix french Map_Gestures keys
2020-08-22 11:54:44 -05:00
9c0eebaa07 Map Gestures: Fix Briefing Mode setting strings (#7862) 2020-08-21 13:09:14 +02:00
5326d0acf5 ACE Arsenal - fix #6591, PCML has no ammo (#7850)
As per @Superxpdude comment - https://github.com/acemod/ACE3/issues/6591#issuecomment-667706600
2020-08-18 12:49:53 -05:00
2f9c4b6b41 Ballistics - Add a 5.8mm magazine with the CMR-76 (QBU-88) (#7820)
* 58x42_qbu_mag

* 58x42_qbu_mag

* 58x42_qbu_mag

* 58x42_qbu_mag

* 58x42_qbu_mag

* 58x42_qbu_mag

* 58x42_qbu_mag

* 58x42_qbu_mag

* 58x42_qbu_mag

* 58x42_qbu_mag

* 58x42_qbu_mag
2020-08-18 12:44:58 -05:00
bddf74cbb4 Map Gestures - Add Briefingscreen support, Different Camera Range, Improve Responsiveness, and Toggles for Curators and Spectators Maps (#7782)
* Add Variable Range for Camera Users (Zeus, Spectator) + Settings

Add Setting to Disable Zeus and/or Spectator Map Draws
Add Ability to use Map Gestures on Briefing screen
Add Setting for Briefing Screen mode (All, Only Group, Only Side, Proximity, Disabled)

* disable DISABLE_COMPILE_CACHE

* minor cleanup and add some translations

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-08-18 12:44:16 -05:00
d72555ab0c Arsenal - Add Sorting Algorithms (#7719)
* support per tab sorting, and external algorithms

* improved sub sorting

* improve alphabetical search

* update mod sorting

* sort by accuracy

* sort right panel

* more sorts

* sort right tab

* fix empty

* stringtables

* Apply suggestions from code review

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>

* more suggestions

* suggestions

* remember last sort

* Fix missing throw and put names

* bad copy paste in stringtable

* Update addons/arsenal/functions/fnc_sortPanel.sqf

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

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-08-18 12:43:35 -05:00
4d769e4b8f Cargo - Fix loaded cargo not being deleted when vehicle is destroyed (#7851) 2020-08-18 12:42:09 -05:00
c8bb046d31 MicroDAGR - Fix contour interval info showing on compass (#7849) 2020-08-12 01:48:40 -04:00
1be65a9125 Update stringtable_validator.py (#7841) 2020-08-09 10:24:09 -05:00
5c68f1dac3 Trenches - Add settings to configure dig/remove trenches durations (#7831)
* Trenches - Add settings to configure dig/remove trenches durations

Signed-off-by: Mysteryjuju <mysteryjuju42@gmail.com>

* Trenches - Remove dirty tabs

Signed-off-by: Mysteryjuju <mysteryjuju42@gmail.com>

* Trenches - Update French translation

Signed-off-by: Mysteryjuju <mysteryjuju42@gmail.com>

* Update addons/trenches/stringtable.xml

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

* Update addons/trenches/stringtable.xml

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

* Update addons/trenches/stringtable.xml

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

* Update addons/trenches/stringtable.xml

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

* Update addons/trenches/stringtable.xml

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

* Update addons/trenches/stringtable.xml

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

* Update addons/trenches/stringtable.xml

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

* Update addons/trenches/stringtable.xml

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

* Trenches - Change SLIDER to TIME settings & update english translations

Signed-off-by: Mysteryjuju <mysteryjuju42@gmail.com>

* Trenches - Change CBA settings function

Signed-off-by: Mysteryjuju <mysteryjuju42@gmail.com>

Co-authored-by: Elgin675 <elgin675@hotmail.com>
2020-08-09 10:12:54 -05:00
1626d05201 Small Arms - Add stringtable (#7823)
* Convert Small Arms to Stringtable

- Convert Small Arms component to stringtable
- Added Vector 45 additional magazines still listed as 30 rounds.

* Newlines end of file

* Fix stringtable

* Remove unnecessary string entries

* Apply suggestions from code review

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

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-08-09 10:12:30 -05:00
c2715a2e41 Add hearing protection to LDF and Spetsnaz helmets (#7843) 2020-08-09 10:11:50 -05:00
9ef4371c18 MicroDAGR - Improve item model (#7838)
* add nicer microdagr model

* rename files
(2 renames because of change in case (MicroDAGR -> microdagr)

* reduce gloss, reduce dirt on screen

* rotate model by 180° and use dummyweapon item model for better ground alignment when placing or dropping the microdagr
2020-08-06 11:51:29 -05:00
48c7738c57 Add G-force reduction to Heli Pilot Coveralls [LDF] (#7825) 2020-08-04 10:43:53 -05:00
b42d6f013d Update: Minor changes on Simplified Chinese translation. (#7829)
* Add: Simplified Chinese Translation for medical items and GUI

Add: Simplified Chinese Translation for medical items and GUI
Fix: Corrected some wrong Simplified Chinese Translation

* Add: Simplified Chinese Translation for medical items and GUI

Add: Simplified Chinese Translation for medical items and GUI
Fix: Corrected some wrong Simplified Chinese Translation

* Update SC Translation for triage card

Update SC Translation for triage card

* Update Chinesesimp Translations

Update: usage for doing something in SC.
Update: Bandaging action in SC.

* Update: Unlock action for SC Translation

Update: Unlock action for SC Translation
2020-08-04 10:15:03 -05:00
7446ca1655 View Distance - Update view distance on video options changes (#7824) 2020-08-04 10:02:01 -05:00
7bc28768da Add Contact CBRN facewear overlays (#7826) 2020-08-04 09:27:51 -05:00
e8210fb56b reduce gps model vertex count from 3623 to 200 (#7827) 2020-08-04 09:26:29 -05:00
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
d3727d7c27 Tagging - Add: Support of localized string for tagging interaction (#7819)
* Add support of localized string

* Add: Support of localized string for tagging interaction

https://github.com/acemod/ACE3/pull/7819#issuecomment-663993956

* Update addons/tagging/functions/fnc_applyCustomTag.sqf

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2020-07-27 09:08:37 -05:00
f2dfcceb67 Tools - Prep publish for new RHS SAF compat (#7816) 2020-07-22 13:22:55 -05:00
23081e0ae5 [Docs] Update component dependencies
Automatically committed through CI.

[ci skip]
2020-07-22 17:38:40 +02:00
988a9a39f6 [Docs] Update component dependencies
Automatically committed through CI.

[ci skip]
2020-07-22 17:38:22 +02:00
4e46ef0d80 [Docs] Update component dependencies
Automatically committed through CI.

[ci skip]
2020-07-22 17:38:19 +02:00
6b674f5395 Add config option for the use of pilot camera for weapons on that turret (#7812) 2020-07-22 10:37:56 -05:00
c51fd0fd8f RHS Compat - Fix RHS:GREF M21/G36 weapons (#7806)
* m21 / g36 cleanup

* remove m84

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-07-22 10:37:34 -05:00
a5fba9fe8e RHS Compat - Add RHS:SAF compat (#7793)
* initial skeleton

* mrud mines

* more mines

* explosives

* compat checking

* ballistics

* handgun

* ak api
2020-07-22 10:36:57 -05:00
46f3c55758 Medical Engine - Prevent issues with respawning and ragdoll animations (#7796) 2020-07-22 10:25:47 -05:00
d751aca8ba Tagging - Fix tag orientation on walls (#7795)
Fix #7769
2020-07-22 10:25:34 -05:00
2f5c602316 RHS Compats - Fix inheritance on some weapons (#7784) 2020-07-22 10:25:09 -05:00
68fe594cab Goggles - Add effects only option (#7808)
* Added effects only option to goggles

* Set default back to 2
2020-07-22 10:24:43 -05:00
4676f3e743 Bump lodash from 4.17.13 to 4.17.19 in /docs/src (#7810)
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.13 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.13...4.17.19)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-07-15 23:49:30 +02:00
731c1c27a6 Fix nametag names jump when no ranks shown and talking (#7807) 2020-07-11 22:16:01 -05:00