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
12,503 Commits 73 Branches 88 Tags 752 MiB
547dfff683
Commit Graph

12503 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
commy2
74efc9c428
Merge pull request #6405 from acemod/fixExplosiveKilledDialogs 
don't make Explosives close one display at death
 2018-06-25 08:43:44 +02:00
commy2
613c088124
bump 2018-06-25 08:42:43 +02:00
commy2
b7e3646697 don't make Explosives close one display at death 2018-06-25 00:08:15 +02:00
maike1860
e3c5396593 Add Chinese translation Modify grammar (#6400) 
Translations-  Chinese: Modify grammar
 2018-06-22 19:14:11 -05:00
Unknown
bbbfabec03 Add new explosive timer UI 2018-06-22 15:41:43 -04:00
xrufix
b2be3d683f Fix typo (#6399) 2018-06-21 10:44:56 -05:00
PabstMirror
205abec286
Fastroping - Disable ACRE features from helper objects (#6387) 2018-06-20 22:17:27 -05:00
mharis001
fdf6100fb6 Add ACE Flags (#6394) 2018-06-18 15:01:32 -05:00
Tim Beswick
c0b9a31deb Cargo load ignore interaction distance parameter (#6395) 
* Added force parameter to cargo load

* Specifically ignore interaction distance

* Fixed old brackets

* Removed old trace
 2018-06-18 15:01:09 -05:00
Josuan Albin
0a313ce41f Fix right tab listNbox not showing last item on first load (#6390) 
Go figure why that happens tho :/
 2018-06-10 22:29:07 -05:00
Josuan Albin
3917092540 Fix possible issue with weapons without firemodes (#6386) 
Apparently that's a thing
 2018-06-10 00:14:14 -05:00
Josuan Albin
11df315ce4 Arsenal - Fix Rate Of Fire stat (#6385) 
* Fix the ROF stat in ace arsenal

Previous one was wrong when the ROF set as default was different than the one in firemodes

* Add missing )
 2018-06-09 12:43:53 -05:00
Vdauphin
f9943658e9 Cargo - Support of object without ace_cargo_size defined in config or -1 config value (#6364) 
* Add: Now findUnloadPosition support also cargo object

- use of ace_cargo_fnc_getSizeItem to determine size of item

- prefer the config way instead of manually set size

- This will also take into account object manually added to the cargo system with ace_cargo_fnc_setsize

- use the cargo object for ace_cargo_fnc_unloadItem.

* FIX: old work around

* FIX: error when cargo module is not loaded

* As suggested by @orbis2358

This fix handle the case when cargo module is not loaded for scheduled and unscheduled environnement.

* Use ACE framework to check if module is present

* FIX: EFUNC and isEqualto

- _itemSize here is always number
- here we are in common module (addons/common/functions/fnc_findUnloadPosition) so FUNC is ace_common_fnc

* FIX case where config value is `-1`

- if the config value is -1, get the `ace_cargo_size` from the `ace_cargo_fnc_getSizeItem
-
 https://github.com/acemod/ACE3/issues/6357#issuecomment-393525374
 2018-05-31 22:48:19 -05:00
xrufix
a4e0e83972 Realistic names for new assets from Tanks DLC (#6252) 
* LSV AT variants

* Angara > Armata, Nyx > Wiesel 2

* Fix some errors in last to commits

* Zamak MRL -> KamAZ MRL

* Vorona -> Metis-M

* Vehicle Vorona -> Metis-M

* Wiesel vehicle weapons

* Fix wrong inheritance

* Rooikat GT12 cannon

* Armata weaponry

* MB 4WD -> Jeep Wrangler

* Optics Attachments

* Fixed Type "Grenn" -> "Green"

* Rooikat SPMG -> MG4

* New Marid v2 -> Otokar ARMA

* Removed unnecessary inheritance.

* Simplify ace_vehicles config
 2018-05-31 22:12:24 -05:00
xrufix
dc3a9fccca Fix Mavericks and KH25ML diving into the ground. (#6315) 
* Fix issue with missiles diving into the ground before reaching the target

* More modest steering deflection for Maverick and Kh25ML
 2018-05-31 21:18:47 -05:00
mharis001
d4767eba73 Zeus - Add ability to unload cargo (#6226) 
* Add ability to unload cargo

* Handle array index being out of bounds
 2018-05-31 21:17:30 -05:00
xrufix
93e187e3ec Added hearing config for CSAT, Stealth and Racing Helmets (#6300) 
Hearing - Added config for CSAT, Stealth and Racing Helmets
 2018-05-31 20:52:45 -05:00
Dedmen Miller
f5cd682ce3 Arsenal - Add magazineWell support (#6355) 
* ACE Arsenal magazineWell support

* Fix case sensitivity problems
as
 2018-05-31 20:46:48 -05:00
BaerMitUmlaut
0ae93aa2e7 Hide "Activate Mine" action (#6353) 2018-05-31 18:13:17 -05:00
mharis001
e90ea95ce7 Change repair to use icon color not multiple files (#6318) 2018-05-31 18:11:16 -05:00
mharis001
77b4ce7585 Dogtags - Allow dogtags display to be repositioned (#6351) 
* Allow dogtags display to be repositioned

* Update IGUI preview image

* Use common grid macros
 2018-05-31 18:05:35 -05:00
Josuan Albin
9618c2de95 Various ACE Arsenal additions and fixes (#6347) 
Arsenal - Various additions and fixes
 2018-05-31 18:00:29 -05:00
Tim Beswick
0db28f89b7 Hellfire submunition (#6299) 
Hellfire - Update to use 1.82 submunition
 2018-05-31 17:57:40 -05:00
BaerMitUmlaut
7781c721a8 Fix NVG adjustable brightness (#6291) 
Nightvision - Fix adjustable brightness
 2018-05-31 11:07:31 -05:00
mharis001
3d31b6395c Interaction Menu - Ability to modify icon color (#6290) 
* Add ability to modify icon color

* Add config support for icon color
 2018-05-31 10:57:46 -05:00
mharis001
ac3642d074 Attach - Optimize creating children actions (#6345) 
* Optimize attach get children actions

* Store CfgMagazines and CfgWeapons config lookups
 2018-05-31 10:49:38 -05:00
ace3mod
b1c969c89d [Docs] Update component dependencies 
Automatically committed through Travis CI.

[ci skip]
 2018-05-31 17:44:13 +02:00
Ozan Eğitmen
a917d586cb Pylons - Separate settings for in-game and zeus (#6365) 
* Modernize pylons

* Revert docs/wiki/featurex/fortify.md

* Bring back ACE settings with movedToSQF

* 🤦

* Move settings to separate file, Fix postInit logic problems

* Tabs -> spaces
 2018-05-31 10:43:02 -05:00
EtoileRei
a5a8c68831 Japanese Translation Tweak (#6375) 
- fixed typo
- improved readability
- standardized expression
 2018-05-31 10:34:19 -05:00
BaerMitUmlaut
9aba78b320 Fix AF sway factor (#6360) 
* Fix sway factor, switch to CBA settings in AF

* Add movedToSQF
 2018-05-30 18:05:55 -05:00
mharis001
232f986048 Pass by reference for BI EHs (#6368) 2018-05-30 17:39:28 -05:00
mharis001
f3f57c6a38 Cleanup unused priority entry for interact menu actions (#6372) 2018-05-30 16:48:19 -05:00
shukari
bdc58441f4 Fixed mortar double loading (#6240) 
* block double loading

* prevent double loading

* block double loading

* use nil

* use nil

* fix some wrong variables

* not needed here

* unload only one person

* prevent duping

* wrong makro

* wrong makro

* wrong macros

* wrong macros
 2018-05-30 16:45:31 -05:00
BaerMitUmlaut
9acce30dd3
Fix doc for aneaerobic pathway (#6379) 2018-05-30 15:25:58 +02:00
Dmitry-Yuri
9c60ec06e4 Fix Pointing Problems with Static Weapons (#6377) 
* Update fnc_keyPress.sqf

* Update fnc_keyPress.sqf
 2018-05-29 22:04:32 +02:00
EtoileRei
0199ba9b4c Japanese Translation Tweak (#6374) 
# fixed typo
# improved readability
# standardized expression
 2018-05-28 07:15:28 +02:00
BaerMitUmlaut
3ebdb31a82 Replace make.bat with more advanced make.ps1 2018-05-27 20:28:38 +02:00
Thomas Kooi
e916f3eb5b
Increase build parallelism on circleci 2018-05-23 22:05:33 +02:00
jonpas
c9d774eeeb Merge branch 'master' into armake 2018-05-23 00:44:55 +02:00
jonpas
5e6ae3ca36 Revert documentation changes 2018-05-23 00:41:15 +02:00
Thomas Kooi
9d0e2014cf
Delete travis ci config file (#6361) 
Travis CI is no longer being used.
 2018-05-22 23:02:34 +02:00
jonpas
326604ae9f Fix particles preprocessing for both armake and pboProject 2018-05-22 20:09:30 +02:00
jonpas
9a37713710 Fix pboProject compatibility 2018-05-22 19:53:26 +02:00
jonpas
f613597636 Make setup.py compatible with new include CBA structure 2018-05-22 19:49:19 +02:00
jonpas
ef2c8c9502 Remove copying of inexisting userconfig, Bring version number up to date 2018-05-22 18:55:12 +02:00
jonpas
4054b0acba Update CBA include (from its armake setup) and enable excessive concatenation warnings 2018-05-22 18:45:27 +02:00
jonpas
90e51e501c Update A3 includes 2018-05-22 18:42:14 +02:00
jonpas
7dda6c62ef Update armake Windows binaries to 0.6.1, Use new signature name argument and header info for 'version' 2018-05-22 17:21:48 +02:00
jonpas
40de340d82 Revert changes that shouldn't be changed 2018-05-22 17:17:05 +02:00
Thomas Kooi
04a452bbc3
Add deploy step to same build step 2018-05-20 11:11:11 +02:00