Commit Graph

11468 Commits

Author SHA1 Message Date
Wakbub
fd48c7fba9 Update the Wiki for the Settings Framework (#5363)
* Update settings-framework.md

Modifications and extensions.

* Update settings-framework.md

Replacement of the bulleted list with a numbered list, as the steps are in chronological order. Removal of superfluous text.
2017-07-19 21:01:25 +02:00
PabstMirror
13293ee7aa Add hellfire support to CUP vehicles (#5367) 2017-07-19 13:59:23 -05:00
Dissyu
a7954368f4 Fix Chinese content & missing string (#5375)
* Fix missing string with stringtable

Fix Advanced Fatigue & QuickMount

* Fix Chinese content & missing string

* Fix Gestures & DAGR missing string

* Fix quickmount string with vanilla string

* Remove adr97 unnecessary string
2017-07-19 20:57:20 +02:00
Broström.A | Evul
a18eec6bc0 Fixed a spelling error (#5373)
Change have have to have
2017-07-19 11:22:54 +02:00
jonpas
6aad1c8af6 Merge branch 'release' 2017-07-18 23:00:48 +02:00
Pawel W
0538647604 Add missing polish translations (#5370) 2017-07-16 23:14:59 -05:00
Glowbal
548b02ff8a Ingore issues and PRs marked as stale (#5369) 2017-07-16 08:55:44 +02:00
Tim Beswick
a53dfe1f3b Updated gitbot labels (#5368) 2017-07-15 22:05:17 +02:00
Jo David
ac1c0cc850 add new acerep (#5356)
* add new acerep

* fix typos

* change date
2017-07-14 18:14:10 +02:00
Wakbub
2c97865e02 Correct typos ("enginer" to "engineer") (#5355)
* Update ACE_Settings.hpp

Correction of typos.

* Update CfgVehicles.hpp

Correction of typos.

* Update stringtable.xml

Correction of typos.

* Update AUTHORS.txt

In accordance with your process of merging pull requests.
2017-07-11 12:50:35 -05:00
jonpas
23cf08c237 Prepare release 3.10.2 2017-07-11 00:21:09 +02:00
Dystopian
fdaa5891f6 Fix adv. throw key handling when reloading (#5336)
* Fix throw key handling when reloading

* Consider UGL reload to ace_common_isReloading var

* Fix if space, change private var assign

* Shorten UGL check
2017-07-10 21:44:24 +02:00
Dystopian
dd3a66a643 Fix adv. throw key handling when reloading (#5336)
* Fix throw key handling when reloading

* Consider UGL reload to ace_common_isReloading var

* Fix if space, change private var assign

* Shorten UGL check
2017-07-10 21:44:02 +02:00
jonpas
8f494e08ae Add support for Tanoa and Malden Fuel Pumps, Flexible Tanks and Fuel Canister (#5353)
* Add support for Tanoan fuel pumps, Flexible Tanks and Fuel Canister (as jerry can)

* Add to Land_FuelStation_01_pump_malevil_F

* Add Malden/Jets to required addons

* REQUIRED_VERSION 1.72
2017-07-10 21:42:21 +02:00
jonpas
13d7de9c92 Prevent taking nozzle if already carried (#5352) 2017-07-10 21:42:11 +02:00
jonpas
84061cb593 Add support for Tanoa and Malden Fuel Pumps, Flexible Tanks and Fuel Canister (#5353)
* Add support for Tanoan fuel pumps, Flexible Tanks and Fuel Canister (as jerry can)

* Add to Land_FuelStation_01_pump_malevil_F

* Add Malden/Jets to required addons

* REQUIRED_VERSION 1.72
2017-07-10 21:41:37 +02:00
jonpas
6253ec0915 Prevent taking nozzle if already carried (#5352) 2017-07-10 21:41:23 +02:00
jonpas
980e3d255e Update homepage version numbers
[ci skip]
2017-07-10 17:19:50 +02:00
PabstMirror
ddd14d933d Fix rearm turret events (#5307) 2017-07-10 17:18:11 +02:00
PabstMirror
c28628aed2 Fix rearm turret events (#5307) 2017-07-10 17:17:44 +02:00
Tim Beswick
597f439654 Changed hellfire interaction check & added N variant (#5294)
* Changed weapon check for interaction to generic ace_hellfire_enabled value

* Added November hellfire variant

* Cleanup

* +1
2017-07-10 16:49:10 +02:00
PabstMirror
ef90a069b7 Rallypoints- Don't modify setVar if already set (#5347) 2017-07-10 16:48:22 +02:00
PabstMirror
01c17271bc Handle locked doors (#5345) 2017-07-10 16:48:13 +02:00
PabstMirror
6acd61a68e Fix broken fonts for map gps display (#5337)
EtelkaNarrowMediumPro broke with 1.72 hotfix
2017-07-10 16:47:52 +02:00
Joko
59add40db6 Fix the issue that SFX variants are not global (#5335)
* Fix the issue that SFX variants are not global what means that different players can get different pressure Cookoff sounds

to prevent that i split up the sounds in 3 types and used a Weighted select to have the befor used values back

* add todo for 1.74

* inherit in CfgSFX from 1 class
2017-07-10 16:47:39 +02:00
jonpas
fa3743ca54 Correct new Chinese stringtable identifiers (#5334) 2017-07-10 16:47:26 +02:00
0dr
c45927b5f6 fix #5324 (#5325) 2017-07-10 16:47:10 +02:00
PabstMirror
08ab3307af Allow repairing from slingload pods (#5316) 2017-07-10 16:46:58 +02:00
PabstMirror
e9fb0e9b20 Add cargo space to huron containers (#5315) 2017-07-10 16:46:49 +02:00
classic
dc303aa29f Japanese translation d02dacf (#5309)
* add the Jpn translation for repair

add the Japanese translation for repair

* minor fix to Jpn translation for medical

minor fix to Jpn translation for medical
2017-07-10 16:46:25 +02:00
PabstMirror
e4ac748f6f Handle ace_cargo_canLoad set to scalar (#5306) 2017-07-10 16:46:14 +02:00
PabstMirror
e6b875b252 Add XEH to ace_module (#5304) 2017-07-10 16:46:02 +02:00
PabstMirror
91465632ee compats - Fix config name for resupply vics (#5300) 2017-07-10 16:45:39 +02:00
GodofMonkeys
0ccbeb25e9 Add Chinese Traditional & Simplified Localization (#5295)
Add Chinese Traditional & Simplified Localization
2017-07-10 16:45:22 +02:00
PabstMirror
f207b6c13b Modify JoinGroup action to show group name (#5287)
* Modify JoinGroup action to show group name

* header

* Header
2017-07-10 16:44:00 +02:00
PabstMirror
a83efa8e36 Repair - Handle depends = "0" (#5283)
* Repair - Handle depends = "0"

* quote
2017-07-10 16:43:48 +02:00
classic
317fe93c2d Jpn translate feee7f5 (#5280)
* Add the Jpn translation for quickmount

Add the Japanese translation for quickmount

* Update the Jpn translation for repair

Update the Japanese translation for repair
2017-07-10 16:43:27 +02:00
PabstMirror
153fc975f5 Refuel - change nozzle position calc (#5279) 2017-07-10 16:43:14 +02:00
classic
483b41b717 Jpn translate 73bd37 (#5277)
* Update the Jpn translation for cargo

Update the Japanese translation for cargo

* Add the Jpn translation for hellfire

Add the Japanese translation for hellfire

* Add the Jpn translation for nlaw

Add the Japanese translation for nlaw

* Add the Jpn translation for rearm

Add the Japanese translation for rearm

* Update the Jpn translation for refuel

Update the Japanese translation for refuel

* Update the Jpn translation for repair

Update the Japanese translation for repair

* Update the Jpn translation for zeus

Update the Japanese translation for zeus
2017-07-10 16:43:03 +02:00
Laid3acK
d0a28b956e gos ndjenahoud latitude (#5275) 2017-07-10 16:42:53 +02:00
PabstMirror
af0f7f36d8 Make array of cargo holders dynamic (#5274) 2017-07-10 16:42:41 +02:00
PabstMirror
bb8d5cadd7 Cleanup heli pod actions (#5271)
Close #4783
- Make taru pods non loadable
- Make taru pods non draggable
- Increase interaction range for huron pods
2017-07-10 16:42:28 +02:00
Christian Klemm
16439f5640 Add ability to abort module destination (#5284)
* Add the ability to abort a module action via ace_zeus_fnc_getModuleDestination
* Action can be aborted by pressing ESC
* Current position is still passed to the code callback
2017-07-10 12:41:35 +01:00
PabstMirror
4483045604 Rallypoints- Don't modify setVar if already set (#5347) 2017-07-09 16:15:14 -05:00
PabstMirror
5c713fcc2a Add cargo space to huron containers (#5315) 2017-07-08 14:01:15 -05:00
PabstMirror
cb911c91ef Allow repairing from slingload pods (#5316) 2017-07-08 14:01:05 -05:00
PabstMirror
cddc34e08a Handle locked doors (#5345) 2017-07-08 13:23:28 -05:00
PabstMirror
f210f63bd9 Fix broken fonts for map gps display (#5337)
EtelkaNarrowMediumPro broke with 1.72 hotfix
2017-07-08 13:23:06 -05:00
Laid3acK
7a3d15d37c Minor update Wiki AtragMx (#5322)
* update wiki atragmx

* Add files via upload
2017-07-08 10:10:40 -05:00
0dr
0958eff89e fix #5324 (#5325) 2017-07-08 10:07:39 -05:00