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,719 Commits 73 Branches 88 Tags 752 MiB
50430e47ef
Commit Graph

14719 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Filip Maciejewski
ecb7721c77
Medical - Disable blood spurts for fire, burn and drown damage types (#9001) 2022-08-25 12:05:50 -05:00
BrettMayson
438a90b63d
Common - Add CBA extended loadout (#8923) 
* extended loadouts - earplugs, gunbag, and arsenal identity

* arsenal - maintain default loadout size check

* restore comment

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

* fix forgotten example

Co-authored-by: jonpas <jonpas33@gmail.com>
 2022-08-25 11:56:54 -05:00
JonBons
8e06f2ec6b
Cookoff - Tweaked effects cleanup to add Deleted EH globally and trigger a local cleanup event (#9000) 2022-08-20 16:38:06 -05:00
JonBons
f846b9ab82
Cookoff - Randomized the delay from start of cookoff and ammunition detonation (#9002) 
* Cookoff - Added a random delay between a vehicle being killed and when the ammo starts to cookoff

* Cookoff - Tweaked min ammo start delay to 1 second

* minor syntax and macro cleanup
 2022-08-20 16:36:37 -05:00
Tim Beswick
2a4355dfb9
Cargo - Add setting for carry after cargo unload (#8997) 
* Add setting for carry after cargo unload

* Fix typos

* Contributors

* Don't make setting global

* Update addons/cargo/stringtable.xml

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

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
 2022-08-20 16:28:16 -05:00
Whigital
b2b3149d1d
RHSUSF Compat - Fix A-10A 30mm 5:1 DU:HEI mag rearm (#8972) 2022-08-20 16:18:01 -05:00
Filip Maciejewski
a421a63eea
Trenches - Add "placed" and "finished" events (#8998) 
* Add trench placed and finished global events

* Docs
 2022-08-20 15:43:50 -05:00
Ozan Eğitmen
f3c66e83b4
Refuel - Add Progress Bar Duration Setting (#8971) 
* Refuel: Allow changing progress bars' duration

* Clarify Turkish progressDuration_DisplayName

* Update addons/refuel/functions/fnc_moduleRefuelSettings.sqf

* Change progressDuration setting's type to TIME

* Update progressDuration setting display name, add description too

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2022-08-17 13:25:37 +02:00
Björn Dahlgren
a76f8924d8
CI - Use pull request branch pDummies during build (#9003) 2022-08-17 13:01:08 +02:00
Samuel Deutsch
7a64ccb7a5
Refuel - Improved fuel hose texture (#8983) 
* Added custom fuel hose

* Fixed indentation

* Added model config for hose

* Added model config for hose
 2022-08-17 13:00:54 +02:00
Whigital
286537cd54
Fortify - Fix funds being lost when canceling deploy (#8992) 2022-08-17 12:59:07 +02:00
Kam
131b0b9472
Captives - Load into back seats first (#8973) 
Reverses the list of seats for loading captives
 2022-08-16 15:33:15 +01:00
GhostIsSpooky
4943b2119d
CSW - Fix loading with ammo from vehicle cargo (#8995) 
Co-authored-by: GhostIsSpooky <LinkIsParking@hotmail.com>
 2022-08-14 17:09:01 +01:00
Cyruz
b47b8014e7
Fix incorrect mempoint for sound src (#8989) 2022-08-09 09:38:06 -05:00
ACCtomeek
0c90f8a609
Update AUTHORS.txt (#8996) 2022-08-08 17:24:01 +01:00
Whigital
fc17697ef7
Overpressure - Fix backblast originating at projectile (#8985) 
* Overpressure - Fix backblast originating at the projectile

* RHSUSF - Improve backblast for shoulder launchers

* RHSAFRF - Improve backblast for shoulder launchers

* RHSGREF - Improve backblast for shoulder launchers

* RHSSAF - Improve backblast for shoulder launchers

* Overpressure - Simplify projectile offset and cache lookups

* Overpressure - Remove parentheses and use array as hash key

* Overpressure - Rename caching function and move lookup
 2022-08-01 18:32:02 +01:00
Whigital
cd9372a8e1
RHSSAF Compat - Disable vanilla use action on explosives (#8982) 2022-07-30 18:09:02 -05:00
RcINS
904310c99a
Translation - Add Simplified Chinese translation (#8984) 
* Complete Simplified Chinese translation

* Slight tweak translation
 2022-07-30 18:08:44 -05:00
ZluskeN
df3a9de7cd
Advanced Vehicle Damage disabled by default. (#8925) 
Maintainers [...] want Advanced Vehicle Damage disabled by default.
https://github.com/acemod/ACE3/pull/8734#discussion_r787918244
 2022-07-23 19:59:21 +02:00
diwako
83f9c8331d
Interaction Menu - Fix black screen option not removing background properly (#8969) 2022-07-23 10:37:18 -05:00
Psycool
44ccc7b185
Korean Typo Fix (#8968) 
* KoreanTranslation

Someone has returned all the translations in Korean to English. there is no need to return them.

* koreantranslation

* Korean Typo Fix
 2022-07-19 17:09:08 -05:00
JonBons
36442d34cd
Cookoff - Fix smoke effects not getting cleaned up (#8933) 
* Cookoff: Added handling for cleaning up smoke effects when vehicle is deleted mid-cookoff

* Cookoff - Prevent effects cleanup Deleted EH from getting duplicated

* Cookoff - Added locality safety check to effects cleanup

* Cookoff -  Global effects cleanup is now triggered by the server to handle locality transfer
 2022-07-15 15:59:49 +01:00
Cyruz
1a95070b80
Trenches - Add camouflage action using surfaceTexture (#8935) 
* Port 7833 to use surfaceTexture
* Add camo action
* Remove unused args from statement call
* Rogue missing space
* Add animation + delay for camo action
* Add authors
 2022-07-15 15:42:00 +01:00
JonBons
15deea56cb
Cookoff - Removed references to unused ignoreTurret parameter 2022-07-14 21:27:07 +01:00
Dystopian
9569a16efc
Fix rearm of dead vehicles (#8962) 2022-07-10 09:47:47 +01:00
formtapez
1b7755225a
new fences for the wirecutter (#8945) 2022-07-08 20:15:29 -05:00
Psycool
088e5ebb6d
Added Korean Translation for new stuff (#8960) 
* KoreanTranslation

Someone has returned all the translations in Korean to English. there is no need to return them.

* koreantranslation
 2022-07-08 20:15:04 -05:00
PabstMirror
4400d860ac
Kestrel4500 - Cleanup unused onUnload handler (2.10 compatiblity) (#8961) 2022-07-08 22:49:11 +01:00
JonBons
654e4c1b7d
Cookoff - Add ability to disable fire jet effect in configs (#8953) 
* Cookoff: Add ability to disable fire jet effect for vehicles it doesn't make sense on

* Cookoff: Fixed pressure jet sound playing when both jet and ring effects are disabled
 2022-07-01 17:20:31 +01:00
Psycool
57893f311d
KoreanTranslation (#8937) 
Someone has returned all the translations in Korean to English. there is no need to return them.
 2022-06-21 13:35:06 -05:00
Filip Maciejewski
d8af7b34b7
Cookoff - Fix ammo not being removed from turrets with additional FFV (#8928) 2022-06-06 13:50:53 +02:00
ZluskeN
3f7530d89e
Cookoff - Add setting to destroy vehicle after cooking off (#8734) 
* Add setting to destroy vehicle after cooking off

* Update stringtable.xml

* Update stringtable.xml

* Update addons/cookoff/stringtable.xml

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

* Update addons/cookoff/stringtable.xml

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

* Update initSettings.sqf

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
 2022-05-31 15:50:55 +02:00
Krzyciu
cce1700f9c
Translations - Add Missing Polish (#8921) 
* Translations - Add Missing Polish

When merged this pull request will:

- Add missing Polish Translations

* Missing space

* Typo

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* Typo

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2022-05-28 12:30:28 -05:00
Apricot
74e49d1f5a
Translations - Add and Improve Missing Japanese (#8924) 
* Japanese Translation Update

Fill missing Japanese translation and Weird translation fixes made long ago.

* Remove Corner Bracket and change it to apostrophe

* Update STR_ACE_Common_unloadWeapon

* Update SunflowerSeeds Description
 2022-05-27 14:06:51 -05:00
PabstMirror
190cefea69 Prep 3.15.0 Build 67 2022-05-24 09:03:42 -05:00
PabstMirror
aae0155c06 Merge branch 'master' into release-3.14.2 2022-05-24 08:58:44 -05:00
jonpas
cbc766dec0
Documentation - Use title instead of name (#8920) 2022-05-23 11:09:05 +02:00
jonpas
4d783af827
replace chat urls (#8918) 
Co-authored-by: Brett <brett@mayson.io>
 2022-05-22 22:51:49 +02:00
jonpas
df13db5958
Documentation - Fix Viewports versions (#8919) 2022-05-22 22:51:36 +02:00
PabstMirror
89b8ed4b56
Tools - Fix string check false positive on tagging macro (#8917) 2022-05-18 14:36:05 -05:00
PabstMirror
d497e390ab Merge branch 'master' into release-3.14.2 2022-05-18 13:08:29 -05:00
Drofseh
86f08af250
Common - Add keybind and function to unload unit's weapon/muzzle (#8735) 
* add keybind and function to unload unit's weapon/muzzle

- add keybind and function to unload unit's weapon/muzzle
- requires https://github.com/CBATeam/CBA_A3/pull/1527

* change function name

* rename the file too

* Create common-framework.md

* Set REQUIRED_CBA_VERSION to 3.15.7

* Update required CBA version

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

* Apply suggestions from code review

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2022-05-18 13:07:47 -05:00
PabstMirror
99e3715922 Prep 3.14.2 Build 66 2022-05-17 17:33:32 -05:00
LorenLuke
da1c5d3b21
Cookoff - Adds heating effect to cookoff (#8685) 
* Adds heating effect to cookoff 

Makes tanks that cook-off actually heat up on IR.

* Adds cbaEvent 'setTIPars'

* Adds CBAEvent call in cookOff.sqf

* Spaces out line. Adds proper event heading.

* Moves TI event to cookOffEffect.sqf;

* Update addons/cookoff/functions/fnc_cookOffEffect.sqf

Co-authored-by: pterolatypus <pterolatypus@users.noreply.github.com>

* Changes global event for TI pars to local command

* Reverts file to before previous commits in PR.

* Update addons/cookoff/functions/fnc_cookOffEffect.sqf

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* Update addons/cookoff/functions/fnc_cookOffEffect.sqf

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* Update addons/cookoff/XEH_postInit.sqf

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* ti params and add comments to formula

Co-authored-by: pterolatypus <pterolatypus@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
 2022-05-17 12:09:10 -05:00
ace3mod
459e732c6d [Docs] Update component dependencies 
Automatically committed through CI.

[ci skip]
 2022-05-17 18:55:52 +02:00
PabstMirror
a4258f3587
Viewports (#8480) 
* Viewports

* Support mem-points

* Update CfgVehicles.hpp

* Add some docs

* Cleanup Debugging

* Update addons/viewports/dev/debugPoints.sqf

Co-authored-by: Dystopian <sddex@ya.ru>

* Update addons/viewports/dev/debugPoints.sqf

Co-authored-by: Dystopian <sddex@ya.ru>

* Update addons/viewports/functions/fnc_eachFrame.sqf

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* configProperties / 3den macro

* Update viewports-framework.md

* Update viewports-framework.md

* Add compats for rhs btrs

* Update addons/viewports/dev/debugPoints.sqf

Co-authored-by: Drofseh <Drofseh@users.noreply.github.com>

Co-authored-by: Dystopian <sddex@ya.ru>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: Drofseh <Drofseh@users.noreply.github.com>
 2022-05-17 11:55:09 -05:00
pterolatypus
699e286db7
Tagging - Add more tags (#8908) 
* Added more tags and reorganised interaction

* Removed empty lines from stringtable

* Fix macros, use item picture as interaction icon

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

* Use texture as icon, remove colour from names

* Tagging - Compile actions when added

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2022-05-17 11:54:47 -05:00
pterolatypus
bf8aa1ab7f
Medical Damage - Improve falling and collision damage (#8861) 
* Adjust wound params for falling

* Tweaked thresholds for collision

* Tweaked collision and added custom handling

* medical_damage - cleanup woundHandler naming (#8824)

* medical_damage - cleanup woundHandler naming

* woundsHandlerBase

(cherry picked from commit bdeb347ea9)

* Tweaked thresholds a bit more

* Removed collision handler

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2022-05-17 11:54:05 -05:00
PabstMirror
fa45e8b7cb
Cargo - Limit text length (#8915) 2022-05-17 02:37:26 -05:00
PabstMirror
0df5320879
FieldRations - fix string (#8916) 2022-05-17 00:57:24 -05:00