Commit Graph

11662 Commits

Author SHA1 Message Date
Ľuboš Lendáč
b91e892710 Merge branch 'medical-rewrite' into medical-rewrite-kill-ai 2017-06-05 22:54:03 +02:00
PabstMirror
f715edabc9 Fix debug 2017-06-05 12:30:54 -05:00
PabstMirror
25a28778cb Tweak randomness for wound bleeding and pain (#5113)
* Tweak randomness for wound bleeding and pain

* Scale damage to bodyPartDamage on multi part wounds
2017-06-05 11:51:53 -05:00
PabstMirror
f98b268419 Split setUnconscious func, add spontaneousWakeUpChance setting (#5114) 2017-06-05 11:42:46 -05:00
PabstMirror
f369ffaa04 Med rw handle fire damage (#5100)
* Bundle fire damage into bigger chunks

Redo #4223

* Use same values

* Decrease combine cuttoff to 0.1
2017-06-05 11:42:00 -05:00
PabstMirror
ddccfe563b Merge branch 'master' into medical-rewrite
Conflicts:
	addons/medical/functions/fnc_determineIfFatal.sqf
	addons/medical/functions/fnc_displayPatientInformation.sqf
2017-06-03 12:37:28 -05:00
SilentSpike
b3889d9d7e Fix accidental numerical change (#5235) 2017-06-02 19:56:24 -05:00
Rebel
bf4b49a213 Fix spectator icons and camera jitter (#5067)
* Use `Visual` commands for icons and external camera position
2017-06-03 01:38:29 +01:00
ace3mod
1b516bb4fa [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2017-06-02 23:52:51 +02:00
ace3mod
feaa50a002 [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2017-06-02 23:52:46 +02:00
ace3mod
1545b5c45c [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2017-06-02 23:52:32 +02:00
PabstMirror
3898202091 Hellfire missiles (#4679)
* Hellfire

* Cleanup dev macros

* Cleanup some debug

* Add base interaction node for firemode actions

* Handle bad data in attack profile variable

* Skip ammo checks (returns bad data on added weaps)

* Add mags sizes for apache

* Add Hellfire Wiki Doc

* Cleanup doc

* Add pylon support

* Add support for pilot controlled weapons

* Add label to pylon mags

* Cleanup vehicle configs, autoAdd laser des, fix ineractions for driver
2017-06-02 16:51:38 -05:00
PabstMirror
49374feb2a NLAW - Predicted Line Of Sight Guidance and Overfly Attack Mode (#4791)
* NLAW Prototype

* Make AI Compatible

* Add Overfly Top Attack Mode

* Limit Max Deflection

* Base prediction on AI skill

* Generic cycle attack profile key for missile guidance

* Add hint for weapons without huds

* Configure for attack cycle key

* Finish OTA ammo effects

* Cleanup

* Arm at 20m

* Disable Debug

* No models for short lived sub-ammos

* Fix Korean strings

* Change AI randomization to use skillFinal

* Add wiki doc for nlaw

* Cleanup

* Cleanup

* Cleanup
2017-06-02 16:51:20 -05:00
James Kingsley
4872e186cd Vehicle quick mount (#4931)
* Add quickmount files from ACEX

* Rename to ACE3, Streamline, Use clientInit

* Rename functions to ACE3, Fix crew getting

* Fix enabled text

* Fix texts

* Remove spaces

* Rework seat search
2017-06-02 16:51:07 -05:00
Phyma
288f956316 Open glass and CUP doors (#5226)
* Fixed glassdoor

Fixed so glassdoor now works with ace slow open.

* Made it more pretty with new file

Made it more pretty with new file

* Tidy up a bit

* Removed white space

* Replace tabs with spaces

Replace tabs with spaces

* Simplified and added comments

* Changes + was stupid was commit

Changes to go with code guidlines and extra check if door is empty

* Tabs to spaces

* Small fixes + Fixed so CUP houses now works

Fixed so CUP houses now works

* Remove todo

* Fixed requested changes

* Removed whitespaces
2017-06-02 16:50:53 -05:00
SilentSpike
ae69118fba Implement new cook off SFX (#5179)
* Implement new cook off SFX with variants
* Add hybrid V to authors
2017-06-02 22:20:36 +01:00
Cuel
5b9c70a738 Fix zeus RC units using player damage treshold (#5219)
* Fix zeus RC units using player damage treshold

Closes #5218

* add pabstmirrors suggestion

use gvar
2017-06-02 11:21:57 -05:00
PabstMirror
2712a1ed8a Remove submuntion ammo changes to A-10 (#5231)
* Remove changes to Aircraft cannons

* keep ammo changes, i guess
2017-06-01 20:48:35 -05:00
PabstMirror
7bccf2f6be Fix IVs not showing in patient display (#5230)
Fix #5192 for 3.10
2017-06-01 10:28:47 -05:00
SilentSpike
fea2326488 Add cargo eden attributes (#4780)
- Add a ace_cargo_space attribute to vehicles to alter how much cargo they can carry.
- Add an ace_cargo_size attribute to objects to alter how much cargo space they consume.
- Add two public functions `fnc_setSize.sqf` and `fnc_setSpace.sqf` to update the cargo size/space respectively of any given object.
- Deprecate cargo makeLoadable module and public function.
- Added some macros to get the space/size of a config, making code more readable in places.
2017-05-31 23:54:57 +01:00
SilentSpike
cbe06e5bc7 Fix zeus interaction locality (#5214)
- The `setUnitPos`, `setFormation`, `setSpeedMode` and `setBehaviour` commands require local arguments
- The waypoint equivalents require server execution
- Add conditions to only show interactions when the appropriate things are selected
2017-05-31 22:21:44 +01:00
PabstMirror
00b91bed45 Minor fixes, cleanup, add lint ignore directives (#5176)
- Fix bug in getNumberMagazinesIn (func not used)
- Fix bug in seekerFindLaserSpot (func not used yet)
- Everything else is just cleanup
2017-05-31 22:09:36 +01:00
SchmittAkaSmallfly
d90f15ac7d Lower minimum speed limiter speed to 5 km/h (#5065)
* Update fnc_speedLimiter.sqf

* No minimum speed needed anymore

Minimum speed limit of 10 km/h was needed in the past due to engine limitations. Multiple user tests have shown that the minimum speed is not needed anymore. The new minimum of 0 km/h allows for example setting walking speed for vehicles (<10 km/h).

* Change minimum required speed for speed limiter to 3 km/h

To avoid problems with negative speeds (driving backwards) and zero speed, the current change switches from 10 km/h minimum speed to 3 km/h minimum speed. This seems to be the optimal solution to allow all relevant speeds including walking speed.

* Changed minimum required speed to 5 km/h

Officially the minimum required speed is 10 km/h in the master. Lower minimum needed to set car speed to walking speed of accompanying soldiers. Problems have been reported with 3 kmh/ using cars like ATVs.  Thus the new commit is set to 5 km/h minimum speed. Not tested with ATVs yet.
2017-05-31 15:45:02 -05:00
pokertour
38f691034e French translation missing (#5217)
* French translation for the two last entries

* French translation for the last entrie

* French Translation for the first entrie

* correct the spelling error
2017-05-31 20:53:41 +02:00
PabstMirror
bdab342548 Handle escape menu with toggle iteractMenu (#5144)
* Handle escape menu with toggle iteractMenu

* Work on non-cursor menu

* Close cursor menu if open when switching

* Update fnc_handleEscapeMenu.sqf
2017-05-31 11:41:53 -05:00
PabstMirror
e6a291bc3b Remove unit from laser pointer list if laser removed (#5190) 2017-05-31 11:31:10 -05:00
PabstMirror
afe862324e Refuel - Add setting for hose length (#5224) 2017-05-31 11:30:48 -05:00
PabstMirror
4ad73446a6 Cleanup aircraft (#5197) 2017-05-31 11:30:29 -05:00
Dystopian
9f291c86d8 Cargo load menu overhaul (#4871)
* Add submenu with vehicles to cargo load menu

* replace private ARRAY with keyword

* fix ace function macro using

* filter vehicles without cargo

* add Load condition, clean params, fix param reusing

* replace nearEntities with nearestObjects, add macro

* optimize, del magic, replace count with forEach

* del unused functions

* del useless _this parameter
2017-05-31 17:02:24 +02:00
Josuan Albin
5dc8859984 Add arsenal zeus modules (#4576)
* Add zeus arsenal modules

* Add french strings to arsenal modules

* Fix typo in french string

* Make changes to fit review

* locality check, use showMessage, set categroy
2017-05-31 08:42:45 -05:00
PabstMirror
cff86c35ba Fix ammo count hidden in UAVs (#5222)
* Fix ammo count hidden in UAVs

* Switch to ace_reload condition
2017-05-31 08:39:32 -05:00
Phyma
95ade30d56 Linkingbelt refactoring (#5213)
* Linking belt refatoring

startLinking belt now uses canLinkBelt so if condition needs to be changed then you can do it on one position.

* Fixed requested change

Fixed requested change

* simplified it even more

canLinkBelt now returns a value over 0 if success and -1 if something is not right.

* Fixed bug where if error we would not exit

Fixed bug where if error we would not exit

* changed name on canLinkBelt

Changed name to better reflect the function of the function.

* Author hype

* fixed return value info

fixed return value info

* fix header
2017-05-29 13:49:21 -05:00
Tim Beswick
3b7a3047cd Refuel for non-AllVehicle objects (#5151)
* Enabled refuel for non-AllVehicles objects. Un-magic'd refuel progress timer.

* Changed helper attach position to centre of object. Offset applied when rope attached.

* Made fully compatible with non-thingX simulation types. Removed destruction effects of helper object.

* Using arma model. Removed ACE_Actions from helper object.

* Correct use of hideObjectGlobal

* Remove actions, cargo, repair on helper

* Switched helper to be setVar'd on the nozzle object
2017-05-29 13:48:02 -05:00
magicsh0tz
cd852477c8 CH53 Fastroping and other fixes (#4713)
* CH53 Fastroping and Fixes

Added fastrope points for CH53.

The getOut EH is required to keep the doors open when a unit exits the
vehicle and it uses the vehicle animation "doorHandler_R" or
"doorHandler_L" as a placeholder to determine if the doors are
open(1)/close(0).
eg. In UH1Y (Unarmed), when the right door is opened using the
useraction, "doorRB" and "doorHandler_R" will be set to 1.

* Changed TAB to 4 spaces

* Moved bracket to follow guidelines
2017-05-29 12:55:53 -05:00
PabstMirror
ff212d5b3d Fix AB water vapor pressure calc (#4956)
* Fix AB water vapor pressure calc

* Fix calc in weather

* Cleanup usage of constant

* Add RVExtensionVersion, Rebuild AB DLLs
2017-05-29 12:55:26 -05:00
PabstMirror
58b15e4aa1 AdvThrow - Handle bugged currentThrowable (#5216) 2017-05-29 12:55:00 -05:00
Phyma
5145b89405 Linking belt refactoring (#5206)
* Linking belt refatoring

startLinking belt now uses canLinkBelt so if condition needs to be changed then you can do it on one position.

* Fixed requested change

Fixed requested change
2017-05-27 11:16:34 -05:00
Whigital
7509c629ec Correct compat classnames (#5204) 2017-05-27 09:46:56 -05:00
PabstMirror
d615cf27fc Adv Throw - Handle getShotParents being [] (#5210) 2017-05-27 09:46:31 -05:00
SilentSpike
2ca3716277 Fix Zeus teleport players module (#5175)
* Add dummy function to zeus UI modules

This removes the message about the module having no function when in SP.

* Fix zeus teleport module for non-local units

BI made a change to the function this module was using. So now it has to
be ran local to the player in question.
2017-05-26 16:07:33 +01:00
PabstMirror
772ca1313e RHS CH-47 - use animationSourcePhase (#5201) 2017-05-26 08:54:12 -05:00
SilentSpike
24966281e7 Add realistic names to dynamic loadout classes (#5185) 2017-05-26 07:57:46 +01:00
KoffeinFlummi
9791eb9eed Add AtixNeon to AUTHORS.txt 2017-05-25 12:02:17 +02:00
Andrea Verano
ca14b7f4b2 Zeus updated (#5198)
Fixes and adds in the zeus section
2017-05-24 23:38:58 -05:00
PabstMirror
114f402c58 Merge branch 'master' into medical-rewrite 2017-05-23 13:44:57 -05:00
Andrea Verano
e3fd1612e2 Italian translation (Add & Fix) (#5193)
Added Italian translation for:
-advanced fatigue
-advanced throwing
-cook off
-dogtags
-gunbag
-ui-scopes and much more...

Fixed a lot of grammatical errors
2017-05-23 13:44:17 -05:00
Arcanum
22e1cdfe35 Add myself as Author 2017-05-22 22:49:27 +02:00
Arcanum
2e856063cb Fix option in setting module 2017-05-22 22:43:03 +02:00
Arcanum
9895881ad9 Add options to disable AI going unconscious and for AI to die instantly 2017-05-22 22:16:18 +02:00
Arcanum
e3f9e65fb7 Revert "Add function to check if AI and condition from fatal"
This reverts commit 31e1e2964b.
2017-05-22 21:11:25 +02:00