Commit Graph

13541 Commits

Author SHA1 Message Date
97307769f0 Merge pull request #7285 from acemod/flashMuzzle
Flashsuppressors - Update muzzle configs
2019-11-27 06:30:53 +01:00
c13148a9c4 Flashsuppressors - Update muzzle configs 2019-11-26 17:19:07 -06:00
70438133f2 fix repair strings (#7284) 2019-11-26 16:08:41 -06:00
f3535e436c Update Japanese translation (#7262)
* Update Japanese translation

* Update Japanese translation

* Update stringtable.xml

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update stringtable.xml

* Update stringtable.xml
2019-11-26 14:08:14 -06:00
bux
82254b5ef1 add HorribleGoat to authors 2019-11-24 21:21:14 +01:00
bux
ff5159f6c7 Add custom rtm for holding flashlight, move flashlight in p3d to better fit holding animation, add model.cfg required for binarizing rtm 2019-11-24 21:10:01 +01:00
829240a93a Merge pull request #7279 from Whigital/kestrel_layer_fix
[kestrel_4500] Update hardcoded layer id
2019-11-24 00:40:05 +01:00
a30ae203f7 [Docs] Update component dependencies
Automatically committed through CI.

[ci skip]
2019-11-23 12:38:23 +01:00
adbf799340 Use @ace3mod for documentation updates (#7281) 2019-11-23 12:37:26 +01:00
772a0fcd6a Alt. syntax in favor of obsolete BIS func. 2019-11-22 21:47:51 +01:00
8ad6d3ccff Update hardcoded layer id 2019-11-22 20:14:26 +01:00
bux
b615bc4614 correct paths in p3ds 2019-11-22 18:38:30 +01:00
bux
5e45e85af8 add maglite to config, add missing quotes 2019-11-21 18:30:39 +01:00
bux
c28b5af1a2 tab -> spaces 2019-11-21 18:26:31 +01:00
bux
516145210f Add Maglite ML300L 2019-11-21 18:20:05 +01:00
bux
89266d8c84 make mx_991 name uniform 2019-11-21 16:55:27 +01:00
bux
c6a31ebff4 make maglite_xl50 name uniform 2019-11-21 16:09:28 +01:00
bux
6de01d5c5d make ksf_1 name uniform 2019-11-21 16:05:36 +01:00
bux
f84949e7ae fix typo in maglite p3d name 2019-11-21 15:59:52 +01:00
2b4d807acc Add stringtable validation tool (#7274)
* Add stringtable validation tool

* Add to CI
2019-11-18 12:48:40 -06:00
a5ec4b6306 Update texture (make sure to squash&merge) 2019-11-18 16:41:28 +01:00
f99157604f Tagging - Group spray paint items in Arsenal (#7268)
* group spray paint in arsenal

* Title case

* Make Polish translation of Spray Paint items groupable
2019-11-16 13:15:28 -06:00
00a91610ea Only play repatitive sounds when game is focused (#7265) 2019-11-16 12:42:15 -06:00
5a4f76efb0 Spectator - Restore HUD when coming out of spectator (#7191)
Fixes #7186
2019-11-05 12:47:46 -06:00
42233ee449 Add czech translation (#7260)
Add more czech translations
2019-11-05 12:37:21 -06:00
5033a98353 Fixing playsound3d limits (#7024) 2019-11-05 12:14:33 -06:00
5d07029db7 Cookoff - Allow enabling only on player crewed vehicles (#7147)
* Add setting for cookoff to only run for player crewed vehicles

* No point having per vehicle selection

* Merging mutliple settings in to one

* Fixing missing comma

* Using LSTRING for settings

* merging suggested fixes

* Moving enabled check to fnc

* Use existing strings for CBA options

* Reverting change to support legacy eden attribute settings

* Adding Pabsts fix for 3den attribute

* Update addons/cookoff/CfgEden.hpp

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-11-05 11:55:15 -06:00
2c5df0be77 Update No Uniform Restrictions for vanilla 1.92-1.96 (#7259) 2019-10-31 04:18:08 +01:00
82c6c343b2 Map - Fix map shake (#7252) 2019-10-29 17:10:54 -05:00
40a66f0bde Add some editor previews (#7254) 2019-10-29 17:10:40 -05:00
0e485ce5fc Arsenal - Fix script error for weapons with 3+ muzzles (#7256) 2019-10-29 17:10:03 -05:00
691e8d24c6 Repair - fix string (#7251) 2019-10-28 19:18:26 -05:00
e78016d7f7 Repair - Add settings to control item requirements for different actions (#7243) 2019-10-24 22:52:04 -04:00
f9d181c72e Medical - Fix addDamageToUnit (#7247) 2019-10-20 16:48:26 -05:00
c37783de0b Medical - Change WoundReopening default setting (#7246) 2019-10-20 16:46:30 -05:00
da5e9525b4 Medical - Make some constants variables (#7236)
* Medical - Make some constants variables

* Add comments about varNames, calc k/l at runtime
2019-10-20 11:14:31 -05:00
2a6d555091 Merge pull request #6955 from acemod/cbaDisposable
Disposable - switch NLAW to CBA disposable system and remove ace_disposable functionality
2019-10-17 20:57:14 +02:00
e76aeba45f Apply suggestions from code review
Co-Authored-By: jonpas <jonpas33@gmail.com>
2019-10-17 13:28:05 -05:00
37284bd0e8 Update docs 2019-10-17 13:17:37 -05:00
bccf170573 Merge branch 'master' into cbaDisposable 2019-10-17 13:01:07 -05:00
3946928cbe Refuel - Add events for start, stop and progress (#7023)
* Add refuelTick Event

* Add refuelStarted event

* Add refuelStopped event

* Add event documentation

* Rename events

Fix EOF

* Rename one more event
2019-10-13 13:08:35 -05:00
2e5cdbd62c Explosives - Add ace_isEOD 3DEN attribute (#7080)
* Add ace_isEOD 3DEN attribute

* Apply suggestions from code review

Co-Authored-By: commy2 <commy-2@gmx.de>
2019-10-13 12:22:46 -05:00
342e881fda Debug to clipboard - Cleanup settings dump (#7240) 2019-10-13 12:21:55 -05:00
9ac543aacc Medical - Rename private version of setUnconscious (#7237) 2019-10-12 09:47:57 -05:00
8c7f8d7d6a Medical Feedback - effects overhaul (#7215)
* Intensify pain effects

* Add chromatic abberation effect, add blur with very high pain

* Add option for limited pain effects with only high pain blur

* Fix playInjuredSound

* Add instant feedback effects update when getting hit

* Cleanup

* Overhaul playInjuredSound

* Fix voice detection, simplify nearby unit filter

* Apply suggestions from code review

* Add Chromatic Aberration translations

* Use while loop instead of configClasses

* detach say3d dummies before deleting
2019-10-11 15:00:53 -05:00
bb0461be16 Fast medical item replacement (#7224)
* Add item replacement framework

* Correctance of English

Co-Authored-By: Dedmen Miller <dedmen@users.noreply.github.com>

* Remove unecessary code

* Use new item replacement framework for medical items

* minor fixes, support GVAR(convertItems) setting

* use forEach, convert atropine to epi

* replace with adenosine
2019-10-11 15:00:25 -05:00
6ca4b2075d Nametags - Add Nation Ranks (#7094)
* Adds icon and postInit

Adds German, British, Spanish, French ranks. Also adds postInit code
that loops through all factions and checks if ranks have been set there
in there for easy, permanent customistability.

* Removed white space

* commy2's postInit rewrite

Changes faction config entry to array with macros and changes the
postInit code to commy2's improved version.

* Update addons/nametags/CfgFactionClasses.hpp

Co-Authored-By: Dedmen Miller <dedmen@users.noreply.github.com>

* Adjusted arrays to be multi line

Also removed white space.

* Update addons/nametags/XEH_postInit.sqf

Co-Authored-By: commy2 <commy-2@gmx.de>

* Update addons/nametags/CfgFactionClasses.hpp

Co-Authored-By: commy2 <commy-2@gmx.de>

* Add getVar setting, don't overwrite if already set
2019-10-08 23:20:26 -05:00
2f3d8db134 Medical - Report non-default settings to rpt (#7233)
* Medical - Report non-default settings to rpt

* Update reportSettings.sqf
2019-10-08 12:03:05 -05:00
4eeac9f649 Medical - Death from sum of trauma (#7195)
* Medical - Death from sum of trauma

* fixes

* Update fnc_determineIfFatal.sqf
2019-10-08 10:45:09 -05:00
a71879ccea Medical - Increase severity of falling damage and Improve non-selectionSpecific wounds (#7214)
* Medical - Increase severity of falling damage

* Improve non-selectionSpecific wounds

* Use macros for hitpoint indexes
2019-10-08 10:44:49 -05:00