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,339 Commits 73 Branches 88 Tags 752 MiB
3c5d47e83d
Commit Graph

14339 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PabstMirror
3c5d47e83d
Weather - Use apparent temp in displayAirTemp (#8544) 2021-10-22 15:21:22 +02:00
Vdauphin
275a822f78
Headless - Fix no rebalance of units spawned after headless joined (#8573) 2021-10-22 15:17:58 +02:00
jonpas
b7f9aee2d7
Sitting - Fix ACEX Merge (#8577) 2021-10-22 15:16:42 +02:00
PabstMirror
285c44bf15
Killtracker - Add ability to sync globally (#8521) 2021-10-21 12:42:34 -05:00
PabstMirror
5321efe6db
Tools - Add sog/gm compats to steam workshop (#8568) 2021-10-21 12:23:08 -05:00
mharis001
9f33c50572
Add ACEREP #00011 (#8519) 
* Add ACEREP #00011

* Apply suggestions from code review

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

* Improve vehicle damage paragraph

* Add Oxford comma

* Add link to towing video

Co-authored-by: Jo David <github@jonathandavid.de>

* Reduce image size

* Mention biggest update in two years

* Apply suggestion from code review

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

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: Jo David <github@jonathandavid.de>
 2021-10-21 12:02:39 -05:00
jonpas
c29ae977fc
Documentation - Merge ACEX (#8526) 
* Documentation - Merge ACEX

* Only show ACEX prefix note on framework pages

* Documentation - Use ACEX prefix in Fortify events
See #8553

* Cleanup acex from config.yml

* English is weird

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-10-21 11:27:25 -05:00
PabstMirror
ca09b88869 Prep 3.14.0 Build 63 2021-10-21 10:58:49 -05:00
PabstMirror
8cf1d7cb1b Merge branch 'master' into release-3.14.0 2021-10-21 10:58:41 -05:00
PabstMirror
62055d2605
ACEX - change module's category to ace from acex (#8567) 2021-10-20 16:29:43 -05:00
Beeperz
c00c6b826c
Added some russian translations (#8565) 
* Added some russian translations

* replace tabs

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-10-20 13:34:43 -05:00
Elgin675
958a0bf9ec
Translations - Update French Translations (#8562) 
* Add french translation of EnableSpeedIndicator keys

* Add french translation of EpilepsyFriendlyMode keys

* Add french translation (SpecterOS, SpecterOS 7.62, Burris XTR II, EOTech XPS3)

* Add french translation of the cargo renaming fonctionality (added in PR8023)

* Fix typo in 127x99_API_Mag_NameShort translations

* Add french translation of `LocationsBoostTraining_Description` key

* Add french translation of `interactWithTerrainObjects_Description` key

* Add french translation of `repackLoadedMagazines` keys

* Add french translation of `Rename group` self-interact fonctionality (added in PR8346)

* Add french translation of `Medical_Feedback_EnableHUDIndicators` keys

* Add french translation of Vehicle Towing fonctionality (Added in PR8380)

* Fix English and Japanese translation of length rope (18.3, 27.4 and 36.6 meters)

* Add french translation of customize Medical GUI colors settings (added in PR8350)

* Add french translation for additional progress bar information feature (added in PR8428)

* Add french translation in multiple modules.

* Fix French translation of `STR_ACE_Overheating_cookoffCoef_description` key.
 2021-10-19 15:30:46 -05:00
ZluskeN
2252eab2f3
SOG Compat - Jam types and Open bolts (#8563) 
* SOG Compat - Jam types and Open bolts

- Machineguns and SMGs fire from open bolts
- Fire and Dud Jam types for Grenade Launchers, Revolvers and Shotguns

* Update CfgWeapons.hpp

* Update pistols.hpp

* Update weapons.hpp
 2021-10-19 15:26:00 -05:00
PabstMirror
8cdf0b2c68
Revert "Common - Fix calling getVar on null object in canInteractWith (#8532)" (#8564) 
This reverts commit a0e9f6015b.
 2021-10-19 13:17:59 -05:00
PabstMirror
f818261052
acex - fix useage of old ACECSTRING macro for authors (#8561) 2021-10-18 22:50:16 -05:00
ZluskeN
845b813672
GM Compat - Jam types and Open bolts (#8559) 
* GM Compat - Jam Types and Open Bolts

- Belt-fed Machineguns and SMGs fire from open bolts
- Fire and Dud Jam types for Grenade Launchers and Flare Guns

* Update optionals/compat_gm/CfgWeapons.hpp

Co-authored-by: Björn Dahlgren <bjorn@dahlgren.io>

* Update optionals/compat_gm/CfgWeapons.hpp

Co-authored-by: Björn Dahlgren <bjorn@dahlgren.io>

* Update optionals/compat_gm/CfgWeapons.hpp

Co-authored-by: Björn Dahlgren <bjorn@dahlgren.io>

* Update optionals/compat_gm/CfgWeapons.hpp

Co-authored-by: Björn Dahlgren <bjorn@dahlgren.io>

* Update optionals/compat_gm/CfgWeapons.hpp

Co-authored-by: Björn Dahlgren <bjorn@dahlgren.io>

* Update optionals/compat_gm/CfgWeapons.hpp

Co-authored-by: Björn Dahlgren <bjorn@dahlgren.io>

* Update optionals/compat_gm/CfgWeapons.hpp

Co-authored-by: Björn Dahlgren <bjorn@dahlgren.io>

* Update CfgWeapons.hpp

Co-authored-by: Björn Dahlgren <bjorn@dahlgren.io>
 2021-10-18 22:50:04 -05:00
PabstMirror
7fa4d631df Prep 3.14.0 Build 61 2021-10-18 19:18:41 -05:00
PabstMirror
b49d5db7b6 Merge branch 'master' into release-3.14.0 2021-10-18 19:17:49 -05:00
mharis001
ddbfc3090c
Overheating - Fix invalid jamTypesAllowed arrays (#8560) 2021-10-18 19:05:40 -05:00
PabstMirror
36b9f35ada
Sog Compat - fix csw_m1919a6 string (#8557) 2021-10-18 12:50:15 -05:00
Björn Dahlgren
b12af1e0b5
General - Format config classes with consistent spacing (#8550) 2021-10-18 11:56:43 -05:00
jonpas
9f4dd776b8
ACEX Merge - Make ACEX-prefixed functions proxies (#8555) 
* ACEX Merge - Make ACEX-prefixed functions proxies

* No call
 2021-10-18 11:56:08 -05:00
jonpas
73be44fbbf
Fortify - Use ACEX-prefixed event names (#8553) 2021-10-18 11:54:10 -05:00
PabstMirror
38b8b5dfff
Documentation - Add notes about ACEX variables (#8549) 
* Doc - add notes about acex var naming to addons

* Add Fortify events

Co-authored-by: jonpas <jonpas33@gmail.com>
 2021-10-18 11:49:33 -05:00
jonpas
729b7b706c
ACEX Merge - Use BWC_CONFIG macro (#8554) 2021-10-18 11:42:17 -05:00
TyroneMF
9f07a9a07b
Fix Global / Default settings (#8551) 2021-10-18 00:30:39 -05:00
PabstMirror
f2b3fe3012
Tweak Field_rations/overheating merge (#8548) 2021-10-17 21:45:01 -05:00
Drofseh
eadbc60314
Overheating - Fix errors, improve documentation, change AceX references for integration (#8522) 
* Fix jam script error, improve documentation

* formatting

* Update docs/wiki/feature/overheating.md

Co-authored-by: GhostIsSpooky <69561145+Salluci@users.noreply.github.com>

* Update docs/wiki/feature/overheating.md

Co-authored-by: GhostIsSpooky <69561145+Salluci@users.noreply.github.com>

* fix icon filepath for AceX integration

* Apply suggestions from code review

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

* Update addons/overheating/XEH_postInit.sqf

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

* move old AceX references to macros

* small whitespace formatting

Co-authored-by: GhostIsSpooky <69561145+Salluci@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
 2021-10-17 17:00:16 -05:00
jonpas
37c16afe9c
Interaction - Fix Open Door keybind (#8547) 
* Interaction - Fix Open Door keybind
Reach distance calculation didn't give position to

* getPosASL is redundant
 2021-10-17 16:58:35 -05:00
Björn Dahlgren
e1185def3b
GM Compat - Fix inheritance issues (#8546) 2021-10-17 22:15:27 +02:00
Drofseh
3daa510868
Main - Add external macros for ACEX (#8540) 2021-10-17 22:14:40 +02:00
PabstMirror
525f3c5ce3
Cookoff - Fix box cookoff (#8542) 
* Cookoff - fix box cookoff

* rename
 2021-10-17 15:01:41 -05:00
ZluskeN
88eb4c6cd3
Add ACE support for SOG M63A (#8545) 
The ammo for M63A Belt-fed version was not classified as a Belt
 2021-10-17 15:01:21 -05:00
PabstMirror
63be48f207
Cargo - Fix undefined object name in paradrop (#8543) 2021-10-17 00:48:31 -05:00
PabstMirror
77fe9ab434
UI - Fix changing UI settings (#8541) 2021-10-17 00:48:12 -05:00
Laid3acK
e6bc44225f
R3F/RHS Compat - Add Ace vehicle damage incendiary (#8537) 
* ace_vehicle_damage_incendiary

* ace_vehicle_damage_incendiary
 2021-10-16 21:14:13 -05:00
PabstMirror
e1141cdd27
Medical Feedback - Fix pain effects when set to Only high pain effect (#8534) 
Close #8533
 2021-10-16 21:13:40 -05:00
Vdauphin
5fc9856b61
FIX: _target not define (#8536) 2021-10-16 17:17:20 -05:00
Brandon Danyluk
290ce934f4
reduce default incendiary value (#8529) 2021-10-16 17:16:35 -05:00
PabstMirror
a0e9f6015b
Common - Fix calling getVar on null object in canInteractWith (#8532) 
* Common - Fix calling getVar on null object in `canInteractWith`

* why was this added dedman?
 2021-10-16 17:15:37 -05:00
Brandon Danyluk
2dfbaa90b0
Fix hashmap bug in laser seeker (#8531) 
* fix bug in laser

* use `hashValue`
 2021-10-16 13:29:57 -05:00
classic
e9912a4c33
Update of Japanese translation (#8530) 2021-10-15 22:48:18 -05:00
PabstMirror
d46d59695f
Various - Fix setting var name (#8528) 
* Scopes - Fix var name

* fix 2.5 more settings
 2021-10-15 19:08:42 -05:00
PabstMirror
93b7722716
General - Cleanup CfgPatches unit/weapon arrays (#8524) 
* General - Cleanup CfgPatches unit/weapon arrays
add test tool
fix refuel pump
fix flashlight pistol transport type
fix iDAB reammo box

* Update config.cpp
 2021-10-15 13:48:33 -05:00
PabstMirror
916346ae59
General - Format config class defines to coding guidelines (+tool) (#8520) 
* General - Format config class defines to coding guidelines (+tool)

* Update tools/config_style_checker.py

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

* Update tools/config_style_checker.py

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

Co-authored-by: jonpas <jonpas33@gmail.com>
 2021-10-15 13:47:05 -05:00
PabstMirror
9395068424
General - Empty units/weapons arryas in acex cfgPatches, Add acex_main (#8518) 2021-10-15 12:54:12 -05:00
PabstMirror
72b63f4394
Various - use compile_script macro for new addons (#8516) 2021-10-15 12:53:44 -05:00
PabstMirror
c9aa690a4d
various - cleanup maintainers in readmes (#8517) 2021-10-15 12:25:42 -05:00
PabstMirror
495a9b6fb9
Tools - Cleanup all old keys in release/optionals (#8523) 2021-10-15 12:22:12 -05:00
Björn Dahlgren
5a4451a680
Tools - Add Mikero build in GitHub Actions (#8251) 2021-10-15 13:40:57 +02:00