Commit Graph

13205 Commits

Author SHA1 Message Date
6eb9c7e940 Fix medical vitals function calls 2018-05-08 09:17:47 +01:00
352d8cad31 Fix missing postInit error 2018-05-08 09:09:44 +01:00
1373e62cd0 Fix stringtable names 2018-05-08 08:52:59 +01:00
c92fd89c7a Fix pain percieved function calls 2018-05-08 08:47:03 +01:00
909ae27721 Fix function prep typos 2018-05-08 08:38:00 +01:00
fa98316424 Correct arsenal openBox center check (#6329) 2018-05-07 22:44:15 +01:00
2fae6754f5 Merge pull request #6327 from Dystopian/cleanup_deprecated_13
Clean up deprecated in 3.13
2018-05-06 10:48:36 +02:00
c35a53ba79 Clean up deprecated in 3.13 2018-05-05 21:54:13 +03:00
d68f67a1ef Arsenal - Fix weight stat for NVGs (#6325)
Fix #6320
2018-05-04 16:13:42 -05:00
2668bdc665 Check if suicide bomber isAwake (#6324)
Zeus - Don't trigger suicide bomber if unconsicous
2018-05-04 11:57:38 -05:00
5f67e81355 Fix suicide bomber explosion position (#6323) 2018-05-04 16:36:08 +01:00
898c01587a Optimize suicide bomber zeus module (#6314)
- decrease check frequency from each frame to 1 per second
- simplify some math
- remove some very redundant parenthesis
- re-formated if control structure for readability
- use more appropriate skillFinal
- macro to change check delay, set to 0 in debug mode for debug line drawing
2018-05-04 16:35:28 +01:00
ab23f4e4dc Map - Fix ambient light effect flicking (#6313)
* Map - Fix ambient light effect flicking

* Remove format

* formating
2018-04-28 17:23:59 -05:00
e9af086454 Interaction Menu - Add ability to change selector color (#6292)
* Add selector color changing

* Setup colors once at init
2018-04-28 17:23:44 -05:00
2454ade07b Quick Mount - Fix mount from water (#6310) 2018-04-28 14:34:52 -05:00
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
6559665b8b Use more status macros 2018-04-27 16:03:55 +01:00
7d55163463 Add missing PREPs 2018-04-27 15:43:41 +01:00
5bc57cd793 Remove missing function PREPs 2018-04-27 15:32:11 +01:00
d08cf4bdb7 Fix preprocessor includes 2018-04-27 15:21:49 +01:00
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
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
5bd4cfcf59 Fix status macros 2018-04-24 20:19:47 +01:00
e065ee239e Merge branch 'medical-rewrite' into medical-rewrite-restructure 2018-04-24 20:07:05 +01: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
5206b63d5a Fix medical interaction menu bleeding colours
This makes the bloodloss calculation used for the interaction menu icons
match the calculation used for the body image.
2018-04-20 12:28:18 +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
535e285c2c Fix cardiac arrest time scale (#6244)
This was changed from minutes to seconds at some point, but not
everywhere. Just making it consistent.
2018-04-18 23:25:44 +01: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