Commit Graph

12067 Commits

Author SHA1 Message Date
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
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
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
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