Commit Graph

13492 Commits

Author SHA1 Message Date
ace3mod
3d64b87a13 [Docs] Update component dependencies
Automatically committed through CI.

[ci skip]
2019-12-17 17:16:11 +01:00
ace3mod
7a8489f35e [Docs] Update component dependencies
Automatically committed through CI.

[ci skip]
2019-12-17 17:15:41 +01:00
brainslush
3af779c631 Add documentation for prevent auto shut-off (#6919) 2019-12-17 17:15:17 +01:00
PabstMirror
8e3fd45500
Artillery rangletables (universal) (#6853)
* Initial

* Update artillerytables.cpp

* Pass by value, remove c17 features

* Tweak accuracy

* SQF work

- improve compat with a3 mlrs with remote cam (animationSourcePhase)
- handle non [0] turrets (rhs prp)
- add config entries
- use vectorCos to fix fp error (thanks commy)

* Support per mag air friction

* tweak friction

* Integrate with mk6

* more acos fixes

* Handle invalid memPointGunOptic (CUP_BM21_Base)

* Cleanup

* cleanup/tweaks

* Update checkConfigs.sqf

* Finish cleanup of ace_mk6mortar

* Update stringtable.xml

* fix bwc for ACE_RangeTable_82mm

* Update fnc_rangeTableCanUse.sqf

* build 32dll, fix some headers

* strncpy and move testing to seperate file

* Move to sub-category

* Update for ACE_Extensions changes and add warning to ace_common

* Update stringtable.xml

* Update addons/common/functions/fnc_checkFiles.sqf

Co-Authored-By: jonpas <jonpas33@gmail.com>

* Update stringtable.xml

* Update stringtable.xml

* test extension.yml update logical operator

* Revert "test extension.yml update logical operator"

This reverts commit b1871724ad.

* more guess and test
2019-12-17 10:14:45 -06:00
Drofseh
240c7333e3 Ballistics - Add shotgun shell projectile magazine variety (#7119)
* Add multiple projectile types for shotguns

* remove extra blank line

* fix classname whitepace issue

* reduce trigger time

* Verbose names and No4 Bird

- Change classnames and string keys to be more verbose
- Change No7 Birdshot to No4 Birdshot
While No7 is one of the most common loads for target shooting and hunting small birds the extreme number of pellets is just too hard on FPS.
No4 is not typically used in target shooting, but it is a common load for hunting various birds so I think it's realistic to have it for civlian purposes and the number of pellets is substatially less so the FPS hit isn't so bad.
If someone else could test the No4 to see how it feels to them I'd appreciate it.

* add/change penetration

* fix indentation
2019-12-17 10:10:31 -06:00
PabstMirror
60a901bf10
Grenades - Add CTS 7290 9-bang flashbang (#6856)
* Add CTS 7290 9-bang flashbang grenade

* Add ui icon

* Add proper 9bang configuration

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

* Move banana and replace with text

* Rotate 20deg

* Fix stringtable

* Fix peen

* Remove rust

* Less rusty dirt

* Translation

* Add ShadowLod to thrown variant

* Update addons/grenades/CfgAmmo.hpp

Co-Authored-By: Oliver Blanthorn <oliver.blanthorn@manchester.ac.uk>

* Update texture (make sure to squash&merge)

* Ermordung der tab

* tabs2

* tabs3
2019-12-17 10:02:33 -06:00
PabstMirror
1fb989d332
Medical Engine - Increase lethality of aircraft explosions (#7304)
* Medical Engine - Increase lethality of aircraft explosions

* Update addons/medical_engine/XEH_postInit.sqf

Co-Authored-By: jonpas <jonpas33@gmail.com>
2019-12-17 10:01:17 -06:00
mharis001
b874a1f618 Medical Treatment - Fix bodyCleanupLoop typo (#7308) 2019-12-17 09:50:59 -06:00
PabstMirror
0ce8318e18
tabs3 2019-12-16 20:42:31 -06:00
PabstMirror
a348a5f5f5
tabs2 2019-12-16 20:41:51 -06:00
PabstMirror
e506827b04
Ermordung der tab 2019-12-16 20:40:38 -06:00
ace3mod
f87abd13eb [Docs] Update component dependencies
Automatically committed through CI.

[ci skip]
2019-12-17 03:03:02 +01:00
Brandon Danyluk
316fbfe7b9 Implement Metis SACLOS guidance (#6997)
* abc

* Revert "abc"

This reverts commit bcb4214bd9.

* Update to current commit

* Begin transfer of SACLOS into Missile Guidance

* Allow seeker and attack profiles to have their own "OnFired" functions

* Fix bugs with SACLOS

* Implement Metis wire guidance. Add "Beam" guidance

* add missing parenthesis

* Update how Wire/Beam guidance works. Add compatability for SACLOS planes. Move all base missile changes out of missileguidance and into their own files.

* try to cleanup merge

* minor stuff
2019-12-16 20:01:30 -06:00
Dystopian
392a0770b3 Add destroyed boat ejecting (#6330)
* Add destroyed boat ejecting

* Delete EH global cleanup

* Add check explosiveness

* Optimize EH

* Move EH to function, remove config values

* Move code to cookoff

* Use macro for explosiveness

* Fix include
2019-12-16 16:29:33 -06:00
LachlanSneddon
e8fcbcdf4b Medical AI - Improve Healing Logic (#7255)
* Improve AI healing logic

* Update addons/medical_ai/functions/fnc_healingLogic.sqf

Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>

* Update addons/medical_ai/functions/fnc_healingLogic.sqf

Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>

* Update addons/medical_ai/functions/fnc_healingLogic.sqf

Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>

* Added event for CPR chance being 0

* Update addons/medical_ai/functions/fnc_healingLogic.sqf

Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>

* Update addons/medical_ai/functions/fnc_healingLogic.sqf

Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>

* Update addons/medical_ai/functions/fnc_healingLogic.sqf

Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>

* Update addons/medical_ai/functions/fnc_healingLogic.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Update fnc_healingLogic.sqf

Co-Authored-By: commy2 <commy2@users.noreply.github.com>
2019-12-14 12:04:09 -06:00
dfr1238
d073bb5afe Update tchinese translate (#7303)
* Update TChinese Translate

* Update Tchinese Translate

add new 2 weather string
2019-12-14 10:26:38 -06:00
PabstMirror
20c7257ee1
Weather - Minor fix (#7302) 2019-12-13 13:02:37 -06:00
LorenLuke
846b65864f Weather - Add a 'check air temperature' action (#6154) 2019-12-12 22:31:51 +01:00
PabstMirror
9b8cfc27af
Medical Treatment - Reset canTreatCached on treatment (#7253)
* Medical Treatment - Reset canTreatCached on treatment

* Reset conditionCaches of nearby units

* CAManBase
2019-12-12 10:25:21 -06:00
mharis001
d25047c7c1 Clean up ace_main requiredAddons (#7301) 2019-12-12 10:24:51 -06:00
jonpas
64dbc10b09
Round stringtable completion to 2 decimals (#7300) 2019-12-11 23:35:11 +01:00
mharis001
2bad2fac68 Improve dragging getWeight function (#7261) 2019-12-11 11:53:34 -06:00
BaerMitUmlaut
01787312cc Nightvision - Enable setting NVG effects scale mid-mission (#6627)
* Enable setting NVG effects scale mid-mission

* Add fired EHs only when nvg is active
2019-12-11 10:38:43 -06:00
dfr1238
80879da241 Update TChinese Translate (#7296) 2019-12-08 10:35:30 -06:00
Brett
8b4e8a61ac Split interaction menu settings between interaction and self interaction (#6609)
* Split interaction menu settings between interaction and self interaction

* consistent spacing
not sure which way is wanted here, but I might as well be consistent in 
my own PR

* remove useless code, fix use of backgroundMenu

* clean up from Dystopian

* use existing stringtable

* remove redundent localize

* Use LLSTRING, split UseListMenu

* style fixes

* style fixes

* add movedToSQF to old settings

* condense ifs

* Don't use cursorKeepCentered as default
2019-12-07 19:44:04 -06:00
Wakbub
79e3de623f Use STRING macros (#6576) 2019-12-07 22:40:44 +01:00
Blutze
30b4f3edf0 Advanced Fatigue - Solid stamina bar option (#6911)
* Translation Entries (EN+DE)

* Add setting

* Obey setting in handler

* Add setting to movedToSQF list

* Replace elegant else-if with clunky SQF

* Revert adding solidStaminaBar to movedToSqf list

* Remove unnecessary fade applications

* Invert solid/fade setting for better translation

* Change translations to "fade"

* Invert fade/solid logic

* Dont unfade when disabled overall

* Dont unfade with AF disabled; fix old bug
2019-12-07 15:23:04 -06:00
Filip Maciejewski
f336b6ce62 Add goggle overlay support for Contact update Blindfolds (#7157) 2019-12-07 22:21:51 +01:00
PabstMirror
29a0732b0c
Common - Network safe claim (#7258)
* Common - Network safe claim

* Update fnc_claimSafeServer.sqf
2019-12-07 15:18:50 -06:00
Baráth Péter
fa60704cd0 Hungarian translations (#7234) 2019-12-07 22:13:51 +01:00
pterolatypus
b3c5a72dae Cargo - setSpace checks for existing cargo (#7133) 2019-12-07 22:10:03 +01:00
PabstMirror
bcbffcff26
Interact Menu - Don't show interactions for virtual units (#7271)
* Interact Menu - Don't show interactions for virtual units

* be consistant
2019-12-07 14:58:44 -06:00
Josuan Albin
5ae0ef6bbe Replace remaining lineIntersects with lineIntersectsSurfaces (#6898)
* Fix explosive placement while underwater

* Apply suggestions from code review

Co-Authored-By: alganthe <alganthe@live.fr>

* Change placeApprove header to reflect changes

* Replace lineIntersectsWith in isInMedicalFacility

* Replace linesIntersects in isInRepairFacility, fix params

Public func, params should have an expected type.

* Replace linesIntersects in spallTrack

* Replace lineIntersects in getFirstObjectIntersection and findReflection

* Replace lineIntersects in advanced throwing

grenades can pass glass underwater now, I bet all of 0 person will be glad that horrendous bug is now fixed.

* Fix possible issue in pointing while underwater

* Fix possible issue while underwater in attach

* Replace count with isEqualTo in lineIntersectsSurfaces replacements

* Fix inverted conditions

* Fix drawArc

* Fix fnc_attach

* Reverse advanced_throwing and spallTrack lineIntersects changes

* Fix issues raised from code review
2019-12-07 14:58:21 -06:00
Elgin675
ec27cee1ac French translation Update / Added (#7213)
* French MicroDAGR Translation Update

* French Missile Guidance Translation Update

* French missionmodules Translation Update

* French mk6mortar Translation Update

* French MicroDAGR Translation Update

* French Missile Guidance Translation Update

* French missionmodules Translation Update

* French mk6mortar Translation Update

* French Advanced Ballistics Translation Update

* French Advanced Fatigue Translation Update

* French Ai Translation Update

* French Arsenal Translation Update

* French Ballistics Translation Update

* French Captives Translation  Update

* French Cargo Translation Update

* French Common Translation Update

* French Cookoff Translation Update

* French CSW Translation Update

* French Dagr Translation Update

* French Dogtags Translation Update

* French Dragging Translation Update

* French Dragon Translation Update

* French Explosives Translation Update

* French Explosives Translation Update - update

* French Fastroping Translation Update

* French FCS and Finger Translation Update

* French MicroDAGR Translation Update

* French Missile Guidance Translation Update

* French missionmodules Translation Update

* French mk6mortar Translation Update

* French Advanced Ballistics Translation Update

* French Advanced Fatigue Translation Update

* French Ai Translation Update

* French Arsenal Translation Update

* French Ballistics Translation Update

* French Captives Translation  Update

* French Cargo Translation Update

* French Common Translation Update

* French Cookoff Translation Update

* French MicroDAGR Translation Update

* French CSW Translation Update

* French Dagr Translation Update

* French Dogtags Translation Update

* French Dragging Translation Update

* French Dragon Translation Update

* French Explosives Translation Update

* French Explosives Translation Update - update

* French Fastroping Translation Update

* French FCS and Finger Translation Update

* Update French Explosives Translation Update

* Update addons/advanced_ballistics/stringtable.xml

Co-Authored-By: Vdauphin <vdauphin@outlook.fr>

* Update addons/advanced_fatigue/stringtable.xml

Co-Authored-By: Vdauphin <vdauphin@outlook.fr>

* Update addons/cargo/stringtable.xml

Co-Authored-By: Vdauphin <vdauphin@outlook.fr>

* Update addons/arsenal/stringtable.xml

Co-Authored-By: Vdauphin <vdauphin@outlook.fr>

* Update addons/advanced_fatigue/stringtable.xml

Co-Authored-By: Vdauphin <vdauphin@outlook.fr>

* Update frag/gestures/goggles/grenades/gunbag french translation

* Update hearing french translation

* Added French update translation and / or correction for :

- Frag Module
- Gestures Module
- Goggles Module
- Grenades Module
- Gunbag Module
- Hearing Module
- Hellfire Module
- Hitreactions Module
- Hot Module
- Interact_Menu Module
- Interaction Module
- Inventory Module
- Laser Module
- Laserpointer Module
- Magazinerepack Module
- Map Module
- Map_gesture Module
- Maptools Module
- Markers Module
- Maverick Module

* Added French update translation and / or correction for :

- Interaction Module
- Medical Module
- Medical_damage Module
- Medical_feedback Module
- Medical_gui Module
- Medical_statemachine Module
- Medical_treatment Module
- Microdagr Module

* Added French update translation and / or correction for :

- Missileguidance Module
- Missionmodules Module
- Nametags Module
- Nightvision Module
- Nlaw Module
- Noradio Module
- Optionsmenu Module

* Added French update translation and / or correction for :

- Overheating Module
- Overpressure Module
- Parachute Module
- Pylons Module
- Quickmount Module
- Rangecard Module
- Realisticnames Module
- Rearm Module
- Refuel Module
- Reload Module

* Adding French translation and correction for the Repair Module

* Correction typo mineure

* Adding French translation and / or correction for :

- Respawn Module
- Safemode Module
- Sandbag Module
- Scopes Module

* Minor corrections of the French translation for the ACE arsenal

* Minor corrections of the French translation for the Medical_treatment Module

* Correction de quelques anomalies dans les options ACE pour Eden.

Remplacement de la mention "Est infirmier" par "Qualification médicale", dans les options ACE de l'éditeur de mission.
En effet, il n'y a pas (plus ?) de case à cocher, mais un menu "direct", avec les choix "Par défaut/Aucune/Infirmier/Médecin.
Cela est donc bien plus approprié ;).

De même pour la mention "Est ingénieur", remplacée par "Qualification technique", là aussi bien plus appropriée.

Il a également fallu que je remplace la valeur "Ingénieur avancé" par "Ing. avancé" (Adv. Engineer en anglais), pour des raisons de place : la dénomination complète déborderait de la case / serait tronquée.

* Added French translation and / or correction for :

- Slideshow Module,
- Spectator Module,
- Spottingscope Module,
- Swichunits Module,

Minor correction on Nametags Module

* Correction ponctuation

* Added French translation and / or correction for :

- Tacticalladder Module,
- Tagging Module,
- Trenches Module,
- Tripod Module.

* Added French translation and / or correction for :

- UI Module,
- Vehiclelock Module,
- Vehicles Module.

Minor correction on Tacticalladder Module

* Added French update translation and / or correction for Viewdistance Module
2019-12-07 13:48:47 -06:00
mharis001
738bca5d64 Stringtable validator improvements (#7294) 2019-12-07 13:47:21 -06:00
Dedmen Miller
3333b41dfb Remove unused VRTraining class from Arsenal config (#7276) 2019-12-04 14:12:42 -06:00
Josuan Albin
b8fcd92536 Fix default loadout public func not checking base items (#7280) 2019-12-04 14:12:00 -06:00
commy2
28bf9b6452
Merge pull request #7293 from dfr1238/master
Update tchinese translate
2019-12-04 19:13:36 +01:00
dfr1238
8b526906cd
Update tchinese translate 2019-12-04 23:13:13 +08:00
dfr1238
46cae20da5
Update tchinese translate 2019-12-04 23:11:53 +08:00
dfr1238
2d123f9fbb
Merge pull request #3 from acemod/master
PR from original
2019-12-04 23:11:00 +08:00
jonpas
5644666daf
Adapt to HEMTT (CI) (#6900)
* Remove old armake tools
* Add HEMTT config
* Use HEMTT in GitHub Actions
2019-12-04 01:20:37 +01:00
PabstMirror
e62dbdc04d
Move readme to doc folder and use versioning system (#7289)
* Move readme to doc and use versioning system

* update build tools
2019-12-03 13:12:18 -06:00
commy2
76f0d76b83
Merge pull request #7277 from acemod/maglite
Add handheld maglite ML300L flashlight, clean up flashlight addon
2019-12-03 19:13:00 +01:00
bux
584d311dde add blender animation file 2019-12-03 15:32:27 +01:00
commy2
cc05fed067
Merge pull request #7291 from veteran29/patch-3
Polish translation for Maglite ML300L
2019-12-03 15:19:56 +01:00
Filip Maciejewski
9bbbdf71aa
Polish translation for Maglite ML300L 2019-12-03 12:56:38 +01:00
commy2
6febaf33df fix recoil, remove magic reticle 2019-12-03 06:51:02 +01:00
bux
123095697c adjust light strength 2019-12-02 14:21:01 +01:00
bux
8133a539ef vastly reduced complexity of shadow meshes, fix warning with shadow lod 2019-12-02 13:55:44 +01:00