Commit Graph

11873 Commits

Author SHA1 Message Date
PabstMirror
04db4add26 Remove unused addUnloadPatientActions 2017-09-23 11:58:49 -05:00
PabstMirror
6aa32ce811 Fix setUnconsciousAnim error 2017-09-23 11:46:48 -05:00
PabstMirror
ddf72d5878 Merge branch 'master' into medical-rewrite
Conflicts:
	addons/medical/ACE_Medical_SelfActions.hpp
	addons/medical/CfgVehicles.hpp
	addons/medical/CfgWeapons.hpp
	addons/medical/data/model.cfg
	addons/medical/functions/fnc_treatment.sqf
	addons/medical/functions/fnc_treatment_failure.sqf
	addons/medical/functions/fnc_treatment_success.sqf
	addons/medical/stringtable.xml
2017-09-23 11:25:58 -05: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
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
ace3mod
1fd255c11e [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2017-09-16 22:26:57 +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
jonpas
170cd8e5de Remove deprecated stringRemoveWhitespace (#5483) 2017-09-07 20:12:47 +02:00
Broström.A | Evul
a50cf4e300 Added drag and Cargo ability to Orange crates (#5421)
* Added load and carry ability to some new upcoming crates

* Added missing crate to dragging

* Added missing ones for cargo.
2017-09-07 19:45:37 +02:00
Christian Klemm
19418b824d Added rating settings (#5354)
* added rating settings

* moved rating to interaction

* Update fnc_canPardon.sqf

* Update stringtable.xml

* Update CfgVehicles.hpp

* Update XEH_postInit.sqf
2017-09-07 19:38:26 +02:00
Christian Klemm
22b4788891 added movable markers option (#5397)
* added movable markers option

* added restrictions

* added local events

* formatting + small fixes

* Events for start and end modified + small adjusts

* minor fixes

* lazy eval

* Alt as modifier key

* Update XEH_postInit.sqf

* Skip UI EH on headless
2017-09-07 19:26:32 +02:00