Commit Graph

12434 Commits

Author SHA1 Message Date
Dystopian
2454ade07b Quick Mount - Fix mount from water (#6310) 2018-04-28 14:34:52 -05:00
Cuel
265bc62259 (repair) - isRepairVehicle handling values according to wiki (#6278)
* handle boolean and integer

* check if value is 1 or true
2018-04-27 10:30:03 -05:00
commy2
fbacf1a3e4
Merge pull request #6183 from DeliciousJaffa/patch-1
Allow goggle effects to be set locally per client
2018-04-27 01:14:51 +02:00
Thomas Kooi
6814de0f3c Upgrade grunt versions used for building docs static assets 2018-04-26 20:31:27 +02:00
PabstMirror
7b6b1eadcd
Update coding-guidelines.md (#6303)
* Update coding-guidelines.md

* Update coding-guidelines.md
2018-04-26 10:04:00 -05:00
mharis001
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
Josuan Albin
e7710d719b Add ace hearing support to the tank DLC helmet (#6296) 2018-04-23 17:47:41 +01:00
Josuan Albin
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
mharis001
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
PabstMirror
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
PabstMirror
f4473ccfd3
Tactical Ladder - Fix args to cancleTLdeploy (#6280)
Fix #6232

cancelTLdeploy expects `[unit, mouse button key]`
2018-04-19 12:20:18 -05:00
PabstMirror
853b4ffe0a Bump wiki version to 3.12.2 2018-04-19 12:07:14 -05:00
PabstMirror
3ca1bd77b8 Build Number for RC2 2018-04-16 23:38:58 -05:00
PabstMirror
6dace8f380 Merge branch 'master' into release-3.12.2 2018-04-16 23:37:17 -05:00
PabstMirror
336b8973c4
Rearm - Increase rearm distance check (#6276)
Fix #6177
2018-04-16 23:35:50 -05:00
mharis001
7239ad561f Change ACE Hint preview (#6271) 2018-04-15 13:14:31 -05:00
mharis001
bd754b6415 Rename ambiance sounds module (#6272) 2018-04-15 13:14:10 -05:00
PabstMirror
451d50f4a2 Fix titan on blufor LSV (#6270) 2018-04-15 16:58:00 +01:00
commy2
4aa2ebc991
Merge pull request #6273 from acemod/getMissionConfigValue
getMissionConfigValue instead of missionConfigFile
2018-04-15 14:49:13 +01:00
commy2
ede072cd5c
getMissionConfigValue instead of missionConfigFile 2018-04-15 12:59:14 +02:00
PabstMirror
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
PabstMirror
f829180283 Fix realistic name for maverik pylon (#6263)
Fix #6260
2018-04-14 09:24:41 +01:00
PabstMirror
5d039b72d6
Cookoff- Damage handling disabled by default (#6264) 2018-04-13 23:09:16 -05:00
PabstMirror
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
PabstMirror
10a3a29ea0
Drop FCS from aircraft (#6265) 2018-04-13 23:08:39 -05:00
Dystopian
350711a86c Fix repair at dead vehicle (#6262) 2018-04-13 18:37:08 -05:00
PabstMirror
13d338a789
make.py - cleanup old optional pbos before rename (#6254) 2018-04-12 12:16:44 -05:00
PabstMirror
fa39e97203 Merge branch 'master' into release-3.12.2 2018-04-12 10:59:46 -05:00
Josuan Albin
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
shukari
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
PabstMirror
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
jonpas
1217d912ef Prepare release 3.12.2 2018-04-11 22:20:47 +02:00
PabstMirror
731ac2a268
Cleanup ace_vehicles for 1.82 (#6247)
Close #6220
2018-04-11 15:18:21 -05:00
PabstMirror
5ea2069b76
Arma 1.82 compat (#6201)
* Arma 1.82 compat

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

* Simplify explosives take EH
2018-04-11 08:53:23 -05:00
blaffer
7634f4657b Fix #6234 (#6235) 2018-04-09 22:50:57 -05:00
shukari
181d2ef5e1 fix #6237 (#6238) 2018-04-09 22:48:58 -05:00
rufix
b6b58d4860 Update headers 2018-04-10 03:55:28 +02:00
Dedmen Miller
50abe911a5 Change stringToColoredText to accept a hex string (#6241) 2018-04-09 16:20:03 +01:00
PabstMirror
d41779dc74
Fix getAllRearmTurrets (#6224) 2018-04-07 20:23:10 -05:00
PabstMirror
ba9cff211a
Refuel - Fix hint string not being localized (#6214) 2018-04-07 20:22:46 -05:00
PabstMirror
743fbd4875
Cleanup old classnames (#6206)
Fix #6205
2018-04-07 20:22:14 -05:00
Drofseh
caa13cd19e update tracer_white.rvmat
I'm not sure why the R, G, and Y tracers have this commented out line,
but I figure white should match.
2018-04-06 16:59:59 -07:00
Drofseh
e99ac23ffd Set tracers that are white vanilla to white in ACE 2018-04-02 10:32:40 -07:00
PabstMirror
85cf4424f9
Fix german medical translation (#6223) 2018-04-02 00:59:47 -05:00
lugubrioushatchling
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
xnooztvFR
fc6f4418d3 Fix french translation (#6180)
* Fix french translation

Fix french translation

* Changes from alganthe/Vdauphin
2018-04-02 00:34:20 -05:00
Drofseh
11b58576e4 Add more missing ammo classes from Apex and Carts
- B_50BW_Ball_F and B_580x42_Ball_F
- Sub_F_Signal_Green and Sub_F_Signal_Red
* also moved the 5.45x39 classes into alphabetical order with the other
assault rifle ammo
2018-04-01 22:12:55 -07:00
Drofseh
14300a3dda Add missing some missing ammo classes from Apex
- 5.45 and 7.62x39mm
2018-04-01 20:23:12 -07:00