Commit Graph

12479 Commits

Author SHA1 Message Date
f11ed762e3 move include 2018-12-13 00:30:29 -06:00
8243d2d433 Magwells 2018-12-12 23:31:08 -06:00
f5994e4c19 Merge branch 'master' into pike 2018-12-12 23:20:06 -06:00
91182482db Polish Translation (#6730)
Did the missing parts of the Polish translation.
2018-12-11 16:50:36 -06:00
249598df0e [Docs] Update component dependencies
Automatically committed through Travis CI.

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

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

* add M992 IR flare

* update debug script

* comments
2018-12-06 20:28:13 -06:00
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
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
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
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
c9ee0995c3 mk6mortar - Tweak charge UI for 1.86 (#6718) 2018-12-06 13:37:44 -06:00
2c9b2bff77 Update wiki _config.yml for new releases 2018-12-04 11:48:12 -06:00
c78ad62875 Merge branch 'release-3.12.5' 2018-12-04 11:47:08 -06:00
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
9162055161 Prep 3.12.5 Build 40 v3.12.5 2018-12-03 21:03:58 -06:00
24e1bffe80 Merge pull request #6719 from acemod/alganthe-maintainer
add alganthe to ace3 maintainers list
2018-12-03 21:03:52 +01:00
6902915cc5 add alganthe to ace3 maintainers list 2018-12-03 20:58:42 +01:00
675c0a1c6c [Docs] Update component dependencies
Automatically committed through Travis CI.

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

[ci skip]
2018-12-03 19:04:51 +01:00
26786f93a9 add bwc class name for orange chemlight (#6717) 2018-12-03 12:04:22 -06:00
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
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
438e34ac90 change an ERROR to WARNING in Markers component 2018-12-02 11:50:02 +01:00
ba18d5f748 Custom Materials for tagging (#6704)
* Allow custom materials for tags

* Fix quickTag

* More betterer
2018-11-29 10:38:42 -06:00
b3e0135e32 Fix Armake problems (#6697)
* Armake model.cfg fix

* Spaces!

* Case sensitive filenames fix
2018-11-29 11:18:22 +01:00
c2b9cddfb0 Update wiki _config.yml for new releases 2018-11-28 11:29:55 -06:00
cba6f72c9f Prep 3.12.4 Build 39 v3.12.4 2018-11-27 09:48:36 -06:00
9dfa6f0511 Merge branch 'master' into release-3.12.4 2018-11-27 09:46:24 -06:00
79b77bc0da Javelin - Can disable thermal requirement via code (#6706) 2018-11-27 00:09:45 +01:00
31a645997f Update Japanese translations (#6705)
**When merged this pull request will:**
- Update translations for Japanese
- fix the miss translations
2018-11-27 00:09:32 +01:00
1c2e23052b Prep 3.12.4 Build 38 2018-11-25 10:53:15 -06:00
bd5b360d7e Merge branch 'master' into release-3.12.4 2018-11-25 10:51:31 -06:00
a89dfccfb6 Merge pull request #6703 from acemod/fix-moving-marker-synch
fix moved markers not synched
2018-11-25 15:16:44 +01:00
d0bbc111bc disable debug mode 2018-11-25 15:05:05 +01:00
7b8fbe10b2 fix moved markers not synched 2018-11-25 15:02:27 +01:00
a357675ad3 MicroDagr - Fix waypoint scrolling (#6700)
Fix #6521
2018-11-19 17:57:02 -06:00
03e01f02df Arsenal - Fix script error from hide changes (#6699)
https://github.com/acemod/ACE3/pull/6694/files#r234542372
2018-11-19 13:05:44 -06:00
73adedff42 Merge pull request #6698 from acemod/654wak654-maintainer
add 654wak654 as maintainer
2018-11-19 20:53:02 +02:00
7a0250e002 add 654wak654 as maintainer 2018-11-19 19:44:11 +01:00
cce5d804c4 Prep 3.12.4 Build 37 2018-11-18 23:57:54 -06:00
830536504d RHS Compat - Fix config (#6696) 2018-11-18 23:51:26 -06:00
e3421cbf8f Arsenal - Add config to force show (mortars) (#6694)
* Arsenal - Add config to force show (mortars)

* Update CfgMagazines.hpp

* Update arsenal-framework.md
2018-11-18 23:04:50 -06:00
e8c3be8016 Quick Mount - Add Get In and Change seat action menu (#5745)
* Add quickmount GetIn menu

* Add compartment support

* Check engine, check pilot, check static turret driver

* Add doc, condition, translation

* Add hybrid config entries, fix MP issue

* Optimize condition

* Ignore Enabled setting in vehicle

* Work around SQF validator macro issue

* Fix config macro entries

* Add workaround for getting damage when seat changing while moving

* Add setting for Get In menu disabling

* Fix race when 2 players try to get the same seat

* Convert if-else to switch

* Decrease move-back timeout to 0.5s

* Check if vehicle is flipped

* Add getin statement for parent menu

* Improve canShowFreeSeats

* Apply latest trends

* Improve fnc_addFreeSeatsActions

* Change copilot and gunless turret icons

* Fix macro name

* Fix FFV icon

* Optimize turret icon code

* Extend setting to 4 values

* Fix menu is shown when vehicle is full

* Optimize UAV checking code

* Fix bug with disabled FFV turrets

* Remove bugged FFV, Add turret locality check, Add Failed message

* Replace some macros with function

* Fix validator

* Remove global variables, Add debug
2018-11-18 22:33:50 -06:00
cad3421e50 Replace placed modules by additional information in the issue template (#6695) 2018-11-19 00:20:41 +01:00
336c9ec31b Merge pull request #3747 from acemod/armake
Changes for Linux development and armake
2018-11-18 21:13:42 +01:00
c42e0107e8 Update to latest version number 2018-11-18 20:50:07 +01:00
979ec08036 Merge branch 'master' into armake 2018-11-18 20:47:03 +01:00
24e7a33d8b Fix armake building on latest master, Fix version application not adding newlines properly 2018-11-18 20:46:04 +01:00
4c0056b737 fix armake issues with latest release against ACE3 (#6693)
This issue has been resolved in Armake on the master branch. By switching to the `:master` tag we can use armake to build the ACE project again.
2018-11-18 20:36:40 +01:00