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,087 Commits 73 Branches 88 Tags 752 MiB
8bd4922fcc
Commit Graph

14087 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PabstMirror
8bd4922fcc Prep 3.13.6 Build 60 2021-03-09 17:06:50 -06:00
PabstMirror
8615df6211 Merge branch 'master' into release-3.13.6 2021-03-09 17:06:37 -06:00
Steve Zhao
c0db53770a
Add descriptions for hellfire variants (#8157) 2021-03-09 17:04:17 -06:00
PabstMirror
9bc5d6af27 Prep 3.13.6 Build 59 2021-03-08 22:12:36 -06:00
PabstMirror
d2ceeed154 Merge branch 'master' into release-3.13.6 2021-03-08 22:07:18 -06:00
BaerMitUmlaut
dcfb5aa224
Enable forgotten unconscious fade in/out effects (#8156) 2021-03-08 17:14:19 -06:00
PabstMirror
05ab4ba677
Javelin - reduce soft-launch motor delay (#8152) 2021-03-07 13:25:14 -06:00
classic
7112bebaa7
Update Japanese translation (#8150) 2021-03-06 14:27:35 -06:00
Dystopian
69c3d2bb65
Add Weapon Attachments interaction (#7706) 
* Add Weapon Attachments interaction

* Apply recommended changes

* Format addPEH

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

* Remove toLower

* Update required CBA version

* Rename category to Accessories

* Change setting var name

* Add setting description

* Fix notification size

* Optimize with new commands

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
 2021-03-04 11:43:11 -06:00
classic
c60e4111d8
Update Japanese translation (#8146) 2021-03-04 11:27:06 -06:00
Neil Evers
d64050554d
Arsenal - Fix Zeus UI lockup after closing arsenal (#8102) 
* Fix Zeus UI lockup after closing arsenal

* Removed redundant line

* use ACE_player

* Always reset cameraview
 2021-03-03 22:11:24 -06:00
PabstMirror
2458e87333 Prep 3.13.6 Build 58 2021-03-03 16:04:10 -06:00
PabstMirror
fab4664b73
Update XEH_preInit.sqf (#8143) 2021-03-03 15:50:08 -06:00
PabstMirror
22faa51233
Common - Fix Gesture mutex for scroll-wheel reloads (#8142) 
* Common - Fix Gesture mutex for scroll-wheel reloads

* simplify gvars and add comments
 2021-03-03 15:31:07 -06:00
Salluci
496a6d800a
Medical - Show "Inventory" action on unconscious units (#8083) 
* Update XEH_preInit.sqf

* Style pass, remove double localize

* only run if (hasInterface) {

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-03-03 15:30:49 -06:00
Dystopian
98e74ab3d1
Cook off - Fix ammo box cook off when setting is Players only (#8066) 
* Fix ammo box cook off when setting is Players only

* Update addons/cookoff/functions/fnc_handleDamage.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-02-27 11:50:09 -06:00
Filip Maciejewski
4d71607e81
Arsenal - Less magic numbers (#8089) 
* Add macro for virtualItems index 0 (weapons)

* Add macro for virtualItems index 1 (attachments)

* Add macro for virtualItems index 2 (all items)

* Add macro for virtualItems index 3 (headgear)

* Add macro for virtualItems index 4 (uniform)

* Add macro for virtualItems index 5 (vest)

* Add macro for virtualItems index 6 (backpack)

* Add macro for virtualItems index 7 (goggles)
 2021-02-27 11:21:26 -06:00
pterolatypus
b2da1792e1
Medical Treatment - Settings to limit IVs to certain locations (#8116) 
* Settings to limit IVs to certain locations

* Changed to one setting

* Reworded settings for consistency
 2021-02-27 11:06:37 -06:00
Neviothr
75f7ed7532
Utilize isNotEqualTo (#7929) 
* Utilize isNotEqualTo

* undo changes to some files

* redo some changes, fix based on @Vdauphin 's comment

* fix validator issues

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-02-27 11:05:05 -06:00
jonpas
5a36d1a771
Advanced Throwing - Add object variable to disable pick up of attached throwables (#8031) 
* Advanced Throwing - Add object variable to disable pick up

Use: `OBJECT setVariable ["ace_advanced_throwing_disablePickUp", true]`

* Documentation - Add Advanced Throwing Framework

* Update addons/advanced_throwing/functions/fnc_renderPickUpInteraction.sqf

* Update advanced-throwing-framework.md

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-02-27 11:04:43 -06:00
Steve Zhao
13bce729ee
add icon for quickmount change seat (#8126) 
alpha-inverted version of "\a3\ui_f\data\GUI\Cfg\Hints\Seats_ca.paa"
 2021-02-27 10:36:10 -06:00
Dystopian
b151148542
Replace canAdd with CBA_fnc_canAddItem (#8012) 2021-02-27 10:26:12 -06:00
Björn Dahlgren
d55529041a
Apply needed pboProject settings in make.py via Windows Registry (#8128) 2021-02-26 19:55:01 -06:00
commy2
50578a2463
Fix Multiple Issues With Timestamps (#8034) 
* Fix Multiple Issues With Timestamps

* simplify

* improve parsing of timestamps

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-02-27 00:17:00 +01:00
PabstMirror
bac47bb292
Chery pick 6868fa5600 (#8139) 
Co-Authored-By: Toni Vicente <arv187@users.noreply.github.com>

Co-authored-by: Toni Vicente <arv187@users.noreply.github.com>
 2021-02-26 13:28:42 -06:00
Toni Vicente
1f691be4e9
Update AUTHORS.txt (#8125) 
Contributing in spanish strings
 2021-02-26 12:29:46 -06:00
PabstMirror
ad98ae479c
Flashsuppresssors - Update configs for 2.02 (#8105) 2021-02-24 11:41:32 -06:00
Vdauphin
d00e7a17a1
cookOff - Fix: Disable ammunition cookoff and turret effect when skipping destruction effects (#8122) 
* Disable ammunition cookoff and turret effect when skiping destruction effects

* Improve readability
 2021-02-23 11:42:15 -06:00
BaerMitUmlaut
61e8ae3c8b
Wirecutter - Replace fences with destroyed models when cut (#8106) 
* Add more fence types for wirecutter

* Replace fences with destroyed models when cut

* Move fence destruction to server side
 2021-02-23 11:03:55 -06:00
mharis001
5bc43fe247
Common - Improve getPylonTurret by using getAllPylonsInfo (#8087) 
* Improve getPylonTurret by using getAllPylonsInfo

* Fix indentation

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-02-23 10:57:57 -06:00
PabstMirror
0570c0b861
Update fnc_cbaSettings_loadFromConfig.sqf (#8118) 2021-02-19 11:18:21 -06:00
TyroneMF
f85632cbbd
initial push (#8099) 2021-02-18 12:58:26 -06:00
PabstMirror
e8693c8db9
Various - Use configOf command for faster lookup (#8100) 
* configOf

* replace some use of CBA_fnc_getObjectConfig
 2021-02-18 12:58:08 -06:00
PabstMirror
f72175f823
Tools - Don't let mikro tools touch configs (#8093) 2021-02-18 12:53:22 -06:00
jonpas
111202971b
Goggles - Allow wiping in more states (#8111) 2021-02-14 04:28:58 +01:00
PabstMirror
cb870693fd
CSW - use preferred XEH format (#8112) 2021-02-13 15:37:26 -06:00
ace3mod
56850cd8ad [Docs] Update component dependencies 
Automatically committed through CI.

[ci skip]
 2021-02-08 04:46:16 +01:00
Laid3acK
174df77564
R3F Compat - Update to the R3F weapons 3.7.1 (#8078) 2021-02-08 04:45:36 +01:00
Filip Maciejewski
b8820eb3da
Arsenal - Fix custom categories not working for some Misc item types (#8088) 2021-02-08 04:26:40 +01:00
PabstMirror
b50a49c287
Convert all true/false in configs to 0/1 (#8095) 2021-02-08 04:14:45 +01:00
TyroneMF
7a65acdc15
Medical Damage - Add setting for unconscious chance from pain (#8092) 
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
 2021-02-08 04:13:59 +01:00
Dystopian
08472f6343
Interact Menu - Combine parent menu with single child (#8060) 
* Combine parent menu with single child

* Adapt fastroping Cut ropes action for the setting

* Change setting name and description

* Fix action object when child action has different object

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

* Adapt quickmount Change Seat actions

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-02-04 11:01:35 -06:00
PabstMirror
091d0d2449
Tripod - Fix blocking mouse wheel input handler (#8090) 2021-02-04 10:48:58 -06:00
PabstMirror
5ffcac9c88
Misc - Fix minor macro usage (#8091) 2021-02-03 17:56:18 -06:00
Dystopian
4acfc35e77
Cleanup unused variable (#8074) 2021-01-28 11:14:28 -06:00
jonpas
6522dba87e
Dragging - Fix mass synchronization (#8071) 
* Dragging - Fix mass synchronization

* Cleanup redundant argument
 2021-01-20 14:49:38 -06:00
Jo David
24b1a71fbb
fix docs version of ace3 (#8069) 2021-01-14 07:29:05 +01:00
PabstMirror
8b8abec70e
Tools - Build dev (filepatching) with hemtt if installed (#8061) 
* Build dev (filepatching) with hemtt if installed

* Update build.py
 2021-01-10 13:28:29 -06:00
Björn Dahlgren
d991f8ebdc
Tools - Disable pboproject warnings are errors in build script (#8049) 
Macros with unused variables are now warnings
This causes issues with logging macros being unused with disabled debug
 2021-01-10 13:27:25 -06:00
Björn Dahlgren
fe544a274d
Ballistics - Add 30rnd 556 magazines to SCAR EGLM magwell (#8054) 2021-01-05 10:54:52 +01:00