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
13,348 Commits 73 Branches 88 Tags 752 MiB
40a66f0bde
Commit Graph

13348 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PabstMirror
40a66f0bde
Add some editor previews (#7254) 2019-10-29 17:10:40 -05:00
PabstMirror
0e485ce5fc
Arsenal - Fix script error for weapons with 3+ muzzles (#7256) 2019-10-29 17:10:03 -05:00
PabstMirror
691e8d24c6
Repair - fix string (#7251) 2019-10-28 19:18:26 -05:00
mharis001
e78016d7f7
Repair - Add settings to control item requirements for different actions (#7243) 2019-10-24 22:52:04 -04:00
PabstMirror
f9d181c72e
Medical - Fix addDamageToUnit (#7247) 2019-10-20 16:48:26 -05:00
PabstMirror
c37783de0b
Medical - Change WoundReopening default setting (#7246) 2019-10-20 16:46:30 -05:00
PabstMirror
da5e9525b4
Medical - Make some constants variables (#7236) 
* Medical - Make some constants variables

* Add comments about varNames, calc k/l at runtime
 2019-10-20 11:14:31 -05:00
commy2
2a6d555091
Merge pull request #6955 from acemod/cbaDisposable 
Disposable - switch NLAW to CBA disposable system and remove ace_disposable functionality
 2019-10-17 20:57:14 +02:00
PabstMirror
e76aeba45f
Apply suggestions from code review 
Co-Authored-By: jonpas <jonpas33@gmail.com>
 2019-10-17 13:28:05 -05:00
PabstMirror
37284bd0e8 Update docs 2019-10-17 13:17:37 -05:00
PabstMirror
bccf170573 Merge branch 'master' into cbaDisposable 2019-10-17 13:01:07 -05:00
Dedmen Miller
3946928cbe Refuel - Add events for start, stop and progress (#7023) 
* Add refuelTick Event

* Add refuelStarted event

* Add refuelStopped event

* Add event documentation

* Rename events

Fix EOF

* Rename one more event
 2019-10-13 13:08:35 -05:00
mharis001
2e5cdbd62c Explosives - Add ace_isEOD 3DEN attribute (#7080) 
* Add ace_isEOD 3DEN attribute

* Apply suggestions from code review

Co-Authored-By: commy2 <commy-2@gmx.de>
 2019-10-13 12:22:46 -05:00
PabstMirror
342e881fda
Debug to clipboard - Cleanup settings dump (#7240) 2019-10-13 12:21:55 -05:00
PabstMirror
9ac543aacc
Medical - Rename private version of setUnconscious (#7237) 2019-10-12 09:47:57 -05:00
BaerMitUmlaut
8c7f8d7d6a Medical Feedback - effects overhaul (#7215) 
* Intensify pain effects

* Add chromatic abberation effect, add blur with very high pain

* Add option for limited pain effects with only high pain blur

* Fix playInjuredSound

* Add instant feedback effects update when getting hit

* Cleanup

* Overhaul playInjuredSound

* Fix voice detection, simplify nearby unit filter

* Apply suggestions from code review

* Add Chromatic Aberration translations

* Use while loop instead of configClasses

* detach say3d dummies before deleting
 2019-10-11 15:00:53 -05:00
BaerMitUmlaut
bb0461be16 Fast medical item replacement (#7224) 
* Add item replacement framework

* Correctance of English

Co-Authored-By: Dedmen Miller <dedmen@users.noreply.github.com>

* Remove unecessary code

* Use new item replacement framework for medical items

* minor fixes, support GVAR(convertItems) setting

* use forEach, convert atropine to epi

* replace with adenosine
 2019-10-11 15:00:25 -05:00
TWC-Rik
6ca4b2075d Nametags - Add Nation Ranks (#7094) 
* Adds icon and postInit

Adds German, British, Spanish, French ranks. Also adds postInit code
that loops through all factions and checks if ranks have been set there
in there for easy, permanent customistability.

* Removed white space

* commy2's postInit rewrite

Changes faction config entry to array with macros and changes the
postInit code to commy2's improved version.

* Update addons/nametags/CfgFactionClasses.hpp

Co-Authored-By: Dedmen Miller <dedmen@users.noreply.github.com>

* Adjusted arrays to be multi line

Also removed white space.

* Update addons/nametags/XEH_postInit.sqf

Co-Authored-By: commy2 <commy-2@gmx.de>

* Update addons/nametags/CfgFactionClasses.hpp

Co-Authored-By: commy2 <commy-2@gmx.de>

* Add getVar setting, don't overwrite if already set
 2019-10-08 23:20:26 -05:00
PabstMirror
2f3d8db134
Medical - Report non-default settings to rpt (#7233) 
* Medical - Report non-default settings to rpt

* Update reportSettings.sqf
 2019-10-08 12:03:05 -05:00
PabstMirror
4eeac9f649
Medical - Death from sum of trauma (#7195) 
* Medical - Death from sum of trauma

* fixes

* Update fnc_determineIfFatal.sqf
 2019-10-08 10:45:09 -05:00
PabstMirror
a71879ccea
Medical - Increase severity of falling damage and Improve non-selectionSpecific wounds (#7214) 
* Medical - Increase severity of falling damage

* Improve non-selectionSpecific wounds

* Use macros for hitpoint indexes
 2019-10-08 10:44:49 -05:00
Daniel Lee
f4dbe5229e Medical - Option for treatment to require holstering/lowering weapon. (#7063) 
* Option for medical treatment to require holstering/lowering weapon, with an option for examine category items to still be available.

* Vehicles cause holster settings to be ignored.

Unsure whether to expand this into it's own setting (disallow all medical in vehicles? only allow if both medic and patient are in the same vehicle? what about people in the back of transports healing those in the cab?), but just going to leave it as is for now.

* Replace !isEqualTo with != in for performance reasons.

Resolves line 33 PR review.

* Merge settings, short circuit

* move logic to new file
 2019-10-08 10:44:36 -05:00
Broström.A | Evul
b514541bec Safemode - add public setWeaponSafety function (#7092) 
* Create fn_safeWeapon.sqf

* Update XEH_PREP.hpp

* Adjustments to script to meet demands 

not tested

* adjustment according to review

* minor adjustments

* Update fn_safeWeapon.sqf

* Rename and adjustments

* Adjustments

* Fixed typo

Co-Authored-By: commy2 <commy-2@gmx.de>

* Update addons/safemode/functions/fn_setWeaponSafety.sqf

Co-Authored-By: commy2 <commy-2@gmx.de>

* Update addons/safemode/functions/fn_setWeaponSafety.sqf

Co-Authored-By: commy2 <commy-2@gmx.de>

* Fixed missing param in exsample

* Test fixes

* Update addons/safemode/functions/fnc_setWeaponSafety.sqf

Co-Authored-By: Filip Maciejewski <veteran29@users.noreply.github.com>
 2019-10-07 20:19:04 -05:00
pterolatypus
06a0f30a05 Removed a redundant conflict-check in fnc_lockSafety (#7189) 2019-10-07 20:07:14 -05:00
mharis001
13ffc07f27 Common - Optimize arithmeticGetResult function (#7232) 
* Optimize arithmeticGetResult

* Add element to default array, safer function

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
 2019-10-07 19:41:46 -05:00
Björn Dahlgren
c1f3e8256b Dragon - Remove Shadow Buffer (ShadowVolume 1000+) lods (#7219) 2019-10-06 19:13:12 +02:00
PabstMirror
99db6802bb
Inventory - Adjust for changes to medical (#7112) 
* Inventory - Adjust for changes to medical

* Add medical replacement items

* adjust for change to medical-replacementItems
 2019-10-06 11:10:56 -05:00
Laid3acK
ce0ccb2d1e Realistic names - Contact DLC rifles added (#7155) 
* contact_dlc_rifles_added

* contact_dlc_rifles_added

* contact_dlc_rifles_added

* contact_dlc_rifles_added

* contact_dlc_rifles_added

* contact_dlc_weapons_added

* contact_dlc_weapons_added
 2019-10-06 11:09:38 -05:00
jonpas
faf6cfe57d
Add Documentation CI Workflow (dependencies, translations) (#7208) 
* Cleanup Circle CI configuration
 2019-10-05 22:56:41 +02:00
jonpas
5a5d4758a0
Add Arma CI Workflow (validate, lint, build) (#7207) 
* No sqflint failures for now due to false-positives
* Upload artifact of armake build
* Cleanup Circle CI configuration
* Add BOM check
* Cleanup BOM
 2019-10-05 22:53:16 +02:00
jonpas
cec15a6f1a
Add Extensions CI Workflow (Windows) (#7206) 
* Support 5-level deep folders (no support for double-star globs yet)
 2019-10-05 22:52:19 +02:00
BaerMitUmlaut
5bdbb5c398 Speed up carry animation (#7216) 2019-10-05 22:32:38 +02:00
PabstMirror
b236cf9a65
Medical - Fix addDamageToUnit (#7228) 2019-10-05 15:31:40 -05:00
mharis001
de39ad4c21 Medical - Add descriptions for limping and fracture settings (#7199) 2019-10-05 22:27:45 +02:00
mharis001
9474250975 Change medical item masses to be same as old medical (#7200) 2019-10-05 22:25:38 +02:00
Josuan Albin
aec7a78a58 Remove Atropine (#7212) 
* Change items to scope 1 to keep mission backwards compatibility
 2019-10-05 22:25:29 +02:00
Dedmen Miller
07be4bd9da Don't force Camera position in Arsenal Loadouts list (#7209) 2019-10-04 19:57:06 -05:00
Dedmen Miller
d1b840fc2d Log checkPBO errors to server log (#7210) 2019-10-04 19:56:25 -05:00
Dedmen Miller
8cc27338a6 Add missing German translation for chemlights (#7211) 2019-10-04 19:50:39 -05:00
mharis001
4cbc83687c Fix undefined variable in reload checkAmmo function (#7223) 2019-10-04 19:13:14 -05:00
Björn Dahlgren
81badb5853 Update RHS USF static weapon carry icons (#7221) 2019-10-04 19:02:11 -05:00
Björn Dahlgren
9b124cf4a2 Update RHS AFRF static weapon carry icons (#7220) 2019-10-04 19:01:59 -05:00
Björn Dahlgren
1128ff0f3f Remove duplicate class declaration from laserpointer (#7218) 
Regression from #7217
 2019-10-02 23:28:00 +02:00
commy2
e8b104fe61
Merge pull request #7217 from dedmen/laserpVanJoiRa 
Laserpointer - Add vanilla Joint Rails
 2019-10-02 11:07:04 +02:00
Dedmen Miller
af88d2980d Laserpointer - Add vanilla Joint Rails 2019-10-02 10:54:24 +02:00
Björn Dahlgren
8dd9f36ff9 Wrong texture path for ace_csw_tripod_m122.p3d, csw -> apl (#7201) 2019-09-29 19:51:00 +02:00
Björn Dahlgren
6899d8a860 Invalid lod properties with trailing space in ace_cws_tripod_spg9.p3d (#7202) 2019-09-29 19:50:53 +02:00
PabstMirror
a53a2725e9
Remove unused medical DLLs (#7198) 
* Remove unused medical dlls

* x
 2019-09-28 17:09:20 -05:00
mharis001
8b8ec19828 Localize partial wound, fix injury list color flashing (#7196) 2019-09-28 16:25:39 -05:00
mharis001
35a4ffbad6 Expand advanced diagnose setting tooltip (#7197) 2019-09-28 16:25:29 -05:00