Commit Graph

12216 Commits

Author SHA1 Message Date
6814de0f3c Upgrade grunt versions used for building docs static assets 2018-04-26 20:31:27 +02:00
7b6b1eadcd Update coding-guidelines.md (#6303)
* Update coding-guidelines.md

* Update coding-guidelines.md
2018-04-26 10:04:00 -05:00
87c3a7a334 Zeus - Improve Editable Objects module and Cleanup (#6294)
* Improve Update Editable Objects ui and add icon

* Cleanup and remove broken attribute position

* Use QQGVAR
2018-04-24 18:46:59 +01:00
e7710d719b Add ace hearing support to the tank DLC helmet (#6296) 2018-04-23 17:47:41 +01:00
704dd66d38 Ace arsenal doc improvement (#6251)
* Add a part of the stats documentation

* Finish documenting stats

It's barebone but it'll do.

* Add EH list to ace arsenal framework doc

* Remove I form in framework doc, capitalize default loadouts

* Add section about importing BI VA loadouts
2018-04-19 14:03:53 -05:00
ec8115d2a4 Zeus - Toggle NVGs and Flashlights improvements (#6219)
* New Toggle NVG ui and improve function

* Add Toggle Flashlights icon

* New Toggle Flashlights ui and improve function

* Stringtable changes and ace_ai postInit clean up

* TRACE fix and stringtable capitalization
2018-04-19 14:01:26 -05:00
a828ebe591 Repair - Disable repair on ERA/Slat armor hitpoints (#6283)
* Repair - Disable repair on ERA/Slat armor

Disable "miscRepair" action for all era and slat armor hitpoints.
Can still be repaired via "Full Repair"

* Minor perf improvment

* Add hitpoint names for 1.82 comTurret/gun

* Fix russian translations
2018-04-19 12:31:00 -05:00
f4473ccfd3 Tactical Ladder - Fix args to cancleTLdeploy (#6280)
Fix #6232

cancelTLdeploy expects `[unit, mouse button key]`
2018-04-19 12:20:18 -05:00
853b4ffe0a Bump wiki version to 3.12.2 2018-04-19 12:07:14 -05:00
3ca1bd77b8 Build Number for RC2 v3.12.2 2018-04-16 23:38:58 -05:00
6dace8f380 Merge branch 'master' into release-3.12.2 2018-04-16 23:37:17 -05:00
336b8973c4 Rearm - Increase rearm distance check (#6276)
Fix #6177
2018-04-16 23:35:50 -05:00
7239ad561f Change ACE Hint preview (#6271) 2018-04-15 13:14:31 -05:00
bd754b6415 Rename ambiance sounds module (#6272) 2018-04-15 13:14:10 -05:00
451d50f4a2 Fix titan on blufor LSV (#6270) 2018-04-15 16:58:00 +01:00
4aa2ebc991 Merge pull request #6273 from acemod/getMissionConfigValue
getMissionConfigValue instead of missionConfigFile
2018-04-15 14:49:13 +01:00
ede072cd5c getMissionConfigValue instead of missionConfigFile 2018-04-15 12:59:14 +02:00
99299f285e NLAW - Fix "no shape for" rpt warning (#6269)
```
No shape for ammo type ACE_NLAW_Explosion
No shape for ammo type ACE_NLAW_ShapedCharge
```
2018-04-14 16:05:30 -05:00
f829180283 Fix realistic name for maverik pylon (#6263)
Fix #6260
2018-04-14 09:24:41 +01:00
5d039b72d6 Cookoff- Damage handling disabled by default (#6264) 2018-04-13 23:09:16 -05:00
6a4f2b1fda Hellfire - Fix hellfires not showing after 1.82 (#6259)
Inherit from RocketPods instead of scalpel which has changed
2018-04-13 23:08:56 -05:00
10a3a29ea0 Drop FCS from aircraft (#6265) 2018-04-13 23:08:39 -05:00
350711a86c Fix repair at dead vehicle (#6262) 2018-04-13 18:37:08 -05:00
13d338a789 make.py - cleanup old optional pbos before rename (#6254) 2018-04-12 12:16:44 -05:00
fa39e97203 Merge branch 'master' into release-3.12.2 2018-04-12 10:59:46 -05:00
1994e301fd More various ace arsenal fixes (#6192)
* Compile stats on preInit

* Remove uneeded check in add/removeStat

* Remove perf profiler vars

They aren't required anymore

* Fix case issue in verifyLoadout, remove uneeded line

* Fix ace arsenal cam not working porperly underwater

By removing those checks the cam is allowed to clip through objects and work properly underwater, sounds like features to me :D

* Fix gunbag behavior in ace arsenal

Switching between gunbags will keep the weapon, switching to another backpack then back to a gunbag will also keep the weapon.

* Fix text scaling in the searchbars and loadout name edit boxes

Also made the text bigger by default
2018-04-12 10:44:23 -05:00
468da8b79b Fix fastropes being blocked after rope breaking (#6239)
* add broken state

* add broke state

* add broken state

* add broken state

* add broken state
2018-04-12 10:23:18 -05:00
Kex
b7942fdb83 Remove arsenal when already present (#6246) 2018-04-12 09:25:57 -05:00
e7b7219bd9 Repair - Handle changes to getAllHitPointsDamage (#6250)
Since 1.82 `getAllHitPointsDamage` returns lower case
Fix track repair and hit point groups being case sensitive
Part of #6248
2018-04-12 09:15:57 -05:00
1217d912ef Prepare release 3.12.2 2018-04-11 22:20:47 +02:00
731ac2a268 Cleanup ace_vehicles for 1.82 (#6247)
Close #6220
2018-04-11 15:18:21 -05:00
5ea2069b76 Arma 1.82 compat (#6201)
* Arma 1.82 compat

* Add tank to required addons
2018-04-11 15:18:05 -05:00
3ca8105e9e Improve Reload TakeEH (#6242)
* Improve Reload TakeEH

* Simplify explosives take EH
2018-04-11 08:53:23 -05:00
7634f4657b Fix #6234 (#6235) 2018-04-09 22:50:57 -05:00
181d2ef5e1 fix #6237 (#6238) 2018-04-09 22:48:58 -05:00
b6b58d4860 Update headers 2018-04-10 03:55:28 +02:00
50abe911a5 Change stringToColoredText to accept a hex string (#6241) 2018-04-09 16:20:03 +01:00
d41779dc74 Fix getAllRearmTurrets (#6224) 2018-04-07 20:23:10 -05:00
ba9cff211a Refuel - Fix hint string not being localized (#6214) 2018-04-07 20:22:46 -05:00
743fbd4875 Cleanup old classnames (#6206)
Fix #6205
2018-04-07 20:22:14 -05:00
85cf4424f9 Fix german medical translation (#6223) 2018-04-02 00:59:47 -05:00
e1241da4a9 Fixes for portuguese translation of ACE medical (#6222)
* Update stringtable.xml

* Update AUTHORS.txt

* Update stringtable.xml

* Update stringtable.xml
2018-04-02 00:35:27 -05:00
fc6f4418d3 Fix french translation (#6180)
* Fix french translation

Fix french translation

* Changes from alganthe/Vdauphin
2018-04-02 00:34:20 -05:00
8548ff7eb8 Add support for Razor Wire on Prei Khmaoch Luong (#6199)
* Add support for Razor Wire on Prei Khmaoch Luong

* line for each model
2018-03-18 12:49:48 +01:00
2cad71cd1e Compat R3F: #6171 updated (#6195)
* gunlist_updated_according_presets

* scope_base_angle
2018-03-18 00:38:46 +01:00
b5eb4ac834 Fixed Slideshow action numbering (#6198)
Slideshow Action names would not be named on clients because counting was only done on the server, this would result in all actions on one object showing up in the same slideshow set
2018-03-17 18:12:33 +01:00
bda72663ac add acebot.json file
used for the ace help chat bot to get that config out of the code
2018-03-14 09:18:32 +01:00
b6a2315525 Allow local goggle effects to be set per client
From what I can see goggles are all handled locally and do not need to be globally enabled/disabled. If a group wants to force the setting, CBA provides optional force functionality.
2018-03-05 21:20:32 +00:00
5e71030301 AB and ACE3 ballistic : compat r3f updated (#6171)
* update_atragmx_presets

* update airFriction

* r3f_762x51_ball2=m993_ap
2018-03-03 18:34:40 +01:00
859b6a16f6 Fix error in ACE Arsenal stats (#6175)
* Fix the camera on remote units ending after ace arsenal closes

* Shorten handleStats, fix error with face, voice, insignia tabs

* Remove uneccessary code

You saw nothiiiiing.
2018-03-03 18:34:24 +01:00