Commit Graph

12502 Commits

Author SHA1 Message Date
chaot3ch
5f4dd9de5e Fixed Typo from change to chance (#6789)
Change to change change into chance
2019-01-24 20:20:49 +01:00
PiZZAD0X
13193d3e6d Dragging - Additional weight override parameter for setCarryable/setDraggable (#6780)
* Added weight override parameter to ace_dragging_fnc_setCarryable/setDraggable

- Additional optional parameter that ignores the `startCarry`/`startDrag` weight checks.
- Minor `==` to `isEqualto` replacements

* `count crew _target isEqualto -1` to `count crew _target isEqualto 0`

* Tab Replacement

- remove \t

* Reverted UAV check, Params formatting, Lazy Eval

* Update addons/dragging/functions/fnc_startCarry.sqf

Co-Authored-By: PiZZAD0X <509thparachuteinfantry@gmail.com>

* Update fnc_startDrag.sqf

* Remove beta suggestion extra line additions

* Update addons/dragging/functions/fnc_startDrag.sqf

Co-Authored-By: PiZZAD0X <509thparachuteinfantry@gmail.com>
2019-01-20 10:23:24 -06:00
mharis001
c4655148e0 Add apex goggles entries (#6778) 2019-01-16 09:40:46 -06:00
madpat3
f6c4ec5f09 Wirecutters - Add compatibility with more fences from CUP (#6777)
and another one
2019-01-15 20:16:12 -06:00
PabstMirror
2f3fd06fcf
Medical - Fix stringtable (#6774) 2019-01-14 11:41:29 -06:00
pokertour
4a5b5113cd FastRoping - Add rope items which deploy at lengths (#6498)
* Update stringtable.xml

* Update config.cpp

* New CFGWeapon

* Update CfgVehicles.hpp

* Update fnc_deployRopes.sqf

* Update CfgVehicles.hpp

* Update CfgWeapons.hpp

* Update CfgVehicles.hpp

cheapest check before others

* Update fnc_deployRopes.sqf

Corrected the double remove.

* Cleanup PR

Add setting, move rope len to config, simplify strings, add rope image, fix rope unwind length

* Add setting name to stringtable

* Update stringtable.xml

French translation for settings
2019-01-11 21:05:25 -06:00
PabstMirror
188aabe699
Medical - Add new setting to hide self-interaction actions (#6756)
* Medical - Hide self interaction menu if disabled

* Add new setting
2019-01-11 20:58:13 -06:00
PabstMirror
59aa38185a
Dragging - Fix player getting locked with isCarrying (#6770) 2019-01-07 09:45:48 -06:00
NeilZar
b181fa6013 Fix # command in sqf_validator.py (#6768)
**When merged this pull request will:**
- Fix the sqf validator to correctly detect the use of # as select or preprocessor command.
2019-01-05 03:10:40 +01:00
Jo David
73386c5391
remove the only entry of "Original" and replace it by "English" (#6766) 2019-01-04 08:42:46 +01:00
Cyruz143
a18f4180ac Medical - Adding option to convert vanilla medical gear (#6680)
* Adding option to convert vanilla medical gear

* Better wording on setting description

* Shortern var names

* Shorter settings title

* 3 options (enabled, just remove, disabled)
2019-01-03 14:26:22 -06:00
McDiod
fcfe278f7f markers - add setting allowing only marker creator to move (#6734)
* markers - add setting allowing only marker creator to move

* shorten setting display names

* delete some whitespace, superfluous command

* single arg needs no array

* delete some whitespace

* don't save directPlayID default value

* Save array of user placed markers
2019-01-03 13:31:21 -06:00
PabstMirror
f57d5ac180
Medical - Skip distance check if in same vehicle (#6757)
* Medical - Skip distance check if in same vehicle

* Update addons/medical/functions/fnc_displayPatientInformation.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-01-02 09:56:26 -06:00
PabstMirror
da0ab4617a
WeaponSelect - Fix putWeaponAway animation (#6758) 2019-01-02 09:56:07 -06:00
PabstMirror
f4f67e262d
Medical - Add vehicle hint when loading unconc (#6759) 2019-01-02 09:55:25 -06:00
PabstMirror
6d8cdd9b1d
Interaction - Disable open door action on houses with no user actions (#6760)
Fix #6544
2019-01-02 09:55:03 -06:00
Thomas Kooi
0bb339bf51
run npm audit fix for docs (#6755)
* run npm audit fix

* fix docker set up not running due to invalid volume spec in base image
2019-01-02 00:05:28 +01:00
Josuan Albin
62710f27c2
Merge pull request #6754 from acemod/arseMacrros
Arsenal - Adjust macros for newest pboProject
2019-01-01 19:19:34 +01:00
PabstMirror
e32bcb1f9a Arsenal - Adjust macros for newest pboProject 2019-01-01 12:04:43 -06:00
NeilZar
9eb7d0d75d Change PBO check error messages (#6751)
**When merged this pull request will:**
- Change the error messages for PBO version checking

They were a bit confusing. `Missing server addon(s)` was most of the time interpreted as `You're missing server addon(s)`.
2018-12-30 05:11:19 +01:00
Jo David
4ba5a3954e Remove Redundancy in flashbangExplosionEh (#6749) 2018-12-29 11:29:29 -06:00
madpat3
0fe6a92bf5 Wirecutters - Add compatibility with more fences from CUP (#6750)
another one ;)
2018-12-29 14:29:11 +01:00
Jo David
cf1910eb79
Changed: Remove ear ringing from flashbang explosions when wearing protective gear (e.g. ComTacs) (#6746)
* Remove ear ringing from flashbangs when wearing protective gear, reduce strength by damageCoefficent
2018-12-28 14:46:13 +01:00
Jo David
cd09c2b3de
Fix Docker again (#6742) 2018-12-20 11:10:05 +01:00
alef
de83f2c2b7 Italian translation updates (#6738)
* 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

* Italian translation update

Remove BOM. Colors uppercase for consistency.

Revert "Remove BOM. Colors uppercase for consistency."

This reverts commit 0fa9c35f9e46437438a384cee37cb8d3e5322433.

Revert "Italian translation update"

This reverts commit d53e56ce70a606e773aa6fe2a53485aeb5419974.

Re-add Italy

* fix polish
2018-12-17 12:10:06 -06:00
PabstMirror
dd94666c63
Disposable - Ignore secondary muzzles (#6737)
Don't wipe weapon when firing spotting rifle muzzle
Close #6736
2018-12-16 13:23:14 -06:00
Dystopian
31fa8cbdd4 Fix remote control menu (#6733) 2018-12-15 15:29:18 -06:00
Dystopian
cea5b8c6f2 Fix zeus creating after 1.86 (#6726) 2018-12-15 15:28:32 -06:00
Jakub Ochalski
91182482db Polish Translation (#6730)
Did the missing parts of the Polish translation.
2018-12-11 16:50:36 -06:00
ace3mod
249598df0e [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2018-12-07 03:29:42 +01:00
ace3mod
fd45b194b4 [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2018-12-07 03:28:53 +01:00
PabstMirror
f81f5830c5
Illumination Flares (#4506)
* Illumination Flares

* add M992 IR flare

* update debug script

* comments
2018-12-06 20:28:13 -06:00
Brandon Danyluk
1511ecc1c0 SACLOS and HOT Missiles (#6708)
* abc

* Revert "abc"

This reverts commit bcb4214bd9.

* Update to current commit

* Added HOT1 Missile and SACLOS/Wire guidance

* Added all HOT variants. Added polish to code

* Fixed bug with pylons

* Changed how seeker angle is calculated. When the wire snaps the missile goes haywire. Fixed bug where HOT2/3 missiles weren't getting missile guidance

* Replaced Wiesel FireFIST launcher with  HOT Launcher

* Remove debug defines

* Tweak thrust

* Fix formatting issues. Added true randomness. Added ACE prefixes. Added string table. Tweaked missile dynamics

* Fix bug where attack profile correction was wrong due to magnitude always being 50. Add stringtable values for relevant strings. Added reload time to Wiesel ATGM. Added "onFired" to initialize values

* Moved wire-snapping logic to attack profile

* Missile flight dynamics tweaked

* Add a crosshair offset. The missile sits in this offset relative to the crosshair

* Add LOS checks. Fix bug where wire-cutting didnt work.

* Tweak explosive range for a kill radius of ~20m. Add fragmentation

* Add AI Flags

* Person in control of missile may not be the shooter

* Fix RPT spam on missile out of LOS. Tweak missile dynamics. Add wire break sound cue

* Fix bug where missile didn't go to a fake target in front of it when out of LOS

* Use a better, more generic way to calculate direction camera is facing

* Use ACE Macros for frag values. Get config entry with CBA

* Add Wiki entry

* Add new lines to wiki. Allow for SQF expressions in config for maxCorrectableDistance

* Add CPP code tag

* Fix wiki grammer error

* Re-convert back to CBA_fnc_getConfigEntry

* UAV Gunner support, cleanup

* Fix bug where SACLOS for launcher guided weapons was off

* Add the ability to define how far ahead of the missile the attack profile will seek toward
2018-12-06 20:27:30 -06:00
Josuan Albin
de828a2997 Parachute - Fix "hide altimeter" setting (#6721)
* Fix hide altimeter setting not working

Signed-off-by: Josuan Albin <josuanalbin@outlook.fr>

* Clean up altimeter PFH

* Put ! back inside
2018-12-06 16:36:35 -06:00
TehFocus
fddc6c2f4d arsenal-framework.md (#6191)
Added 1.3: Making an arsenal only with items from precreated loadouts. A very powerful addition when you want default loadouts spawnable without giving a full arsenal or looking up all classnames yourself.

Discussed with commy2 and alganthe in the ArmA 3 Mission creation discord channel.



If the format is not perfect, please change it to your liking.

-Miles T. Focus
2018-12-06 13:48:21 -06:00
diwako
88eb743485 Medical - Show tourniquets in Medical and Patient information (#6681)
* Show tourniquets in Medical and Patient information

* Ace styling

* Move tourniquet update function to medical
2018-12-06 13:41:23 -06:00
PabstMirror
c9ee0995c3
mk6mortar - Tweak charge UI for 1.86 (#6718) 2018-12-06 13:37:44 -06:00
PabstMirror
2c9b2bff77 Update wiki _config.yml for new releases 2018-12-04 11:48:12 -06:00
PabstMirror
c78ad62875 Merge branch 'release-3.12.5' 2018-12-04 11:47:08 -06:00
Thomas Kooi
30769f9428
add sqflint to circleci (#6715)
* add sqflint to circleci

* lint working directory

* do not exit with 1 on errors

* split up build jobs

* change linting not to be required

* use armake docker image for updating docs
2018-12-04 18:45:45 +01:00
PabstMirror
9162055161 Prep 3.12.5 Build 40 2018-12-03 21:03:58 -06:00
Josuan Albin
24e1bffe80
Merge pull request #6719 from acemod/alganthe-maintainer
add alganthe to ace3 maintainers list
2018-12-03 21:03:52 +01:00
Thomas Kooi
6902915cc5
add alganthe to ace3 maintainers list 2018-12-03 20:58:42 +01:00
ace3mod
675c0a1c6c [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2018-12-03 19:05:14 +01:00
ace3mod
254be700de [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2018-12-03 19:04:51 +01:00
Jo David
26786f93a9 add bwc class name for orange chemlight (#6717) 2018-12-03 12:04:22 -06:00
PabstMirror
25c10e8cf6
Ballistics/Realistic Names - Integrate P90 Compat (#6667)
* Ballistics/Realistic Names - Integrate P90 Compat

* Update CfgWeapons.hpp

* Remove old compat addon

* Update addons/realisticnames/stringtable.xml

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

* Update addons/realisticnames/CfgWeapons.hpp

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

* Update addons/ballistics/CfgWeapons.hpp

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

* Update addons/ballistics/CfgWeapons.hpp

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2018-12-03 12:03:49 -06:00
commy2
b055a0f633
Merge pull request #6714 from acemod/markers-server-log-warning
change an ERROR to WARNING in Markers component
2018-12-02 13:44:00 +01:00
commy2
438e34ac90
change an ERROR to WARNING in Markers component 2018-12-02 11:50:02 +01:00
Dedmen Miller
ba18d5f748 Custom Materials for tagging (#6704)
* Allow custom materials for tags

* Fix quickTag

* More betterer
2018-11-29 10:38:42 -06:00