Commit Graph

12242 Commits

Author SHA1 Message Date
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
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
jonpas
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
Laid3acK
2cad71cd1e Compat R3F: #6171 updated (#6195)
* gunlist_updated_according_presets

* scope_base_angle
2018-03-18 00:38:46 +01:00
vabene1111
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
Jo David
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
Jaffa
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
Laid3acK
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
Josuan Albin
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
mharis001
8ee7c1b132 Shorten handleStats window resize (#6176) 2018-03-03 18:33:29 +01:00
ulteq
21ae61e551 Fix allowSwapBarrel condition (#6170) 2018-02-27 17:35:03 -06:00
Dystopian
3feafc449f Interaction - Add Flip and Push actions to Quad Bike, Kart and Static Weapons (#6019)
* Add Flip and Push actions to Quad Bike

* Add actions to karts and static weapons

* Move magic number to macro

* Ditch here is

* Move condition to function
2018-02-26 12:23:47 -06:00
Dystopian
a2804f6097 Add Camping Light interaction (#6078)
* Add camping light interaction

* Add dragging

* Add cargo loading

* Handle Camping_Light_off objects

* Fix work in MP

* Replace action with command
2018-02-26 12:12:21 -06:00
Josuan Albin
d4825f920f Add note in options menu doc (#6167)
It's deprecated, better indicate it.
2018-02-25 20:19:16 +01:00
Dystopian
ee7a1f6acb Improve class initialization (#6085) 2018-02-24 12:39:03 -06:00
mharis001
bca8b01860 Various additions to ace_zeus (#6036)
* Add search to teleport players UI

* Change group side icons to look better

* Improve teleport UI and add stringtable entries

* Add Assign Repair Vehicle module

* Add Assign Repair Facility module

* Add Assign Engineer module

* Add Full Heal module

* Add Suicide Bomber module

* Make heal module work without ace_medical

* Add suicide bomber module translations

* Improve attribute cargo to use displayName

* Improve set engineer ui

* ACE_Curator for repair modules + author array

* Add angle param to getModuleDestination

* Prevent multiple suicide bomber modules on same target

* Heal module: support BI scripted revive system

* Requested changes
2018-02-24 11:44:57 -06:00
mharis001
e813af667f BFT settings subcategory (#6165) 2018-02-23 23:40:47 -06:00
PabstMirror
04bb3d981c
InteractionMenu - Always compile before adding main action (#6156) 2018-02-23 23:30:33 -06:00
PabstMirror
f70dfaf160
Arsenal - Compile stats on first use (#6159)
* Arsenal - Compile stats on first use

* fix )
2018-02-23 23:30:15 -06:00
Josuan Albin
123c19c1c0 Scope stats and ballistic stats improvement (#6164)
* Hide some of the ballistic stats if config value not defined

ACE_magMuzzleVelocity
ACE_bulletMass
ACE_ballisticCoef

* Add vertical and horizontal scope limits stats
2018-02-23 23:29:41 -06:00
commy2
1835ccebb8 Fix empty return value of getUnitTrait (#6160) 2018-02-21 11:05:17 +01:00
John Lillis
d64a0c6728 Remove SwayFactor ACE setting and module addition 2018-02-18 11:09:49 -05:00
PabstMirror
8b99ccecc4 acex_fortify - add events to wiki (#6141) 2018-02-18 02:33:08 +01:00
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