Commit Graph

9557 Commits

Author SHA1 Message Date
jonpas
58d69a7978 Prepare release 3.11.0 (build 3) 2017-10-23 20:21:01 +02:00
jonpas
84cd5d8749 Merge branch 'master' into release-3.11.0 2017-10-23 20:20:04 +02:00
ulteq
3484942680 Scopes - Fixed MRAD conversion (#5651)
* Same issue as https://github.com/acemod/ACE3/pull/5640
2017-10-22 10:44:00 +02:00
ulteq
0aca46d7aa Scopes - BoreHeight config revamp (#5648)
* Scopes - Added rail heights for all vanilla guns
* Scopes - Improved default rail height
* Scopes - Updated all scope heights
* ATragMX - New default bore heights
* ATragMX - Updated scope base angles
2017-10-22 10:28:20 +02:00
Daniel Jupp
c34b1e1376 Disabled Debug Define (#5645) 2017-10-20 22:46:51 +02:00
jonpas
89495d4dc2 Prepare release 3.11.0 (build 2) 2017-10-20 17:36:30 +02:00
jonpas
81e4740b60 Merge branch 'master' into release-3.11.0 2017-10-20 17:35:01 +02:00
ulteq
61c044e16b Fixed a typo in the airFriction generator script (#5641)
- Slightly improves the vanilla trajectory of the 'ACE_338_Ball' bullet
2017-10-20 17:33:40 +02:00
ulteq
923507d009 ATragMX and RangeCard - Fixed incorrect MRAD conversions (#5640)
- This greatly improves the accuracy of the MRAD output in both modules
- Old and incorrect conversion factor: 3.38 [(360 * 60) / 6400]
- New and correct conversion factor: 3.44 [54 / (5 * PI)]
2017-10-20 17:33:26 +02:00
jonpas
9c78e20670 Merge branch 'master' into release-3.11.0 2017-10-20 17:32:05 +02:00
Andrea Verano
18c2f45b3a Italian Translation Update (#5636)
Added:
-New string in "weather"
2017-10-20 17:27:28 +02:00
God of Monkeys
72e48c04f0 Update Chinese stringtable content (#5637)
Update Chinese stringtable content
2017-10-18 12:01:29 -05:00
PabstMirror
8ea0a42b1b Use BIS translation for Zeus/Players (#5633) 2017-10-18 06:26:08 +02:00
PabstMirror
23023ff8ea Fix server rain PFEH (#5631) 2017-10-17 22:48:02 +02:00
jonpas
e6f4046bf8 Prepare release 3.11.0 2017-10-17 20:27:56 +02:00
jonpas
856ffb5579 Remove rain, lightnings and wind sync (#5622)
* Move ACE Weather rain simulation to server and remove sync (synced correctly by vanilla from server)

* Remove lightnings sync (synced correctly by vanilla, ACE3 doesn't have own lightnings probability)

* Cleanup rain and lightning settings, strings, comments

* Set wind only on server (correctly synced in vanilla, gusts and waves still need manual sync)
2017-10-17 20:19:30 +02:00
SilentSpike
51a61653f4 Update spectator docs (#5362)
* Add player initilization safety to setSpectator

Public function which should wait for player unit to exist before running.
With this change an additional variable is now set on the player unit which
can be used to check whether players are spectators or not (part of
grander plans).

* Add UI initalization safety to setSpectator

Should make it so that calling the public function before the main display
has initalized will correctly wait until it has before starting spectator

* Overhaul spectator

Initial WIP overhaul of spectator component. Based on BI's End Game
Spectator and AACO's work on POTATO spectate. The essential functionality
is in place, but some things are broken and some are still to be
transferred.

* Remove redundant canInteract condition

Spectator UI will be open anyway so this is pointless.

* Fix follow camera controls

Also ensure unit camera modes have a target more consistently

* Fix widget weapon icon for unarmed

* Fix follow camera zooming

* Fix entity list not updating correctly

* Remove redundant conditions

* Fix list click behaviour

* Remove a bunch of old debug

* Alter behaviour of camera speed

* Restructure the spectator addon

* Fix camera tracking behaviour

* Fix very fast camera toggle

* Fix initial camera mode

* Fix double click behaviour

* Make AI name display consistent

* Add UI toggle

* Fix current camera mode button highlighting

* Fix focus info widget when clicked on in 3D world

* Improve key handling

Use of `inputAction` could result in weirdness when multiple keys pressed
at the same time. Hardcoded for now.

* Implement dynamic help UI element

* Remove some redundant code

* Fix follow camera jitter

* Add projectile drawing

Technically the capability to draw projectiles has been in since the
start. However it took me a bit of time to figure out how best to
add/remove the required event handlers.

I decided to add them during the process of finding things to draw, since
I'm iterating over the list of spectatable entities here anyway. With an
additional GVAR containing up to date entities, the fired EHs can remove
themselves when applicable. This avoids any granularity issues with adding
EHs en masse.

* Improve naming convention related to drawing

* Remove outdated unit and side settings

Also re-add unit whitelisting/blacklisting support

* Rename public function for consistency

Adds a deprecated warning to the old function name.

* Update stringtable

Some entries are replaced with BI translations, others are no longer
needed. I pieced together one of the camera mode settings by combining the
BI translations of the individual versions.

* Add location public functions and list population

Just need to take care of drawing and then camera interaction now

* Add location 2D and 3D drawing

* Respect whitelist and blacklist correctly

* Add location camera focus capability

* Fix local helicopters follow mode bug

* Add compatibility with `counter` template

Simply repositions the counter UI to the top of the screen out of the way

* Update respawn template

This template is only compatible with respawn types 2 & 3

* Rename compatibility function

* Add compatibility for respawn types 1,4 and 5

* Update setCameraAttributes function

* Fix draw3D for respawn types 1,4 and 5

* Fix screeching seagulls #4265

* Fix script command typo

* SQF Linter Pass

* Add obsolete warning for public func params

* Deprecate interrupt function

* Fix incorrect function call

* Make playable virtual spectator work

* Improve focus handling in public function

- User might want to reset focus for free cam, in which case objNull
  cannot be reserved for random
- Focus is still required for unit camera
- Update some function headers

* Note explicitly the use of `player`

* Remove unused base classes

* Improve seagull culling

* Add projectile drawing to vehicles

* Fix same tab selection clearing list

* Make projectile lines last 1 frame longer

* Add true zeus compatibility

- Re-opens spectator when zeus closes
- Transfers the curator module over in the respawn template
- Only handle uiForced in setSpectator to avoid issues with esc key
- Add safety to setFocus so that it only updates the UI when applicable

* Fix player moving in FPP

* Fix zeus transfer and re-opening

* Consolidate icon definitions

* Fix AI setting for player groups

* Improve handling of alive spectators

Instead of disabling simulation, just stage them automatically if alive.

* Fix respawn template for types 2 & 3

* Fix pre-set camera mode with no focus

- Improve handling of UI updates in camera related functions
- More explicit UI initalisation
- Find a focus if one wasn't pre-set for a camera mode which requires a
  focus

* Localise key names

* Fix camera mode and vision settings on init

When spectator starts the available camera modes and vision modes should
be consulted to ensure they are respected upon opening.

* Fix key localisation

* Add next/prev entity keys

* Fix vision modes update while camera active

- Updates the camera vision mode in case the current was removed

* Add public getCameraAttributes function

* Fix spectator zeus compatibility

- Camera control wasn't returned on exit due to change in fnc_ui

* Improve vision mode handling

- Curator now resets vision mode on entry
- First person also reset vision mode so that it is consistent between
  camera changes

* Improve location handling

- It makes more sense to specifiy the position ATL since the text is going
  to be rendered there and a z of 0 is then ground height.
- Updates the ui immediately if the list is already on locations

* Disable list keyboard search

* Fix handling of forced camera mode with no focus

* Fix handling of free mode removal while no target

* Fix locations respecting available modes

* Fix list entry removal code

- Replace getTargetGroups with getTargetEntities for consolidated
  filtering.
- Fix the step of the removal loops and make them go to index 0 instead of
  1

* Improve side handling of unit list

- Accounts for possibly of whitelisted random objects that belong to other
  sides
- Move the index decrement to loop, not within every loop

* Add linter ignore directive

* Fix list code

* Improve entity fetching

- Change whitelist/blacklist application to optimize the code

* Include dead units in the list

- Allow getTargetEntities to return dead units too
- Iterate over allGroups in list updates to reduce overhead

* Take care of TODOs

* Mark stageSpectator as non-public

* Fix updating list focus

* Adjust default camera speed

* Include the function file

* Generalise camera button UI

- Makes it easier to extend with future camera mode buttons
- Removes potential error when display doesn't exist

* Remove obsolete staged event

- Add vision toggle to help
- Restructure some function PREP

* Add public function to return all spectators

* Change default briefing name used on map display

* Fix the order of 4 main sides in list

* Restore non-toggle behaviour of camera speed

* Fix UI gap between list and tabs

* Force update UI list when player is staged

Hopefully this fixes any issues related to the player appearing in the
list

* Update controls strings

* Fix entity tooltips showing short name

- Also revert changes to common function and just handle in this component

* Include dead in unit switching

* Show rank and vehicle icon in list

- Rank is shown in tooltip
- Vehicle icon is used to see which units in the list are mounted

* Change default vehicle icon

* Show whether medic/engineer in tooltip

* Improve list double click behaviour

* Improve group icon handling

* Use dynamic group icons for drawing

* Fix EFUNC call

* Update all function headers

* All the changes I had staged before arma broke git

Arma managed to crash my whole system again, breaking my git repo and I
resorted to nuking it and pasting the changes I had comitted locally back
in. From memory:

- Fix icon paths
- use distanceSqr for minor speed boost
- Add setting to show map locations in the UI
- Limit location rendering based on distance
- Probably some other crap

* Fix squared comparisons

* Remove unnecessary variable publicity

* Deprecate fnc_stageSpectator

The function was a source of confusion alongside fnc_setSpectator and so
it is replaced by an additional parameter to hide the unit as part of
fnc_setSpectator. No longer is the unit moved either, to reduce complexity
and give more control to mission maker.

* Fix undefined variable

* Update spectator framework doc

* Update spectator feature doc

* Fix typos and grammar

* Revent version introduced number

* Update with new changes
2017-10-17 20:19:10 +02:00
BaerMitUmlaut
b366be0277 Prevent fastroping teleport serverside (#5629) 2017-10-16 23:20:50 +02:00
Mark Ruffner
7aae91be79 'Fix' race condition where rope is cut as someone mounts the rope (#5569)
* initial fix attempt

* reset animation

* Fix logic

* Not cutting when roping
2017-10-16 23:11:21 +02:00
PabstMirror
9c7b546e24 Fix garrison header and use showMessage (#5628)
* Fix garrison header and use showMessage

* Fix moduleUngarrison
2017-10-16 15:23:39 -05:00
Andrea Verano
c08bea1275 Italian Translation Update (#5627)
* Italian Translation Update

Added:
-Ai
-Pylons
-New entries for Zeus

* Remove empty comment
2017-10-16 20:30:38 +02:00
jonpas
7183a765f5 Add Advanced Throwing torque (rotation) (#5621)
* Add throwable rotation

* torque grenade config

* Cleanup

* Do vectorNormalized on direction only
2017-10-15 20:06:18 +02:00
PabstMirror
6e219b8678 QuickMount - fix locked seats, getIn EH (#5626) 2017-10-15 17:59:34 +02:00
jonpas
d598906205 Fix defused UXOs being able to be defused again and detected by mine detector (#5623) 2017-10-15 13:13:16 +02:00
LordGolias
8d9c17ed88 Made AI medic use epipen on unconscious patients (#5433)
* Made AI medic use epipen on unconscious patients

* Fix epi heal args, use non-local treatment funcs
2017-10-14 20:43:53 +02:00
PabstMirror
65c5e6e38e Add function to add curator actions (#5620) 2017-10-14 12:01:07 -05:00
BaerMitUmlaut
c211cbf82b Added fastrope keybind (#5606)
* Add fastrope keybind

* Add canInteractWith checks

* Fix player -> ACE_player
2017-10-14 11:55:48 -05:00
PabstMirror
750382ff67 Cookoff - Filter bad ammo, use new rearm config (#5618) 2017-10-14 15:12:32 +02:00
PabstMirror
2663bbb786 Fix options menu (#5617) 2017-10-13 23:50:12 +02:00
classic
d1aaf89c81 Update the Jpn translation (#5612)
* Add the Jpn translation for ai

Add the Japanese translation for ai

* Update the Jpn translation for nightbision

just tweaks for name.

* Update the Jpn translation for captives

added missing word

* Add the Jpn translation for pylons

Add the Japanese translation for pylons

* Update the Jpn translation for zeus

added to new entry.
2017-10-12 16:15:56 +02:00
PabstMirror
c8255960d6 Disable checking weapon temp on fakeWeapon (#5600) 2017-10-11 23:36:48 +02:00
BaerMitUmlaut
a95c380dcc Remove legacy medical settings (#5609) 2017-10-11 22:23:12 +02:00
Laid3acK
958471cb0c AB : same values for the both 127x108 bullets (#5588)
* 127x108 apds fix

* fix 127x108 apds initspeed mag
2017-10-11 14:07:13 -05:00
Ozan Eğitmen
1b86063ade Add Pylons Component (#5517)
* Initial commit

* Change order

* ace-ify functions

* Add function headers, tweak onPylonMirror function

* Finish localization

* Fix trivial idc collision

* Styling

* Add self as author

* Add interaction for the dialog

* Add settings to enable menu and change behaviour

* Add strings

* Move changes into pylons component

* Progress

* Only one function left!

* Fix issues with overlapping players, Use LINKFUNC

* Add progress bar

* I need to switch branches

* Remove old pylon weapons from aircraft

* Explicitly set new pylon's ammo to 0

* Replace magic numbers with ID list

* Align controls properly

* Remove space before eol

* Add ability to add/remove FRIES

* 🐛 Whoops

* Fix logic errors

* Value of 1 means helicopter has built-in FRIES

* Add pilot/gunner switch button

Working on those buttons also helped me improve both the static and
on-the-fly (pun intended) parts of the dialog.

* Add quick zeus module

* Add a way to retrieve scripted pylon turrets

Not entirely reliable, but if used in both rearm and pylons, missions
that only use ace will work perfectly.

* Use getNumber default

* Use common's getPylonTurret

* Make dialog close on apply for zeus

* Handle UI Scaling better

* Prevent progressBar from failing in zeus

* Remove unnecessary stringtable key
2017-10-11 14:05:54 -05:00
Joko
3a0fd5cae3 fix the delay timing when a unit switch to Captive (#5338) 2017-10-10 11:30:31 -05:00
Josuan Albin
bb03f55c5c Add garrison zeus modules (#4555)
* Add garrison and un-garrison modules

* Remove unnecessary text from garrison header

* Add french translations to new strings

* Add changes requested by review

* Change pushback to pushBack

* Move garrison funcs to ai, finish headers

* Remove diag log debug

* Fix typos and header issues

* Add missing newlines

* Fix strings, Fix typos and headers

* Enable debug and disable compile cache, Add trace and comments

* Rebase before review

* Fix default case running instead of case 3

* Fix edge case related to players being in garrison group

The player would make the enableAttack checks in ungarrison and garrisonMove fail, this is now fixed.

* Fix some arrays in garrsionMove and garrison

* Relax distance checks in garrisonMove, change AI behaviour while pathing to aware

* Add debug view

* Remove unused var, fix unit pos using the wrong format

* Make debug more visually pleasing

* Change garrison debug target to a waypoint icon

* Change disableAI event to AISection, comment out doFollow in doMove EH

* Fix locality issue
2017-10-10 11:06:37 -05:00
AkiraforARMA
ed1e95106d Priority ERROR units never die possibility (#5526)
* Priority ERROR units never die possibility

Cases when _lifesLeft goes below 0. 
Low or limb damage, then recovered with PAK from unconcious & revivestate.

* Update fnc_setDead.sqf
2017-10-10 11:06:07 -05:00
Dedmen Miller
81e02a7336 Refactor private ARRAY to private keyword (#5598)
* Everything

* Fixed missing ;

* Fix missing ; and double private

* Fixed cannot isNull on number

* Turn _temparture back to isNil

* Fix error from merge
2017-10-10 09:39:59 -05:00
shukari
22c8ef1e8a German stringtable updates (#5539)
* advanced_fatigue stringtable german

* cargo stringtable german

* cookoff stringtable german

* fastroping stringtable german

* hellfire stringtable german

* nlaw stringtable german

* overpressure stringtable german

* quickmount stringtable german

* refuel stringtable german

* repair stringtable german

* scopes stringtable german

* slideshow stringtable german

* spectator stringtable german

* zeus stringtable german

* cookoff stringtable german #2

* hellfire stringtable german #2

* nlaw stringtable german #2

* overpressure stringtable german #2

* quickmount stringtable german#2

* refuel stringtable german #2

* scopes stringtable german #2

* slideshow stringtable german #2

* zeus stringtable german #2

* tiny fix

* tiny fix

* quickmount stringtable german #3

* fastroping stringtable german #2

* captives stringtable german

* cargo stringtable german

* cookoff stringtable german

* tiny change

* cargo stringtable german

* fcs stringtable german

* Fix german strings for scopes
2017-10-07 13:37:59 +02:00
Willard
51b1cd6023 Missile guidance for RHS hellfire and DAGR (#5444)
* rhs hellfire missileguidance

* tabs to spaces

* added support for -N and -M launcher, removed ir/radar locking

* added missing macro

* Switch to using pylon system
2017-10-06 15:31:48 -05:00
ulteq
be482ea097 Advanced Ballistics - Drag model revamp & Spin drift correction (#5566)
* Advanced Ballistics - Drag model revamp
- Moved away from using the drag tables from the GNU exterior ballistics library
- The drag functions are now based off this data from JBM Ballistics: http://www.jbmballistics.com/ballistics/downloads/text/
- The differences are minor, but some players might still appreciate the additional authenticity

* The Mach number is now calculated in relation to the air temperature.

* Improved speed of sound calculation accuracy.

* Advanced Ballistics - DLL update

* Advanced Ballistics - Added drag function reference (JBM Ballistics)

* Advanced Ballistics - Fixed calculation error in the spin drift simulation
- The error was introduced with this PR (https://github.com/acemod/ACE3/pull/4708)

* More descriptive variable names

* Minor performance optimizations

* Fixed some minor issues

* DLL rebuild

* Utilize new 'toFixed' script command
- Small performance improvement

* Fixed a typo

* Use correct reference speed for the drag compensation

* Updated all 'airFriction' values to match the new drag model

* 'Default' atmosphere now equals the ICAO standard atmosphere

* Update reference humidity to meet the ICAO standard
2017-10-06 13:05:20 -05:00
classic
d5aeec11ea Update the Jpn translation (#5586)
* Update the Jpn translation

few tweak to translation

* Update the Jpn translation

couple tweak

* Update the Jpn translation

added more simplify translation

* Update the Jpn translation

few tweak and fix miss translation

* Update the Jpn translation

Added missing symbol and few tweak

* Update the Jpn translation

added shortest word because text is protruding the button

* Update the Jpn translation

fix miss translation and some tweaks

* Update the Jpn translation

just few tweak

* Update the Jpn translation

fix miss translation

* Update the Jpn translation

just a little tweak

* Update the Jpn translation

just a tweak

* Update the Jpn translation

added more simply translation

* Update the Jpn translation

tweaked to some entry

* Update the Jpn translation

tweak to few entry

* Update the Jpn translation

fix for miss translation

* Update the Jpn translation

fix miss translation

* Update the Jpn translation

some tweaks to translation

* Update the Jpn translation

fix miss translation

* fix the Jpn translation

fix the kanji
2017-10-04 16:30:11 +02:00
PabstMirror
760665f65f Leave ACE_FCS off by default (#5580) 2017-10-03 11:57:07 -05:00
PabstMirror
b41cc8651f Fix kestrel ItemInfo for cba misc items (#5583) 2017-10-03 11:54:49 -05:00
jonpas
711e1fc026 Fix Underwater interactions (magrepack, loading, refuel, medical legs, dragging) (#5521)
* Fix Magazine Repack underwater - fix #5513
Also prevent common goKneeling function underwater

* Fix loading patients underwater - fix #5515

* Fix load object underwater

* Fix take nozzle on jerry can underwater

* Fix refuel underwater conditions further

* Use isTouchingGround, Make refuel semi-compatible
 reports false if head is out of the water, we want true even if we are not diving

* Less interact exceptions duplication

* Use animationState to determine if unit is swimming, create common function and use it instead of isTouchingGround

* Fix condition

* Support dragging underwater
No carrying due to animation timing issues and other misc things

* Allow Medical Legs SelfActions underwater

* Fix fixPosition function underwater (use getPosATL instead of getPos)

* Fix fixPosition's slope adjustment for non-gravity objects, Do the same for objects without simulation as well
2017-10-01 13:38:11 -05:00
Andrea Verano
03a32b9b13 Italian translation update (#5576)
Added:
-The new string in captives
2017-10-01 10:56:02 -05:00
PabstMirror
5f8350d7bc Minor rearm fixes (#5572) 2017-09-30 11:14:41 -05:00
Ozan Eğitmen
45a66ccfa1 Medical & Captive Load Menu Overhaul (#5519)
* Add load in child actions to medical & captive

* Add actions with proper structure

* Move vehicles actions code to common function

* Simplify code in config, Fix docs

* Remove unused vars

* Fix header example

* Add _distance param to fnc_nearestVehiclesFreeSeat

* Change docs

* Fix spacing
2017-09-29 22:00:47 +02:00
Tuupertunut
0644ad9ca2 Rearm bugfixing (#5411)
* Added workaround functions for turret magazine ammo.

* Switched to retrieving turrets dynamically instead of looking them up from an array.

* Refactoring only, no functional changes

* Repurposed getNeedRearmMagazines as a general purpose rearm info function + more.

* The function retrieves all non-full magazines. This code was previously repeated in many different functions, but is now centralized in one.
* Empty pylon filling is no longer supported in favor of the upcoming "pylons" ACE-module.

Fixed bugs:

* Rearm was using broken commands "magazineTurretAmmo" and "setMagazineTurretAmmo". They are now replaced with their corresponding workaround functions.
* Pylon rearm was trying to set ammo count on empty pylons.

Note: rearmSuccessLocal is not yet fixed!

* Rearming no longer switches shell types in cannons/mortars.

* Added Tuupertunut to authors.

* Rearming no longer switches shell types. 2nd try.

Last time it was fixed only if the turret is manned. Now it is fixed even when unmanned.

* Updated fnc_rearm to support the earlier repurposing of fnc_getNeedRearmMagazines.

* Small fixes and comments.

* Renamed fnc_getVehicleMagazines to fnc_getTurretConfigMagazines.

The latter describes much better what the function actually does.

* Removed redundant checks.

* Refactoring.

* Fixed spaces in macros.

* Renamed fnc_getAllTurrets to fnc_getAllRearmTurrets
2017-09-29 14:53:25 -05:00
classic
9dfc76b6d5 Update the Japanese translation (#5565)
* Update the Jpn translation

following to official localization.

* Update the Jpn translation

fix for miss translation

* Update the Jpn translation

added more natural words and fix miss translation.

* Update the Jpn translation

fixed for miss translation.

* Update the Jpn translation

just tweaks

* Update the Jpn translation

added to new entry. fixed or tweaked to few entry.

* Update the Jpn translation

added the jpn translation to new entry

* Update the Jpn translation

Added the Jpn translation to new entry.

* Update the Jpn translation

tweak to jpn translation

* Update the Jpn translation

following to official Japanese localization

* Update the Jpn translation

support to new entrys and few fix

* Update the Jpn translation

just tweaks to few entrys
2017-09-28 16:04:24 +02:00
PabstMirror
651aa285f8 Add trip flare to Put muzzle (#5564)
Muzzle won't be used because explosives has a custom placing engine.
But arsenal needs this to categorize it as an "explosive"

Close #5563
2017-09-28 03:46:33 +02:00
jonpas
a48db26996 Fix Load Patient/Captive actions (#5544)
* Disable (un)load patient action if unit is dead but was uncoscious before

* Remove handcuffs on death (prevents stand-up ragoll restart), Don't show load patient and captive at the same time

* Only allow unloading from outside - fix #5525 as discussed

* Also prevent unloading captives from inside

* Add debug logging
2017-09-27 15:41:05 -05:00
KoffeinFlummi
32b2d99887 Merge remote-tracking branch 'sbng/master' 2017-09-27 18:57:24 +02:00
Josuan Albin
240a078dde Toggle modules standardization (#5558)
* Change toggle modules messages to be the same as others

* Fix _ui_toggleNvg capitalization
2017-09-26 19:36:36 -05:00
jonpas
430c136a61 Deprecate isUnderwater (replaced by underwater command from 1.66) (#5560) 2017-09-26 19:35:00 -05:00
PabstMirror
30fcbb66ae Add ace_common_fnc_getPylonTurret func (#5548)
* Add getPylonTurret function

* cleanup

* debug

* Fix
2017-09-26 21:47:13 +02:00
jonpas
4de7953316 Remove deprecated addToInjuredCollection function (#5559) 2017-09-26 11:23:20 -05:00
ulteq
098b88106c RangeCard - Always display barrel length and bore height (#5551)
- More uniform appearance with advanced ballistics enabled or disabled
2017-09-26 16:51:48 +02:00
Christian Klemm
3d340bb0ef Added captive hotkey (#5529)
* added captive hotkey

* Removed toggling + distance check

* adjusts

player -> ace_player
interact check
stringtable adjust

* Update XEH_postInit.sqf

* Update XEH_postInit.sqf

* Removed dots

* Removed comment

* Use targetEvent
2017-09-25 23:22:10 -05:00
sbng-PAPA
37dcb562a7 korean translation for 3.10 2017-09-26 00:54:27 +09:00
Jo David
4a6b06dfeb Typo in flashlights translation Fix #5552 (#5553) 2017-09-25 16:29:40 +02:00
Dystopian
e874f6a343 Fix SDV refueling (#5546) 2017-09-23 01:01:19 +02:00
jonpas
eb6e8c0b56 Cleanup optional argument headers (#5543) 2017-09-22 17:33:08 +02:00
Andrea Verano
c68ebf2816 Italian translation update (#5542)
Added:
-Fastroping
-Refuel
-Zeus

Fixed:
-Add full arsenal
-Remove arsenal
2017-09-22 17:23:11 +02:00
Josuan Albin
1ba330e853 Add toggle flashlight and NVG zeus modules (#4556)
* Add toggle flashlight and NVG modules

* Remove excessive spaces in moduleToggleNvg

* Fix indentation and typos to fit review

* Add an option to add gear, fix headers

* Change category to utility

* Add QOL improvement suggested by pabst

* Fix locality issues

* Remove locality check before enableFlashlight targetEvent

* Remove locality check before addWeaponItem targetEvent

* Add a player check in moduleToggleNVG, change modules category

* Add the same QOL in toggleNVG than in toggleFlashlight
2017-09-21 20:43:35 +02:00
shukari
a783e6319f magazinerepack stringtable fix #5390 (#5392)
* fix #5390

stringtable optimization

* Dont use the same wort twice - magazinerepack stringtable

* [magazinerepack] get bulletsLeft in last partial mag as optional param

* [magrepack] remove unused entries

* [magrepack] entry is needed for interrupt event

* [magrepack] finish msg

successful -> full mags + left rounds
Interrupted -> full mags + partial mags

* [magrepack] final translation change

* space fix
2017-09-21 20:42:01 +02:00
Ozan Eğitmen
41e1b25397 Refuel: Turn on nozzle after connection (#5426)
* Turn on nozzle after connection

* Remove some superflous progress bars

* Handle tempFuel var

* Handle conflicts 2: conflict harder

* Remove duplicate code
2017-09-21 16:24:58 +02:00
Ozan Eğitmen
90f92db01d Replace UI icons with vanilla/common ones (#5532)
Also removes some _very_ old paa files that belong to AGM/CSE
2017-09-21 16:22:28 +02:00
Ozan Eğitmen
21e9674ab7 Add "Load Into Cargo" Zeus Module (#5528)
* Initial commit

* Finish TODOs

* Remove "<BR/>" from showing up on zeus messages

* Add check for scheduled environment, cargo enabled
2017-09-21 16:19:49 +02:00
jonpas
40e4ad3f5a Add Stow FRIES interaction (#5533)
* Add stow FRIES interaction
Allows stowing FRIES (retracting the hooks, closing doors) without the need to deploy and cut ropes

* Do not automatically stow FRIES anymore

* Cleanup more privates
2017-09-21 16:16:04 +02:00
classic
8a0bbf655b Update the Jpn translation (#5536)
* Update the Jpn translation

support to new entry.

* Update the Jpn translation

Fully translated for the maverick

* add credit

because I am translating mod to Japanese ;)
2017-09-20 14:59:46 +02:00
Andrea Verano
9e36e0d7ef Italian translation update (#5535)
Added:
-2 missing entries in captives
2017-09-20 14:04:56 +02:00
jonpas
333b24e306 Fastrope animations and in-line privatization (#5501)
* Add older Arma door animations and macroize them, In-line privatization, Fix comment

* Clarify animation macros

* Fix onCut delayed animations
2017-09-19 22:38:49 +02:00
PabstMirror
db36ee4581 showMouseHint - Allow adding additional icon/text lines (#5524)
* showMouseHint - Allow adding additional icon/text

* Remove icons, just use localized text
2017-09-19 14:00:22 -05:00
Keithen
7fe932803b Add requireSurrender setting for AI - close #5518 (#5522) 2017-09-19 13:21:30 -05:00
Andrea Verano
e47212ea9c Italian translation update (#5531)
Added:
-Advanced Fatigue
-Interactions
-Medical
-Refuel
-Spectator
-Fully translated markers and maverick

Fixed:
-Next Unit
-Previous Unit
2017-09-19 16:22:11 +02:00
Christian Klemm
73b9f69adf Re enable all markers (except civ and quantity) (#5376)
* Reenabled medical markers

* Re enabled all markers (except civ and quantity)

* Update CfgMarkers.hpp
2017-09-18 11:18:02 -05:00
Dystopian
90647c5495 Replace Helicopter eject configs with universal scripted action (#5384)
* Remove eject config entries

* Add scripted Eject action

* Fix engine stop on driver eject

* Clean up

* Use config instead object for CBA_fnc_getTurret

* Optimize, add commander turret init

* Restore role in var name

* Use single qoutes instead QUOTE macro
2017-09-18 00:24:14 +02:00
PabstMirror
45d9a3a1a9 Fix spectator onLoad (#5523) 2017-09-17 23:42:29 +02:00
xrufix
31b1050f3b Maverick L (laser guided AGM) (#5364)
* Initial commit

* Initial commit

* Initial Commit

ACE-Coding-Guidelines compatible version of http://steamcommunity.com/sharedfiles/filedetails/?id=943852645

* Changes to realisticnames, readme.md, added to authors.

* Dependency on ace_missileguidance

* readme

* Use ACE-AMG for ammo

* Use macros in all configs

* Use own attackProfile to prevent climbing at start even in low-flight-conditions.

* include HUD from ace_hellfire

* fix missing semicolon

* Add missing defines, makes HUD work for now.

* Readme

* replace tabs with spaces

* replace tabs with spaces 2

* replace tabs with spaces 3

* Use missileguidance's DIR-Profile instead of own. Keep profiles config for name and nameLocked values necessary for HUD

* Use showHud from ace_laser

* Minor Cleanup
2017-09-16 22:25:20 +02:00
SilentSpike
b0c27d1071 Add uiNamespace variable to spectator display (#5520)
* Add uiNamespace variable to spectator UI

* Update spectator keys to match docs branch
2017-09-16 15:20:32 -05:00
Dystopian
357f3a9ceb Add JIP event deleting if vehicle is deleted (#5506) 2017-09-16 22:18:28 +02:00
PabstMirror
1a1fdb7c2c Move the hellfire hud to the laser module (#5503)
* Move the hellfire hud to the laser module

* Fix example
2017-09-16 14:24:43 -05:00
Ozan Eğitmen
ca580daedd Cargo: Add removeCargoItem Function (#5432)
* Add removeCargoItem function to cargo module

* Fix documentation typos

* Fix header 'public' field

Of course it's a public function, that's the whole point!

* Fix spelling

* Add missing then command

* Work better with objects

* After-test fixes

* Also update wiki

* Overhaul

* Make the event more robust

* Fix logic & shorten docs
2017-09-16 11:21:23 -05:00
PabstMirror
2a8e758390 Allow loading fuel canister (#5493)
Fix #5438
- Also block cargo action when being used
2017-09-16 11:36:42 +02:00
ulteq
ecd688647c AdvancedBallistics - Utilize 'parseSimpleArray' (#5496)
- Decent performance improvement compared to the old 'call compile' approach
2017-09-16 11:08:25 +02:00
PabstMirror
df739bd36c Handle laser targets from non-primaryGunner turrets (#5507) 2017-09-15 17:31:31 -05:00
classic
2611b56767 Jpn translate e103805 (#5505)
* Update the Jpn translation for interaction

-fix miss translation
-fix html tag
-support to new words
-tweaks

* fix

i was change the English by mistake. it is fix.

* Update the Jpn translation for markers

support to new words

* Update the Jpn translation for refuel

-fix miss translation
-support to new words
2017-09-13 10:26:26 -05:00
PabstMirror
30a8d2db7b Use CBA Misc Items (#5502)
* Use CBA Misc Items

* Set required CBA to 3.4.1
2017-09-12 23:23:45 -05:00
Dystopian
e103805f00 Fix unconscious handlers run globally (#5504) 2017-09-12 18:10:49 -05:00
jonpas
9cce08f152 Move handle on carrier doors (#5498) 2017-09-11 17:33:58 -05:00
PabstMirror
d4cd0f2286 Add support for orange drone (UAV_06) (#5494)
* Add support for orange drone (UAV_06)

- Remove cargo from orange drones (and apex heli drone)
- Allow battery replacement on orange drone

* ops
2017-09-10 15:38:10 -05:00
Dystopian
559a498e6d Add fast mouse actions to refuel, add refuel eden attributes (#5418)
* Add fast mouse actions to refuel

* nobody seen that

* Add interaction condition and refuel on ladder

* Add car hit, fix change weapon on uncon

* Replace objNull with nil in setVar, unify var names

* Delete *ConnectNozzle functions

* Delete reset* functions

* Add public function and eden attributes

* Remove static actions from RHS compat

* Remove statusEffect_set on respawn

* Fix dual menu, add deprecating message

* Optimize fnc_takeNozzle

* Cleanup
2017-09-10 14:43:03 -05:00
Wanderrful
635b667a74 Fixed viewdistance error while controlling UAV (#5308)
* Fixed viewdistance error while controlling UAV.

When you take control of UAV drones, the view distance does not properly update to your setting because it thinks that you are still the land infantry guy.  So I've experimented a bit in the editor and found a condition that will properly return true when you are in control of a drone aircraft.  I've also adapted this for use with land-based UAV stuff (like the Stomper).

To accomplish this, I created a private *_isControllingDrone* variable that will detect if the player is currently in control of any UAV.  I also edited the _landVehicle and _airVehicle scripts so if and only *_isControllingDrone* returns true, then it will check whether the drone is a subclass of "LandVehicle" or an "Air".

That's all I did.  Please accept my pull request!

* Use ACE_controlledUAV event
2017-09-10 14:42:19 -05:00
PabstMirror
3869c8362f Don't add fake weapon in restoreGear (#5491)
Fix #5474
2017-09-10 14:42:04 -05:00
PabstMirror
c7b804a685 Add ace_explosive support for orange dlc mines (#5486) 2017-09-10 09:44:57 -05:00
ulteq
c402a2028f Kestrel4500 - Fixed head- and crosswind calculation (#5489)
* Kestrel4500 - Fixes head- and crosswind calculation
- The wind direction was not taken into account when calculating head- and crosswinds
- This does not affect how the Kestrel4500 behaves with AdvancedBallistics enabled
- Fixes #5181

* Kestrel4500 - Fixes wind direction formatting issue
- This does not affect how the Kestrel4500 behaves with AdvancedBallistics enabled
2017-09-10 15:16:17 +02:00
Broström.A | Evul
e0f3b393d7 Added missing semicolon (#5487) 2017-09-10 14:44:26 +02:00
ulteq
1ca43c4bd9 ATragMX - Fixed AT mode (#5485)
Fixes #5330
2017-09-08 18:18:17 +02:00
jonpas
40d927d3fd Use selectRandomWeighted 1.76 command (#5482) 2017-09-08 16:18:07 +02:00