Commit Graph

11585 Commits

Author SHA1 Message Date
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
Whigital
39abfc78db [compat_rhs_usaf] Reload Launchers and Overpressure (#5589)
* Add ace_reloadlaunchers capability and ace_overpressure config to Mk
153 SMAW launcher
* Add ace_reloadlaunchers capability and ace_overpressure config to M3
MWAAS launcher
2017-10-10 10:27:49 -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
Laid3acK
54c1e606ca fix_zero_j10mildot (#5593) 2017-10-06 20:09:36 +02:00
Laid3acK
3a5fcdaa39 Update CfgAmmo.hpp (#5587) 2017-10-06 20:09:11 +02: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
Thomas Kooi
3ddab02505 Fix README license note
Missing `)`
2017-10-03 19:15:37 +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
PabstMirror
ef25aaff02 Fix UBC for RHS 4.3 (#5574) 2017-10-01 12:31:01 -05:00
Andrea Verano
03a32b9b13 Italian translation update (#5576)
Added:
-The new string in captives
2017-10-01 10:56:02 -05:00
ulteq
5de48093da Python tool which converts ballistic coefficients into 'airFriction' values. (#5573)
- This tool automatically calculates optimal 'airFriction' values for all ACE3 ammo types
2017-10-01 09:52:09 +02: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
PabstMirror
49f549013d Update AB dll for 3.11 changes (#5538) 2017-09-22 10:53:42 -05:00
Laid3acK
25119d406f AB : update R3F compat (#5541)
* Create CfgMagazines.hpp

* Update CfgAmmo.hpp

* Update CfgWeapons.hpp

* Update CfgWeapons.hpp

* Update CfgMagazines.hpp

* Update CfgMagazines.hpp

* Update config.cpp

* Update CfgWeapons.hpp

* Update CfgAmmo.hpp

* Update CfgAmmo.hpp

* Update CfgWeapons.hpp

* Update CfgMagazines.hpp

* Update CfgAmmo.hpp

* Update CfgMagazines.hpp

* spaces

* Update CfgWeapons.hpp

* typo
2017-09-22 17:33:39 +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
PabstMirror
942ab122d3 Update configValidator tool for Mikero changes (#5537) 2017-09-21 12:41:48 -05: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