Commit Graph

12045 Commits

Author SHA1 Message Date
PabstMirror
741407f6e1 Arsenal - Add stat for scope magnification (#6150) 2018-02-18 02:32:19 +01:00
Orbis2358
5bb27a28a7 Korean translations fix (#6151)
* Korean translations fixed

Avulsion: 적출상
Laceration: 열상
Crush: 압궤상
Puncture Wound: 자상

* Update AUTHORS.txt
2018-02-18 02:31:34 +01:00
PabstMirror
e95e83c01e
Cleanup userconfig from optionals (#6149) 2018-02-15 18:56:06 -06:00
PabstMirror
4ec1039490
Add missing semicolons (#6148) 2018-02-15 10:31:14 -06:00
Josuan Albin
1d6e07d18f Add ACE Arsenal stats (#6110)
* Add test class

* Add stats mockup

* Merge branch 'master' of https://github.com/acemod/ACE3 into arsenalStats

* Finish mockup, add basic hide/show logic

* Add base for stats

* Use CBA EHs for stats to allow 3rd party mods of it

* Add handleStats and most of the UI behaviors for stats

* Continue work on stats

* Add container stats

* Add page support for stats

* Add text for the ROF stat

* Add accuracy in MOA for the accuracy stat

* Change accuracy shown number to 1 decimal instead of 2

* Add MIL in the dispersion stat text

* Change stats layout, remove dummy text strings

* Add some AB stats

* Remove last test string

* Replace configExtremes by normal lookup where it's relevant

* Add "undefined value" string when AB stat isn't present

Mostly for laucnhers

* Fix typo in preInit

* Change drag model stat to ballistic coef

* Fix issue with unused stats, change text to white when bar is present

* Rewrite some part of handleStats

Reason: add support for conditions, less redundant code, less reasons for dedmen to emasculate me

* Re-add _hideUnusedFnc, handle empty stats arrays

* Pass args to stat conditions, add test condition stat

* Add hearing related stats

* Remove the padding between stats and the stat bar / text

* Add strings for stats

* Change stats window to fit baer's suggestion

* Algin the close stats button, add missing strings

* Finish code review

* Add missing newline

* Remove duplicate strings

* Add explosive range stat

* Use proper string for the explo range stat

* Fix capitalization for ctrlParent

* Fix conditional stats blocking other stats

* Add better integration for ballistics, hearing and explosive stats

* Replace the private array in handleStat by params

* Add backblast stats

* Add backblast stat strings

* Add flashlight map color and g-force reduction stats

* Shorten preInit

* Change stats close button to fit arsenal design

* Improve stats page indicator look

* Rework how stats are stored and retrieved

* Remove args config entry, add priority entry, add vanilla weapon stats

* Add vanilla container stats

* Remove some lines in preInit

* Add ballistics stats

* Add hearing stats

* Remove uneeded config entries

* Add explosive range stat

* Add backblast stats

* Add spaces after semicolons in statements

To make JJ happy because I don't care.

* Add flashlights map color stat

* Add gforce reduction stat

FINALLY FUCKING DONE

* Fix headers for the new stats funcs

* Add add / remove stat API

* Fix typo in removeStat header

* Remove uneeded inline func

* Clean up add / remove stat

* Move all CfgACEArsenalStats entries to their own file

* Replace STR_ACE_Ballistics_statAmmo by a BI string

* Add script profiler related macro and code

* Use the highest ballistic coef instead of first one defined

* Add support for future ammo displayname

* Add ACE_standardAtmosphere for ballistic coef

* Add mag muzzle velocity stat

* Add weapon muzzle velocity stat

* Add comment explaining the ENABLE_PERF_PROFILING macro

* Change cfgACEArsenalStats to ACE_Arsenal_Stats

* Make JJ less pissy about spaces around =

* Fix indentation in weaponMuzzleVelocity, use param

* Use GVAR and EGVAR when appropriate

* Prefix all stats except the base class

* Fix Merge

* Fix aspect ratio scaling of stats panel

* Minor fixes
2018-02-15 10:03:22 -06:00
Whigital
f214b884a2 Settings strings (#6136)
* [hearing] Update strings

* [medical] Update strings

* [medical_ai] Update strings

* [medical_menu] Update strings

* [nametags] Update strings

* [nametags] Use existing DisplayName entries

* [medical_menu] Correct spelling

* [medical] Disable unreferenced setting

* [medical] Overdosing strings

* [medical_menu] Correct key IDs

* [repair] Update strings

* [medical] Correct spelling
2018-02-13 13:30:38 -06:00
Dystopian
e683c524d7 Map - Add Camping Light support (#6087)
* Add Camping Light support

* Add intensity check
2018-02-13 13:27:57 -06:00
Josuan Albin
04191e3c99 Fix ACE Arsenal interaction condition (#6140)
* Fix ACE Arsenal interaction condition

* Remove empty array
2018-02-10 13:13:59 -06:00
PabstMirror
1c6c7914dc
Interaction - Fix div0 error in getVehiclePos (#6139)
* Interaction - Fix div0 error in getVehiclePos

* Formating
2018-02-09 21:45:21 -06:00
PabstMirror
c864a6d569 Vehicle Lock - Convert to cba settings (#6133)
Switch vehicleStartingLockState from slider to list
Close #6014
2018-02-10 03:32:14 +01:00
PabstMirror
2b89b3102b HuntIR - Register as a feature cam (block NVG border) (#6138)
Fix #6135
2018-02-10 03:31:38 +01:00
PabstMirror
e73a2ddec0 NightVision - Add setting for shutter effects (#6134)
Also convert to cba settings
Close #6119
2018-02-10 03:31:22 +01:00
PabstMirror
4cabaa48b7
Pylons - Fix old weapons not being removed (#6100)
* Pylons - Fix old weapons not being removed

Fix  #6088
- Use removeWeaponTurret instead of removeWeaponGlobal
- Fix "Too Far" warning showing on completion

* Fix _x

* Fix var name

Co-Authored-By: Ozan Eğitmen <ozanegitmen@gmail.com>
2018-02-09 19:17:57 -06:00
Dystopian
59783a2e7a Small changes to persistent laserpointer (#6101) 2018-02-09 15:31:05 -06:00
Josuan Albin
8b9480de40 Add various misc improvements for ACE Arsenal (#6111)
* Disable anim previews when center isn't the player

* Abuse configs to change the edit loadout 3DEN entry

* Remove inheriting as it's not needed

* Remove uneeded condition

* Add zeus modules for ACE Arsenal, revert old arsenal modules

* Add 3 new arsenal EHs

* Add a setting to disable the identity tabs in ace arsenal

* Pass loadoutName in the onloadoutLoad EH

* Change foreach to forEach and ctrlcommit to ctrlCommit

* Resize the right window when the load bar isn't there

* Add a tooltip for the "clear container" button

* Improve onKeyDown, add classname copying using ctrl+c
2018-02-09 14:30:37 -06:00
commy2
eedb9fe614 weaponSelect CBA Setting (#5581)
* weaponSelectCBASetting

* Update to movedToSQF

* Add category
2018-02-09 14:28:34 -06:00
PabstMirror
ba5d44b848
Allow displayTextStructured to be moved via game layout settings (#6102)
* Allow displayTextStructured to be moved via game layout settings

Fix #6081

* Fix comment, add upperleft bounds check
2018-02-09 14:27:40 -06:00
PabstMirror
9e213f0e9a
Fix movedToSQF (#6124) 2018-02-09 14:27:21 -06:00
PabstMirror
e8da3e6435
Arsenal - Pass arsenal dispay to displayOpened event (#6109) 2018-02-08 13:42:07 -06:00
PabstMirror
5bef98d4ff
Decrease direct hit damage done by AGM-114N (#6121)
Fix #6114
2018-02-08 12:32:01 -06:00
PabstMirror
73e7ad5c79
Scopes - Use real zero for non-adjustable scopes (#6128) 2018-02-08 12:01:41 -06:00
Thomas Kooi
4179548417 Sort directories before extracting dependency information 2018-02-07 22:40:37 +01:00
ace3mod
f0b7203105 [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2018-02-07 22:15:51 +01:00
God of Monkeys
3c697ca80b Chinese Language Update (#6130)
Chinese Language Update
2018-02-07 15:15:15 -06:00
ace3mod
4534353e94 [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2018-02-06 21:31:02 +01:00
Thomas Kooi
f5e1a23ff2 Disable running deploy script on Travis CI 2018-02-06 21:30:09 +01:00
Thomas Kooi
ddf7046c44 Add run deploy job on master branch 2018-02-06 21:30:09 +01:00
BaerMitUmlaut
7b50d4a7a6 Add seperate setting for noise intensity (#6059) 2018-02-06 13:38:23 -06:00
Thomas Kooi
0ab8c1dde8 Use CI Python Docker image to speed up build times 2018-02-06 19:46:12 +01:00
Dystopian
f0a2b68f3d Aircraft - Disable scripted eject if vehicle is locked (#6096)
* Add lock check

* Delete seat lock check
2018-02-04 12:47:54 +01:00
mharis001
27504468e4 Change cargo menu to look better (#6112) 2018-02-01 16:41:56 -06:00
BrenSilent
4258b9a6d6 [German Translation] Update for new Settingsmenu (#6015) (#6016)
* German translation update

This updates partially the german translation for the new cba settings UI

* Fix tooltipp

Fixes the tooltipp for the safezone when switching units

* Fixes

Various fixes after review

* Missed two

Fix in stringtable for arsenal

* Gonna catch em all

Another small mistake i missed.
2018-02-01 12:09:11 -06:00
Jo David
db93a42891 add muffling to new LOW headsets (#6106) 2018-01-31 16:19:28 -06:00
PabstMirror
1b6dc5ae2d
HuntIR - Fix connecting when ammo is null (#6099)
Fix #6093

`[_nearestHuntIRs select 0] call FUNC(cam);` would pass nill
Also delay opening GUI for a frame to prevent issue with interaction menu
2018-01-30 21:50:24 -06:00
PabstMirror
4857294510
Advanced Throwing - Disable when controlling UAV (#6092)
Close #6069
2018-01-30 10:54:34 -06:00
mharis001
b30e188d1a Change ace_map settings to use CBA init directly (#5984)
* Make default channel setting a list

* Convert more map settings to CBA

* Give BFT settings own category

* Remove '?' from end of setting display names

* Fix mistake of ACE_Settings removal (movedToSQF = 1)

* Move settings to initSettings.sqf
2018-01-28 15:50:28 -06:00
sbng-PAPA
6ce8b8473a korean translate 3.12.x (#6071) 2018-01-28 15:42:32 -06:00
Josuan Albin
29a0b2ef09 Misc arsenal fixes (#6083)
* Change backpack and scope checks in scanConfig and addVirtualItems

Reason: was not a good implementation
Might cause issue of people compalining about tents.

* Give IDC to menuBar controls, disable import button in MP

Reason: copyFromClipboard is disabled in MP

* Add tooltip strings for the loadouts, export, import menu buttons

* Remove double space in onArsenalOpen
2018-01-28 15:39:46 -06:00
Brunius
cc503e041b Add pylon whitelist option (#6080)
* Adding pylon whitelist option

* Changing tabs to spaces :(

* Changing to use QGVAR

* Changing name in QGVAR to more clearly reflect function of variable

* Docs for the magazine whitelist function in pylons

* Changes to match style guide

* More docs

* More tabs

* Update pylons-framework.md

* Update pylons-framework.md
2018-01-28 15:38:48 -06:00
BaerMitUmlaut
3c04d61a0d Fix medical AI activation (#6077) 2018-01-24 19:08:39 +01:00
Mark Ruffner
f46082a1fe fix (another) missing call (#6079) 2018-01-24 08:18:42 +01:00
Mark Ruffner
8ba81c53a3 Add spectator handling of grenades (#6012)
* Handle non-local vanilla grenade tosses

* handle advanced throwing grenades

* Track through events

* Add missing calls
2018-01-23 00:31:44 +01:00
PabstMirror
46a31e1f9c Add ace hellfire support to rhs apaches (#6056)
Close #5956
2018-01-22 23:15:23 +01:00
Laid3acK
9a9a2d0944 R3F compat: dispersion overhaul & AtragMx presets (#6003)
* dispersion_overhaul

* atragmx_presets
2018-01-22 23:09:40 +01:00
Jo David
693b8e468d
Merge pull request #6065 from chris579/patch-1
Enabled cancel button when exiting arsenal
2018-01-20 11:22:20 +01:00
Christian Klemm
7ba394c711
Enabled cancel button when exiting arsenal 2018-01-19 18:21:01 +01:00
classic
00af6844cd Update jpn translations (#6031)
* Update Japanese translation

* Update Japanese translation

* Update Japanese translation
2018-01-18 20:16:24 -06:00
jonpas
88963cdae8 Prepare release 3.12.1 (build 2) 2018-01-15 21:35:34 +01:00
jonpas
7c97e5fab6 Merge branch 'master' into release-3.12.1 2018-01-15 21:34:21 +01:00
Dystopian
70ca4d01a7 Fix house-type object carrying in building (#6049) 2018-01-15 19:02:06 +01:00