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
14,096 Commits 73 Branches 88 Tags 752 MiB
3af1fb50ab
Commit Graph

14096 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brett
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
Brett
241f1aefbd
fix face, voice, insignia in arsenal (#7879) 2020-08-27 10:37:20 -05:00
Brett
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
PabstMirror
b4f7963434 Prep 3.13.4 Build 53 2020-08-24 19:35:36 -05:00
Whigital
e9b2087faf
mk11 mod 0 ec inheritance (#7874) 2020-08-24 19:34:43 -05:00
PabstMirror
fb037c8c1f
Tools - Dumbs (#7875) 2020-08-24 19:30:52 -05:00
PabstMirror
b4d89e919e
Misc - Fix UBCs (#7870) 2020-08-24 13:31:35 -05:00
Cyruz143
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
PabstMirror
311dcde5da
Tools - Add all optionals to steamWS (#7859) 2020-08-23 09:57:36 -05:00
Elgin675
a919dd70b7
Translations - fix some french keys (ACE Uncategorized menu) (#7866) 2020-08-23 09:05:05 -05:00
Elgin675
61eea98976
Remove "ACE" prefix for Gunbag in Uncategorized menu (#7867) 2020-08-23 14:35:33 +02:00
mharis001
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
Elgin675
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
Elgin675
9c0eebaa07
Map Gestures: Fix Briefing Mode setting strings (#7862) 2020-08-21 13:09:14 +02:00
Neviothr
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
Laid3acK
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
Joko
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
Brett
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
mharis001
4d769e4b8f
Cargo - Fix loaded cargo not being deleted when vehicle is destroyed (#7851) 2020-08-18 12:42:09 -05:00
mharis001
c8bb046d31
MicroDAGR - Fix contour interval info showing on compass (#7849) 2020-08-12 01:48:40 -04:00
PabstMirror
1be65a9125
Update stringtable_validator.py (#7841) 2020-08-09 10:24:09 -05:00
Mysteryjuju
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
TyroneMF
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
Daniel Lee
c2715a2e41
Add hearing protection to LDF and Spetsnaz helmets (#7843) 2020-08-09 10:11:50 -05:00
Jo David
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
Daniel Lee
48c7738c57
Add G-force reduction to Heli Pilot Coveralls [LDF] (#7825) 2020-08-04 10:43:53 -05:00
Gold John King
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
Björn Dahlgren
7446ca1655
View Distance - Update view distance on video options changes (#7824) 2020-08-04 10:02:01 -05:00
Daniel Lee
7bc28768da
Add Contact CBRN facewear overlays (#7826) 2020-08-04 09:27:51 -05:00
Jo David
e8210fb56b
reduce gps model vertex count from 3623 to 200 (#7827) 2020-08-04 09:26:29 -05:00
Mysteryjuju
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
Vdauphin
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
PabstMirror
f2dfcceb67
Tools - Prep publish for new RHS SAF compat (#7816) 2020-07-22 13:22:55 -05:00
ace3mod
23081e0ae5 [Docs] Update component dependencies 
Automatically committed through CI.

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

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

[ci skip]
 2020-07-22 17:38:19 +02:00
Brandon Danyluk
6b674f5395
Add config option for the use of pilot camera for weapons on that turret (#7812) 2020-07-22 10:37:56 -05:00
Whigital
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
Whigital
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
PabstMirror
46f3c55758
Medical Engine - Prevent issues with respawning and ragdoll animations (#7796) 2020-07-22 10:25:47 -05:00
PabstMirror
d751aca8ba
Tagging - Fix tag orientation on walls (#7795) 
Fix #7769
 2020-07-22 10:25:34 -05:00
PabstMirror
2f5c602316
RHS Compats - Fix inheritance on some weapons (#7784) 2020-07-22 10:25:09 -05:00
JoramD
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
dependabot[bot]
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
Filip Maciejewski
731c1c27a6
Fix nametag names jump when no ranks shown and talking (#7807) 2020-07-11 22:16:01 -05:00
Filip Maciejewski
94ba0784f9
Add veteran29 to maintainers (#7809) 
* Add veteran29 to maintainers

* Move veteran29 to core team in AUTHORS.txt
 2020-07-12 03:43:07 +02:00
mjc4wilton
245d831d58
Logistics Wirecutter - Add additional Contact and Malden fences (#7800) 
* Add additional fences

* Update AUTHORS.txt

Forgot to include myself in my first PR
 2020-07-09 13:07:20 -05:00
shukari
ffbd72616a
Arsenal - double custom right panel misc items buttons fixed (#7801) 
* added medical, food and roleplay categories to arsenal

* decreased wound stitch time

* added custom rightPanelButtons

* stuff that doesnt belong here

* fix

* commys wishes

* commys wishes part2

* Update addons/arsenal/defines.hpp

Co-Authored-By: Dedmen Miller <dedmen@users.noreply.github.com>

* Update addons/arsenal/functions/fnc_fillRightPanel.sqf

Co-Authored-By: Dedmen Miller <dedmen@users.noreply.github.com>

* Update addons/arsenal/functions/fnc_fillRightPanel.sqf

Co-Authored-By: Dedmen Miller <dedmen@users.noreply.github.com>

* infinitely better SPEED

* changes

* delete unused stuff

* my own 3 white dots

* fixed fillRightPanel IDC_MISC

* commy fixes

* background first

* fix double buttons

Co-authored-by: Schwaggot <tom.ryan@posteo.de>
Co-authored-by: Dedmen Miller <dedmen@users.noreply.github.com>
 2020-07-09 13:06:38 -05:00
PabstMirror
697bb2cbdd
Tools - Add a missing pDumb (#7790) 2020-07-01 18:14:58 -05:00
PabstMirror
c5150fe0eb Update version.html for acex3.5.4 2020-07-01 12:09:57 -05:00