Commit Graph

10130 Commits

Author SHA1 Message Date
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
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
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
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
9162055161 Prep 3.12.5 Build 40 2018-12-03 21:03:58 -06: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
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
Dedmen Miller
b3e0135e32 Fix Armake problems (#6697)
* Armake model.cfg fix

* Spaces!

* Case sensitive filenames fix
2018-11-29 11:18:22 +01:00
PabstMirror
cba6f72c9f Prep 3.12.4 Build 39 2018-11-27 09:48:36 -06:00
PabstMirror
9dfa6f0511 Merge branch 'master' into release-3.12.4 2018-11-27 09:46:24 -06:00
PabstMirror
79b77bc0da Javelin - Can disable thermal requirement via code (#6706) 2018-11-27 00:09:45 +01:00
classic
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
PabstMirror
1c2e23052b Prep 3.12.4 Build 38 2018-11-25 10:53:15 -06:00
PabstMirror
bd5b360d7e Merge branch 'master' into release-3.12.4 2018-11-25 10:51:31 -06:00
commy2
d0bbc111bc
disable debug mode 2018-11-25 15:05:05 +01:00
commy2
7b8fbe10b2 fix moved markers not synched 2018-11-25 15:02:27 +01:00
PabstMirror
a357675ad3
MicroDagr - Fix waypoint scrolling (#6700)
Fix #6521
2018-11-19 17:57:02 -06:00
PabstMirror
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
PabstMirror
cce5d804c4 Prep 3.12.4 Build 37 2018-11-18 23:57:54 -06:00
PabstMirror
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
Dystopian
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
jonpas
5bfd64f066 Merge branch 'master' into armake 2018-11-18 20:23:50 +01:00
commy2
9a064ec9c7
Merge pull request #6684 from Cyruz143/fence_update
Logi Wire Cutter - Adding primary fence used on Sarahni
2018-11-18 08:27:59 +01:00
Cyruz143
621cd77025 Adding primary fence used on Sarahni 2018-11-18 01:13:21 +00:00
zharf
e00723039b Nametags - Adjustable colors settings (#6641)
* Move hard coded nametag team colors to settings

Also made the default colors lighter to make them easier to read

* Added myself to contributors

* Fixed Nametag to Name Tag

* Optimized array copying

* Moved team color settings to color subcategory and used vanilla localization strings

* Split a long line into a more readable multiline solution
2018-11-16 21:30:46 -06:00
BaerMitUmlaut
8119e87aa0 Fix wind roughness on airports (#6631) 2018-11-15 10:49:43 -06:00
jonpas
0745e249fc Merge branch 'master' into armake 2018-11-14 18:32:47 +01:00
madpat3
b35d5c8295 Update script_component.hpp (#6678) 2018-11-14 10:36:37 -06:00
Dedmen Miller
efb53ed181 Arsenal - Add Night Vision support stat for scopes (#6671)
* Add Night Vision support Arsenal stat for scopes

* contrive correct configClasses camel case compliance

* Change priority
2018-11-14 10:36:10 -06:00
madpat3
8201a6bd08 Update script_component.hpp (#6677)
Wirecutters - Add compatibility with more fences from CUP
2018-11-13 17:06:40 -06:00
PabstMirror
64a06ddb07
Merge pull request #6674 from acemod/pr/6424
Rearm - Fix for 3den PR
2018-11-11 15:25:39 -06:00
diwako
3e5995ee3d Updated treatment time (#6670) 2018-11-11 12:25:29 -06:00
Dystopian
40f371c063 Interaction - Add condition to zeus actions (#6665)
* Add conditions to zeus actions

* Add condition caching
2018-11-11 11:26:36 -06:00
Josuan Albin
69a67ff4e2 Arsenal - Fix NVG overlay appearing in ace arsenal (#6673)
* Fix NVG overlay appearing in ace arsenal

* Change center to ACE_Player in nvg check to avoid edge case
2018-11-11 11:22:53 -06:00
Dystopian
32fc6bb437 Add possibility to create zeus during mission (#6203)
* Add possibility to create zeus during mission

* Use LLSTRING

* Allow deleting when setting is disabled

* Delete canCreate function

* Delete workaround for missed vehicles

* Revert "Delete workaround for missed vehicles"

This reverts commit e33102ee3c.
2018-11-10 14:33:20 -06:00
nomisum
ada07758c5 Explosives - Add Event for tripflare triggering (#6663)
* Add Event for tripflare triggering

_flare might be useful to delete / replace flare
_position is already available, so why not send it too

* added documentation

also added missing wirecutter event
2018-11-09 12:27:43 -06:00
Dystopian
86b4f08101 Fix CBA_fnc_getActiveFeatureCamera call (#6660) 2018-11-04 00:32:37 +01:00