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,664 Commits 73 Branches 88 Tags 752 MiB
88238dd0b5
Commit Graph

10429 Commits

Author SHA1 Message Date
mharis001
a84daca959 Explosives - Optimize interactEH function (#6406) 
* Optimize explosives interactEH

* Use local player variable and distanceSqr
 2018-07-13 12:04:55 -05:00
mharis001
def05b9cf1 Wire cutter - Various improvements and cleanup (#6389) 
* Optimize and cleanup interactEH function

* Add missing fences and improve formatting

* Improve cutDownFence function

* Remove unused sound files and cleanup

* Multi-line condition and fix examples

* Increase PFH delay and use distanceSqr
 2018-07-13 11:30:13 -05:00
alef
3673a6f56a Italian Translation Update (#6425) 
* Fix wrong order shown in addon category list

Just put 'ACE' at begin

* Typo

* Add/Fix: arsenal, nightvision and others.

common, explosives, maverick, gforces, pylons, hearing, marksers, repair,
flashlights, nametags, interaction, vehicles, medical_menu, medical_ai,
interact_menu, medical
 2018-07-11 10:17:13 -05:00
PabstMirror
29726946f6
Disposable - Fix nlaw picture popup error (#6419) 
Fix #6410
 2018-07-06 00:13:23 -05:00
Tim Beswick
80e648938a Speed limit scroll (#6384) 
Vehicles - Set speed limited with mouse scroll wheel
 2018-07-05 11:32:40 -05:00
PabstMirror
5495bd5a1f
Pylons - Add ACE prefix to settings category (#6388) 2018-07-05 11:29:51 -05:00
PabstMirror
a8c1846a37
Logistics - Move to CBA settings and organize in subcategories (#6284) 2018-07-05 11:29:32 -05:00
Josuan Albin
09855f133a Fix typo in med and issue related to unconsciousness (#6411) 
* Fix adenosine displayname being wrong in some medical interactions

* Fix unconscious units waking up while being carried staying muted
 2018-06-28 00:06:12 -05:00
Dissyu
e5a15d200f Traditional Chinese update (#6408) 
Traditional Chinese update
 2018-06-27 14:16:11 -05: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
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
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
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
SilentSpike
54c398a007 Use macros for peripheral resistance 2018-05-23 10:52:47 +01:00
SilentSpike
52dbef84ab Fix incorrect macro variable 2018-05-23 10:27:12 +01:00
SilentSpike
de2d7f2fb8 Use macros for hemorrhage class tracking 2018-05-22 18:25:50 +01:00
SilentSpike
c9e11e62a1 Use macros for status state variables 2018-05-22 18:06:28 +01:00
SilentSpike
ff33f8e954 Use macro for unconscious variable 2018-05-22 17:21:24 +01:00
commy2
e289acbb4e
Merge branch 'master' into adv_fatigue_sway_factor 2018-05-19 02:43:11 +02:00
Dedmen Miller
4ede9858e5 Fix minor typo in fnc_cachedCall (#6346) 2018-05-16 20:00:51 -05:00
commy2
d6a88ac34a
Merge pull request #5828 from xrufix/AimCoef 
Add ability to set aiming coefficient for mission scripting.
 2018-05-16 07:53:09 +02:00
SilentSpike
563742bdd8 Fix heart rate and pain suppression adjustments 2018-05-11 16:11:01 +01:00
SilentSpike
1dc934e1b1 Use macros for unit variables 
Improves the way medical is storing variables in object space by having
a common list of variables names as macros. Makes the code a bit cleaner
and ensured consistency across components. Also a handy reference for
when working on medical to see what values are all stored.
 2018-05-11 15:28:25 +01:00
classic
2cd4615d5d Update Japanese translations (#6340) 
* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation
 2018-05-11 08:39:32 -05:00
SilentSpike
e0503129f0 Use blood bolume status macros 2018-05-10 17:44:02 +01:00
SilentSpike
4715a75351 Include all UI files 2018-05-10 16:47:11 +01:00
SilentSpike
65a3c32f9f Fix patient information display 2018-05-10 16:42:33 +01:00
SilentSpike
267c0b5c3c Fix some moved function calls 2018-05-09 16:52:26 +01:00
PabstMirror
4df3cfe8a0
Clean up ace_main requiredAddons list (#6332) 
Close #6331
 2018-05-09 10:32:44 -05:00
Dystopian
a4b803e2c1 Interaction - Allow RHIB push (#6302) 2018-05-09 10:09:34 -05:00
PabstMirror
b1526ccb86
Spall - Don't throw script errors in doSpall if input is bad (#6322) 
- Fix #5614
- Don't run tracking siumlation on small calibre ammo that won't ever spall
 2018-05-09 10:08:26 -05:00
SilentSpike
dbb538dc56 Fix GVARs moved out of medical 2018-05-09 13:37:07 +01:00
SilentSpike
b81bee2d46 Fix bandage and injector icon paths 2018-05-08 14:55:13 +01:00
SilentSpike
33a5fb46f5 Fix patient information display 2018-05-08 14:51:32 +01:00
SilentSpike
4303a340de Fix stringtable duplicates and missing Key tag 2018-05-08 14:37:54 +01:00
SilentSpike
e97e1ed670 Fix more icon paths 2018-05-08 13:57:32 +01:00
SilentSpike
6cb43d61eb Fix icon paths 2018-05-08 13:46:30 +01:00
SilentSpike
a16721a1ea Fix medical statemachine function calls 2018-05-08 11:12:01 +01:00
SilentSpike
697aa5dc08 Fix medical status function calls 2018-05-08 10:45:30 +01:00
SilentSpike
65f57361a4 Add blood pressure status macro 2018-05-08 09:28:16 +01:00
SilentSpike
6eb9c7e940 Fix medical vitals function calls 2018-05-08 09:17:47 +01:00
SilentSpike
352d8cad31 Fix missing postInit error 2018-05-08 09:09:44 +01:00
SilentSpike
1373e62cd0 Fix stringtable names 2018-05-08 08:52:59 +01:00
SilentSpike
c92fd89c7a Fix pain percieved function calls 2018-05-08 08:47:03 +01:00
SilentSpike
909ae27721 Fix function prep typos 2018-05-08 08:38:00 +01:00
mharis001
fa98316424 Correct arsenal openBox center check (#6329) 2018-05-07 22:44:15 +01:00
Dystopian
c35a53ba79 Clean up deprecated in 3.13 2018-05-05 21:54:13 +03:00
PabstMirror
d68f67a1ef
Arsenal - Fix weight stat for NVGs (#6325) 
Fix #6320
 2018-05-04 16:13:42 -05:00
Vdauphin
2668bdc665 Check if suicide bomber isAwake (#6324) 
Zeus - Don't trigger suicide bomber if unconsicous
 2018-05-04 11:57:38 -05:00
Vdauphin
5f67e81355 Fix suicide bomber explosion position (#6323) 2018-05-04 16:36:08 +01:00
commy2
898c01587a Optimize suicide bomber zeus module (#6314) 
- decrease check frequency from each frame to 1 per second
- simplify some math
- remove some very redundant parenthesis
- re-formated if control structure for readability
- use more appropriate skillFinal
- macro to change check delay, set to 0 in debug mode for debug line drawing
 2018-05-04 16:35:28 +01:00
PabstMirror
ab23f4e4dc
Map - Fix ambient light effect flicking (#6313) 
* Map - Fix ambient light effect flicking

* Remove format

* formating
 2018-04-28 17:23:59 -05:00
mharis001
e9af086454 Interaction Menu - Add ability to change selector color (#6292) 
* Add selector color changing

* Setup colors once at init
 2018-04-28 17:23:44 -05:00
Dystopian
2454ade07b Quick Mount - Fix mount from water (#6310) 2018-04-28 14:34:52 -05:00
Cuel
265bc62259 (repair) - isRepairVehicle handling values according to wiki (#6278) 
* handle boolean and integer

* check if value is 1 or true
 2018-04-27 10:30:03 -05:00
SilentSpike
6559665b8b Use more status macros 2018-04-27 16:03:55 +01:00
SilentSpike
7d55163463 Add missing PREPs 2018-04-27 15:43:41 +01:00
SilentSpike
5bc57cd793 Remove missing function PREPs 2018-04-27 15:32:11 +01:00
SilentSpike
d08cf4bdb7 Fix preprocessor includes 2018-04-27 15:21:49 +01:00
commy2
fbacf1a3e4
Merge pull request #6183 from DeliciousJaffa/patch-1 
Allow goggle effects to be set locally per client
 2018-04-27 01:14:51 +02:00
SilentSpike
5bd4cfcf59 Fix status macros 2018-04-24 20:19:47 +01:00
SilentSpike
e065ee239e Merge branch 'medical-rewrite' into medical-rewrite-restructure 2018-04-24 20:07:05 +01:00
mharis001
87c3a7a334 Zeus - Improve Editable Objects module and Cleanup (#6294) 
* Improve Update Editable Objects ui and add icon

* Cleanup and remove broken attribute position

* Use QQGVAR
 2018-04-24 18:46:59 +01:00
Josuan Albin
e7710d719b Add ace hearing support to the tank DLC helmet (#6296) 2018-04-23 17:47:41 +01:00
SilentSpike
5206b63d5a Fix medical interaction menu bleeding colours 
This makes the bloodloss calculation used for the interaction menu icons
match the calculation used for the body image.
 2018-04-20 12:28:18 +01:00
mharis001
ec8115d2a4 Zeus - Toggle NVGs and Flashlights improvements (#6219) 
* New Toggle NVG ui and improve function

* Add Toggle Flashlights icon

* New Toggle Flashlights ui and improve function

* Stringtable changes and ace_ai postInit clean up

* TRACE fix and stringtable capitalization
 2018-04-19 14:01:26 -05:00
PabstMirror
a828ebe591
Repair - Disable repair on ERA/Slat armor hitpoints (#6283) 
* Repair - Disable repair on ERA/Slat armor

Disable "miscRepair" action for all era and slat armor hitpoints.
Can still be repaired via "Full Repair"

* Minor perf improvment

* Add hitpoint names for 1.82 comTurret/gun

* Fix russian translations
 2018-04-19 12:31:00 -05:00
PabstMirror
f4473ccfd3
Tactical Ladder - Fix args to cancleTLdeploy (#6280) 
Fix #6232

cancelTLdeploy expects `[unit, mouse button key]`
 2018-04-19 12:20:18 -05:00
SilentSpike
535e285c2c
Fix cardiac arrest time scale (#6244) 
This was changed from minutes to seconds at some point, but not
everywhere. Just making it consistent.
 2018-04-18 23:25:44 +01:00
PabstMirror
3ca1bd77b8 Build Number for RC2 2018-04-16 23:38:58 -05:00
PabstMirror
6dace8f380 Merge branch 'master' into release-3.12.2 2018-04-16 23:37:17 -05:00
PabstMirror
336b8973c4
Rearm - Increase rearm distance check (#6276) 
Fix #6177
 2018-04-16 23:35:50 -05:00