Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

localized diary topics #1159

Closed
wants to merge 158 commits into from
Closed

localized diary topics #1159

wants to merge 158 commits into from

Commits on Jun 12, 2019

  1. Removed and replaced date topic from diary record

    @AndreasBrostrom
    AndreasBrostrom committed Jun 12, 2019
    Configuration menu
    Copy the full SHA
    ae72280 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2019

  1. fix scripted optics in pause menu in MP (CBATeam#1160) 

    * draw scripted optic in pause menu in MP

* draw scripted optic in pause menu in MP
    @commy2
    commy2 committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    2c326e2 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2019

  1. check masses of items of disposable framework (CBATeam#1161)

    @commy2
    commy2 committed Jun 14, 2019
    Configuration menu
    Copy the full SHA
    20b7c90 View commit details
    Browse the repository at this point in the history

  2. Reverted settings

    @AndreasBrostrom
    AndreasBrostrom committed Jun 14, 2019
    Configuration menu
    Copy the full SHA
    b261892 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2019

  1. update scripted optics effect radblur classes (CBATeam#1163)

    @commy2
    commy2 committed Jun 15, 2019
    Configuration menu
    Copy the full SHA
    0bd78ee View commit details
    Browse the repository at this point in the history

  2. rotate scripted optic according to weapon bank (CBATeam#1162) 

    * rotate scripted optic according to weapon bank

* handle launchers, pistols

* update variable names
    @commy2
    commy2 committed Jun 15, 2019
    Configuration menu
    Copy the full SHA
    cd8a239 View commit details
    Browse the repository at this point in the history

  3. add cartridge ejection effect on repeat (CBATeam#1158) 

    * add cartridge effect on repeat

* optimize

* velocity one frame later to fix drawn position in frame 0

* update variable names
    @commy2
    commy2 committed Jun 15, 2019
    Configuration menu
    Copy the full SHA
    6a42995 View commit details
    Browse the repository at this point in the history

  4. optimize CBA_fnc_randomVector3D (CBATeam#1164)

    @commy2
    commy2 committed Jun 15, 2019
    Configuration menu
    Copy the full SHA
    4e7a681 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2019

  1. handle expressions in CfgOpticsEffect (CBATeam#1165) 

    * handle expressions in CfgOpticsEffect

* handle different resolutions
    @commy2
    commy2 committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    57f542e View commit details
    Browse the repository at this point in the history

  2. replace more %xy in mission names (CBATeam#1166) 

    * replace more %xx in mission names

* update encoding list
    @commy2
    commy2 committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    e02e5cb View commit details
    Browse the repository at this point in the history

  3. Bump to v3.12.0.190621

    @jonpas
    jonpas committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    3094023 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2019

  1. Update badge to 11.2

    @ViperMaul
    ViperMaul committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    d8a8812 View commit details
    Browse the repository at this point in the history

  2. handle %20 = space

    @commy2
    commy2 committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    e6f5d96 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into release-3.12 

    # Conflicts:
#	README.md
    @ViperMaul
    ViperMaul committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    d941c59 View commit details
    Browse the repository at this point in the history

  4. Unneeded

    @ViperMaul
    ViperMaul committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    e997bcb View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2019

  1. update CBA_fnc_uniqueUnitItems (CBATeam#1157) 

    * update CBA_fnc_uniqueUnitItems

* revert a thing, add a note
    @commy2
    commy2 committed Jun 23, 2019
    Configuration menu
    Copy the full SHA
    f941810 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2019

  1. Fix CBA_fnc_removeItemCargo removing all containers instead of specif… 

    …ied quantity (CBATeam#1168)

* Fix CBA_fnc_removeBackpackCargo unit test

* Fix CBA_fnc_removeItemCargo removing all containers instead of specified quantity - fix CBATeam#1153
    @jonpas
    jonpas committed Jun 29, 2019
    Configuration menu
    Copy the full SHA
    07a2e04 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2019

  1. Use BI's new matrix commands (CBATeam#1173) 

    * Use BI's new matrix commands

* Add DEPRECATED markers
    @Kexanone @commy2
    Kexanone authored and commy2 committed Jun 30, 2019
    Configuration menu
    Copy the full SHA
    42622e9 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2019

  1. Notify - Skippable parameter, Lifetime Setting, Use in Accessory comp… 

    …onent (CBATeam#1175)

* Added queueing param to notify

* added lifetime param

* typo

* replaced lifetime define with variable

* Change force show to skippable notification, Remove lifetime parameter, Update header documentation

* Fix skippable, Add Notification Lifetime setting, Move Store Password setting to initSettings.sqf

* Use CBA_fnc_notify with attachment image in accessory functions

* Optimize - split skippable (WUAE) and non-skippable handling (WAE)

* Larger switch accessory icon

* Use CBA_fnc_addSetting for Store Password setting
    @jonpas @commy2
    jonpas authored and commy2 committed Jul 6, 2019
    Configuration menu
    Copy the full SHA
    508ebd3 View commit details
    Browse the repository at this point in the history

  2. Scripted optics updates (CBATeam#1176) 

    * add hideMagnification parameter for scripted optics

* add disableTilt parameter for scripted optics

* fix pip not updated when changing optics

* disable debug
    @commy2
    commy2 committed Jul 6, 2019
    Configuration menu
    Copy the full SHA
    a89b691 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into release-3.12

    @jonpas
    jonpas committed Jul 6, 2019
    Configuration menu
    Copy the full SHA
    6b3e8d6 View commit details
    Browse the repository at this point in the history

  4. Bump to v3.12.0.190706

    @jonpas
    jonpas committed Jul 6, 2019
    Configuration menu
    Copy the full SHA
    87f11ad View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2019

  1. add failure code argument to fnc_progressBar (CBATeam#1177)

    @McDiod @commy2
    McDiod authored and commy2 committed Jul 7, 2019
    Configuration menu
    Copy the full SHA
    a1132ec View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2019

  1. Merge branch 'master' into release-3.12

    @jonpas
    jonpas committed Jul 8, 2019
    Configuration menu
    Copy the full SHA
    fa7634c View commit details
    Browse the repository at this point in the history

  2. Bump to v3.12.0.190708

    @jonpas
    jonpas committed Jul 8, 2019
    Configuration menu
    Copy the full SHA
    1534839 View commit details
    Browse the repository at this point in the history

  3. Use latest releases URL in README.md

    @jonpas
    jonpas committed Jul 8, 2019
    Configuration menu
    Copy the full SHA
    72a3af4 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2019

  1. XEH - Add direct XEH support for 1.94 objects (CBATeam#1182) 

    * XEH - Add direct XEH support for 1.94 objects

* gm xeh

* add Contact xeh

* hide story soldiers from editor when Contact not loaded
    @PabstMirror @commy2
    PabstMirror authored and commy2 committed Jul 25, 2019
    Configuration menu
    Copy the full SHA
    4159b35 View commit details
    Browse the repository at this point in the history

  2. Update loadorder for 1.94 Contact DLC (CBATeam#1171) 

    * Update loadorder for 1.94 Contact DLC

* Updated required version

Added Mod loadorder
    @dedmen @commy2
    dedmen authored and commy2 committed Jul 25, 2019
    Configuration menu
    Copy the full SHA
    2056941 View commit details
    Browse the repository at this point in the history

  3. Add magwells for SCAR rifle magazines when EGLM is mounted (CBATeam#1179 

    )
    @Drofseh @commy2
    Drofseh authored and commy2 committed Jul 25, 2019
    Configuration menu
    Copy the full SHA
    7ebac50 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2019

  1. 1.94 - Fix GL magwells (CBATeam#1183) 

    * 1.94 - Fix GL magwells

* fix += usage

* additional config for usage of += in both parent class and class
    @PabstMirror @commy2
    PabstMirror authored and commy2 committed Jul 26, 2019
    Configuration menu
    Copy the full SHA
    5fd88fa View commit details
    Browse the repository at this point in the history

  2. Add Contact DLC JointRails (CBATeam#1181) 

    * Add Contact DLC JointRails

* add enoch jr

* capitalization fix 1

* capitalization fix 2

* add contact jr

* delete a thing that does not belong

* fix some scope errors, trim superfluous dummy classes
    @dedmen @commy2
    dedmen authored and commy2 committed Jul 26, 2019
    Configuration menu
    Copy the full SHA
    10df1c5 View commit details
    Browse the repository at this point in the history

  3. fix file capitalization part 1

    @commy2
    commy2 committed Jul 26, 2019
    Configuration menu
    Copy the full SHA
    547cab0 View commit details
    Browse the repository at this point in the history

  4. fix file capitalization part 2

    @commy2
    commy2 committed Jul 26, 2019
    Configuration menu
    Copy the full SHA
    d9cab5a View commit details
    Browse the repository at this point in the history

  5. move some macros

    @commy2
    commy2 committed Jul 26, 2019
    Configuration menu
    Copy the full SHA
    20b4328 View commit details
    Browse the repository at this point in the history

  6. joint rails - enoch attachment classes compatibility

    @commy2
    commy2 committed Jul 26, 2019
    Configuration menu
    Copy the full SHA
    c75104b View commit details
    Browse the repository at this point in the history

  7. config formatting

    @commy2
    commy2 committed Jul 26, 2019
    Configuration menu
    Copy the full SHA
    95f21c3 View commit details
    Browse the repository at this point in the history

  8. manual merge

    @commy2
    commy2 committed Jul 26, 2019
    Configuration menu
    Copy the full SHA
    cc983f9 View commit details
    Browse the repository at this point in the history

  9. Revert "move some macros" 

    This reverts commit 20b4328.
    @commy2
    commy2 committed Jul 26, 2019
    Configuration menu
    Copy the full SHA
    4833ee3 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'master' of https://github.com/CBATeam/CBA_A3 into enoch… 

    …-jr-compat1
    @commy2
    commy2 committed Jul 26, 2019
    Configuration menu
    Copy the full SHA
    a6370b0 View commit details
    Browse the repository at this point in the history

  11. don't overwrite vanilla magazine base classes

    @commy2
    commy2 committed Jul 26, 2019
    Configuration menu
    Copy the full SHA
    e0d5606 View commit details
    Browse the repository at this point in the history

  12. don't overwrite vanilla magazine base classes

    @commy2
    commy2 committed Jul 26, 2019
    Configuration menu
    Copy the full SHA
    6ee185f View commit details
    Browse the repository at this point in the history

  13. implement addWeaponWithAttachmentsCargoGlobal command (CBATeam#1188) 

    * implement addWeaponWithAttachmentsCargoGlobal command

* use AWWACG in removeXCargo functions

* fix test
    @commy2
    commy2 committed Jul 26, 2019
    Configuration menu
    Copy the full SHA
    3227dbb View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2019

  1. fix minor ui issues with Contact DLC ui modifications (CBATeam#1186) 

    * fix minor ui issues with Contact DLC ui modifications

* fix another minor ui issue with Contact DLC ui modifications
    @commy2
    commy2 committed Jul 27, 2019
    Configuration menu
    Copy the full SHA
    b6df6ac View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/CBATeam/CBA_A3 into enoch… 

    …-jr-compat1
    @commy2
    commy2 committed Jul 27, 2019
    Configuration menu
    Copy the full SHA
    35f39a8 View commit details
    Browse the repository at this point in the history

  3. joint rails - enoch attachment classes compatibility - Variant A (CBA… 

    …Team#1184)

* joint rails - enoch attachment classes compatibility

* don't overwrite vanilla magazine base classes

* don't overwrite vanilla magazine base classes
    @commy2
    commy2 committed Jul 27, 2019
    Configuration menu
    Copy the full SHA
    6fcd51e View commit details
    Browse the repository at this point in the history

  4. add legacy JR component

    @commy2
    commy2 committed Jul 27, 2019
    Configuration menu
    Copy the full SHA
    432f214 View commit details
    Browse the repository at this point in the history

  5. legacy jr for mx and the rest

    @commy2
    commy2 committed Jul 27, 2019
    Configuration menu
    Copy the full SHA
    c9473ec View commit details
    Browse the repository at this point in the history

  6. Merge pull request CBATeam#1189 from CBATeam/legacyJR 

    add legacy JR component
    @commy2
    commy2 committed Jul 27, 2019
    Configuration menu
    Copy the full SHA
    3398c01 View commit details
    Browse the repository at this point in the history

  7. move legacy jr to optionals

    @commy2
    commy2 committed Jul 27, 2019
    Configuration menu
    Copy the full SHA
    37d4943 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2019

  1. fix scripted optics pip effect

    @commy2
    commy2 committed Jul 28, 2019
    Configuration menu
    Copy the full SHA
    c8ebb96 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2019

  1. Put tags into quotes 

    Put tags into quotes
    @R3voA3
    R3voA3 committed Jul 29, 2019
    Configuration menu
    Copy the full SHA
    1298d71 View commit details
    Browse the repository at this point in the history

  2. Removed double quotes from some theme entries. 

    Removed double quotes from some theme entries.
    @R3voA3
    R3voA3 committed Jul 29, 2019
    Configuration menu
    Copy the full SHA
    7213615 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2019

  1. Opening brackes are now EOL 

    - Opening brackes are now EOL
    @R3voA3
    R3voA3 committed Jul 30, 2019
    Configuration menu
    Copy the full SHA
    f46e92b View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2019

  1. fix optic tilting in vehicles

    @commy2
    commy2 committed Aug 2, 2019
    Configuration menu
    Copy the full SHA
    5ff62dc View commit details
    Browse the repository at this point in the history

  2. Merge pull request CBATeam#1197 from CBATeam/fixOpticsFFV 

    fix optic tilting in vehicles
    @commy2
    commy2 committed Aug 2, 2019
    Configuration menu
    Copy the full SHA
    b3234ea View commit details
    Browse the repository at this point in the history

  3. Merge pull request CBATeam#1191 from CBATeam/scripted-optics-ppeffect 

    fix scripted optics pip effect
    @commy2
    commy2 committed Aug 2, 2019
    Configuration menu
    Copy the full SHA
    831f738 View commit details
    Browse the repository at this point in the history

  4. move scope expressions to nobin component

    @commy2
    commy2 committed Aug 2, 2019
    Configuration menu
    Copy the full SHA
    1cafbd2 View commit details
    Browse the repository at this point in the history

  5. Create $PBOPREFIX$

    @PabstMirror
    PabstMirror committed Aug 2, 2019
    Configuration menu
    Copy the full SHA
    c0c34da View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2019

  1. function header

    @commy2
    commy2 committed Aug 4, 2019
    Configuration menu
    Copy the full SHA
    2942dc1 View commit details
    Browse the repository at this point in the history

  2. Merge pull request CBATeam#1199 from CBATeam/nobinXEH 

    Nobin xeh
    @commy2
    commy2 committed Aug 4, 2019
    Configuration menu
    Copy the full SHA
    62e461a View commit details
    Browse the repository at this point in the history

  3. Bump to v3.12.1.190804

    @jonpas
    jonpas committed Aug 4, 2019
    Configuration menu
    Copy the full SHA
    dcc8594 View commit details
    Browse the repository at this point in the history

  4. Update mod.cpp on build

    @jonpas
    jonpas committed Aug 4, 2019
    Configuration menu
    Copy the full SHA
    053f8fb View commit details
    Browse the repository at this point in the history

  5. Support copying additional directories in make.py

    @jonpas
    jonpas committed Aug 4, 2019
    Configuration menu
    Copy the full SHA
    74ba847 View commit details
    Browse the repository at this point in the history

  6. Fix overwrite builds for folder copy in make.py

    @jonpas
    jonpas committed Aug 4, 2019
    Configuration menu
    Copy the full SHA
    875beba View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2019

  1. fix ee

    @PabstMirror
    PabstMirror committed Aug 5, 2019
    Configuration menu
    Copy the full SHA
    72256f4 View commit details
    Browse the repository at this point in the history

  2. Merge pull request CBATeam#1200 from CBATeam/XEH_CLASS_BASE 

    fix ee
    @commy2
    commy2 committed Aug 5, 2019
    Configuration menu
    Copy the full SHA
    c5161ae View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into release-3.12.1

    @jonpas
    jonpas committed Aug 5, 2019
    Configuration menu
    Copy the full SHA
    cb329ee View commit details
    Browse the repository at this point in the history

  4. Bump to v3.12.1.190805

    @jonpas
    jonpas committed Aug 5, 2019
    Configuration menu
    Copy the full SHA
    75eea96 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2019

  1. Add randomizeFacewear to common CfgFunctions

    @jonpas
    jonpas committed Aug 6, 2019
    Configuration menu
    Copy the full SHA
    3a6b5af View commit details
    Browse the repository at this point in the history

  2. Add CBA_fnc_randomizeFacewear

    @jonpas
    jonpas committed Aug 6, 2019
    Configuration menu
    Copy the full SHA
    35f0f44 View commit details
    Browse the repository at this point in the history

  3. Run randomizeFacewear on all units

    @jonpas
    jonpas committed Aug 6, 2019
    Configuration menu
    Copy the full SHA
    7c631df View commit details
    Browse the repository at this point in the history

  4. Prefix allowedFacewear

    @jonpas
    jonpas committed Aug 6, 2019
    Configuration menu
    Copy the full SHA
    c0cee7e View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2019

  1. Apply suggestions from code review 

    Co-Authored-By: commy2 <commy-2@gmx.de>
    @jonpas @commy2
    jonpas and commy2 committed Aug 7, 2019
    Configuration menu
    Copy the full SHA
    ca56543 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2019

  1. added colored MX mag variants 

    added khaki and black magazines to both MX magwell pools, deleted katiba mags from those pools
    @Loupeznik
    Loupeznik committed Aug 9, 2019
    Configuration menu
    Copy the full SHA
    4aa92c6 View commit details
    Browse the repository at this point in the history

  2. syntax edited

    @Loupeznik
    Loupeznik committed Aug 9, 2019
    Configuration menu
    Copy the full SHA
    790fd54 View commit details
    Browse the repository at this point in the history

  3. sorted array values

    @Loupeznik
    Loupeznik committed Aug 9, 2019
    Configuration menu
    Copy the full SHA
    6ebb9f5 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2019

  1. Merge pull request CBATeam#1202 from Loupeznik/65magwells_fix 

    6.5mm magwells fix
    @commy2
    commy2 committed Aug 10, 2019
    Configuration menu
    Copy the full SHA
    e82740a View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2019

  1. Bump to v3.12.1.190812

    @jonpas
    jonpas committed Aug 12, 2019
    Configuration menu
    Copy the full SHA
    0bab13c View commit details
    Browse the repository at this point in the history

  2. Czech translation added

    @Loupeznik
    Loupeznik committed Aug 12, 2019
    Configuration menu
    Copy the full SHA
    054b971 View commit details
    Browse the repository at this point in the history

  3. Czech translation

    @Loupeznik
    Loupeznik committed Aug 12, 2019
    Configuration menu
    Copy the full SHA
    e5d17f1 View commit details
    Browse the repository at this point in the history

  4. Czech translation

    @Loupeznik
    Loupeznik committed Aug 12, 2019
    Configuration menu
    Copy the full SHA
    18e9c72 View commit details
    Browse the repository at this point in the history

  5. Czech translation fix

    @Loupeznik
    Loupeznik committed Aug 12, 2019
    Configuration menu
    Copy the full SHA
    3435480 View commit details
    Browse the repository at this point in the history

  6. Enhanced Czech translation

    @Loupeznik
    Loupeznik committed Aug 12, 2019
    Configuration menu
    Copy the full SHA
    8fdf226 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'release'

    @jonpas
    jonpas committed Aug 12, 2019
    Configuration menu
    Copy the full SHA
    e1c4b61 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2019

  1. Merge pull request CBATeam#1203 from Loupeznik/cs-CZ-translation 

    Czech translation
    @commy2
    commy2 committed Aug 15, 2019
    Configuration menu
    Copy the full SHA
    96eab72 View commit details
    Browse the repository at this point in the history

  2. Rename to CBA_facewearList, Add example configs

    @jonpas
    jonpas committed Aug 15, 2019
    Configuration menu
    Copy the full SHA
    2d8218d View commit details
    Browse the repository at this point in the history

  3. add CONTACT SERVER ADMIN header to signature mismatch message

    @commy2
    commy2 committed Aug 15, 2019
    Configuration menu
    Copy the full SHA
    2595495 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2019

  1. Common - Prevent endless loop with waitAndExec 

    Update init_perFrameHandler.sqf
    @PabstMirror
    PabstMirror committed Aug 17, 2019
    Configuration menu
    Copy the full SHA
    8ab8cdb View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2019

  1. Update init_perFrameHandler.sqf

    @PabstMirror
    PabstMirror committed Aug 20, 2019
    Configuration menu
    Copy the full SHA
    ed90459 View commit details
    Browse the repository at this point in the history

  2. restore newline

    @PabstMirror
    PabstMirror committed Aug 20, 2019
    Configuration menu
    Copy the full SHA
    4055131 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2019

  1. Default transition targetstate to transition configName

    PiZZAD0X committed Aug 21, 2019
    Configuration menu
    Copy the full SHA
    b4fcfb5 View commit details
    Browse the repository at this point in the history

  2. is/getText replacements for BIS function

    PiZZAD0X committed Aug 21, 2019
    Configuration menu
    Copy the full SHA
    89cfeeb View commit details
    Browse the repository at this point in the history

  3. Merge pull request CBATeam#1213 from PiZZAD0X/statemachineDefaultTarg… 

    …etState

Default transition targetstate to transition configName
    @commy2
    commy2 committed Aug 21, 2019
    Configuration menu
    Copy the full SHA
    1ccbafa View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2019

  1. Merge branch 'master' of https://github.com/CBATeam/CBA_A3 into fixed… 

    …-error-messages
    @commy2
    commy2 committed Aug 23, 2019
    Configuration menu
    Copy the full SHA
    eee311b View commit details
    Browse the repository at this point in the history

  2. handle returned assignments in key events

    @commy2
    commy2 committed Aug 23, 2019
    Configuration menu
    Copy the full SHA
    664a56c View commit details
    Browse the repository at this point in the history

  3. Merge pull request CBATeam#1214 from CBATeam/keybinding-assignment-sa… 

    …fe-return

handle returned assignments in key events
    @commy2
    commy2 committed Aug 23, 2019
    Configuration menu
    Copy the full SHA
    75e6bfb View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2019

  1. Add Spanish translation for UI category 

    By @TheMagnetar
    @jonpas
    jonpas committed Aug 26, 2019
    Configuration menu
    Copy the full SHA
    1f7f9b2 View commit details
    Browse the repository at this point in the history

  2. Merge pull request CBATeam#1216 from CBATeam/ui-cat-spanish 

    Add Spanish translation for UI category
    @commy2
    commy2 committed Aug 26, 2019
    Configuration menu
    Copy the full SHA
    fac8ecb View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2019

  1. Add period at the end of target debug info log

    @jonpas
    jonpas committed Sep 2, 2019
    Configuration menu
    Copy the full SHA
    851af68 View commit details
    Browse the repository at this point in the history

  2. Merge pull request CBATeam#1217 from CBATeam/target-debug-period 

    Add period at the end of target debug info log
    @commy2
    commy2 committed Sep 2, 2019
    Configuration menu
    Copy the full SHA
    d35ee72 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2019

  1. Update issue templates

    @jonpas
    jonpas committed Sep 5, 2019
    Configuration menu
    Copy the full SHA
    524c6a7 View commit details
    Browse the repository at this point in the history

  2. Remove empty Todo template (redundant)

    @jonpas
    jonpas committed Sep 5, 2019
    Configuration menu
    Copy the full SHA
    9ed598c View commit details
    Browse the repository at this point in the history

  3. Remove old issue template

    @jonpas
    jonpas committed Sep 5, 2019
    Configuration menu
    Copy the full SHA
    4eec633 View commit details
    Browse the repository at this point in the history

  4. Merge pull request CBATeam#1219 from CBATeam/new-issue-templates 

    Update issue templates
    @commy2
    commy2 committed Sep 5, 2019
    Configuration menu
    Copy the full SHA
    ecdb7f5 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2019

  1. Cleanup CfgPatches and use VERSION_CONFIG consistently (CBATeam#1222) 

    * Cleanup CfgPatches and make them consistent, Use VERSION_CONFIG everywhere

* Remove redundant versionDesc
    @jonpas
    jonpas committed Sep 7, 2019
    Configuration menu
    Copy the full SHA
    8a94c03 View commit details
    Browse the repository at this point in the history

  2. Improve VERSION_CONFIG (CBATeam#1221) 

    * Fix VERSION_CONFIG version number API
version should always be a number, while versionStr should be a string, no automatic conversions

* Read versionStr in help component, fall-back to version

* Document VERSION_CONFIG in macros file

* Support number and text version as fall-back
    @jonpas
    jonpas committed Sep 7, 2019
    Configuration menu
    Copy the full SHA
    851b690 View commit details
    Browse the repository at this point in the history

  3. Support disableRandomization array

    @jonpas
    jonpas committed Sep 7, 2019
    Configuration menu
    Copy the full SHA
    94c5a06 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into facewear-rand

    @jonpas
    jonpas committed Sep 7, 2019
    Configuration menu
    Copy the full SHA
    ac77666 View commit details
    Browse the repository at this point in the history

  5. Support empty string or None 

    Co-Authored-By: commy2 <commy-2@gmx.de>
    @jonpas @commy2
    jonpas and commy2 committed Sep 7, 2019
    Configuration menu
    Copy the full SHA
    13cc2e0 View commit details
    Browse the repository at this point in the history

  6. Merge pull request CBATeam#1201 from CBATeam/facewear-rand 

    Add Facewear Randomization
    @commy2
    commy2 committed Sep 7, 2019
    Configuration menu
    Copy the full SHA
    a900057 View commit details
    Browse the repository at this point in the history

  7. report backpacks with CBA_fnc_getItemConfig

    @commy2
    commy2 committed Sep 7, 2019
    Configuration menu
    Copy the full SHA
    1050d67 View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2019

  1. fix crash when hosting server with large ui scale

    @commy2
    commy2 committed Sep 8, 2019
    Configuration menu
    Copy the full SHA
    061aa91 View commit details
    Browse the repository at this point in the history

  2. Merge pull request CBATeam#1224 from CBATeam/fix-host-server-crash 

    fix crash when hosting server with large ui scale
    @commy2
    commy2 committed Sep 8, 2019
    Configuration menu
    Copy the full SHA
    6ea0525 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2019

  1. Bump to v3.12.2.190909

    @jonpas
    jonpas committed Sep 9, 2019
    Configuration menu
    Copy the full SHA
    9e6cf09 View commit details
    Browse the repository at this point in the history

  2. optimization

    @commy2
    commy2 committed Sep 9, 2019
    Configuration menu
    Copy the full SHA
    06012e5 View commit details
    Browse the repository at this point in the history

  3. Merge pull request CBATeam#1223 from CBATeam/getItemConfig-backpacks 

    report backpacks with CBA_fnc_getItemConfig
    @commy2
    commy2 committed Sep 9, 2019
    Configuration menu
    Copy the full SHA
    522cd1e View commit details
    Browse the repository at this point in the history

  4. Merge pull request CBATeam#1209 from CBATeam/fixWaitAndExec 

    Common - Prevent endless loop with waitAndExec
    @commy2
    commy2 committed Sep 9, 2019
    Configuration menu
    Copy the full SHA
    31c5165 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into release-3.12.2

    @jonpas
    jonpas committed Sep 9, 2019
    Configuration menu
    Copy the full SHA
    e286d5a View commit details
    Browse the repository at this point in the history

  6. Merge pull request CBATeam#1192 from R3voA3/master 

    Put tags in CfgMusic.hpp into quotes
    @commy2
    commy2 committed Sep 9, 2019
    Configuration menu
    Copy the full SHA
    8274a56 View commit details
    Browse the repository at this point in the history

  7. Merge pull request CBATeam#1212 from CBATeam/fixed-error-messages 

    add CONTACT SERVER ADMIN header to signature mismatch message
    @commy2
    commy2 committed Sep 9, 2019
    Configuration menu
    Copy the full SHA
    3a54a99 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' into release-3.12.2

    @jonpas
    jonpas committed Sep 9, 2019
    Configuration menu
    Copy the full SHA
    7c4e6bd View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2019

  1. Remove excessive concatenation operators from macros library

    @jonpas
    jonpas committed Sep 10, 2019
    Configuration menu
    Copy the full SHA
    eb0827e View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2019

  1. Add new muzzle slots

    @Blutze
    Blutze committed Sep 11, 2019
    Configuration menu
    Copy the full SHA
    b896b7a View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2019

  1. fix includeDisabled flag in CBA_fnc_supportMonitor

    @commy2
    commy2 committed Sep 14, 2019
    Configuration menu
    Copy the full SHA
    68d0054 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2019

  1. Minor improvements to settings UI

    @mharis001
    mharis001 committed Sep 15, 2019
    Configuration menu
    Copy the full SHA
    adb26e0 View commit details
    Browse the repository at this point in the history

  2. Apply suggestions from code review 

    Co-Authored-By: commy2 <commy-2@gmx.de>
    @mharis001 @commy2
    mharis001 and commy2 committed Sep 15, 2019
    Configuration menu
    Copy the full SHA
    c37a148 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2019

  1. Clean up empty lines

    @Blutze
    Blutze committed Sep 16, 2019
    Configuration menu
    Copy the full SHA
    0911400 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2019

  1. Merge pull request CBATeam#1227 from Blutze/blutze-newmuzzles 

    JR - Add muzzle slots for 4.6mm and 7.62x54R
    @commy2
    commy2 committed Sep 17, 2019
    Configuration menu
    Copy the full SHA
    1f0f9c0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request CBATeam#1231 from mharis001/settings-ui-changes 

    Slider UI style improvements for cba_settings
    @commy2
    commy2 committed Sep 17, 2019
    Configuration menu
    Copy the full SHA
    5cb3ebe View commit details
    Browse the repository at this point in the history

  3. Merge pull request CBATeam#1225 from CBATeam/macros-cleanup 

    Remove excessive concatenation operators from macros library
    @commy2
    commy2 committed Sep 17, 2019
    Configuration menu
    Copy the full SHA
    fae207c View commit details
    Browse the repository at this point in the history

  4. Merge pull request CBATeam#1229 from CBATeam/fix-supportMonitor-inclu… 

    …deDisabled-flag

fix includeDisabled flag in CBA_fnc_supportMonitor
    @commy2
    commy2 committed Sep 17, 2019
    Configuration menu
    Copy the full SHA
    61f376d View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2019

  1. Add magwells for the UZI and AS50

    @Drofseh
    Drofseh committed Sep 29, 2019
    Configuration menu
    Copy the full SHA
    f925da7 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2019

  1. Merge pull request CBATeam#1233 from Drofseh/JAM-UZI-AS50 

    Add magwells for the UZI and AS50
    @commy2
    commy2 committed Oct 1, 2019
    Configuration menu
    Copy the full SHA
    1cad393 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2019

  1. Add turret event

    @neilzar
    neilzar committed Oct 2, 2019
    Configuration menu
    Copy the full SHA
    b5b40f1 View commit details
    Browse the repository at this point in the history

  2. Couple changes that weren't saved

    @neilzar
    neilzar committed Oct 2, 2019
    Configuration menu
    Copy the full SHA
    2b53e1b View commit details
    Browse the repository at this point in the history

  3. update comments

    @neilzar
    neilzar committed Oct 2, 2019
    Configuration menu
    Copy the full SHA
    d028d79 View commit details
    Browse the repository at this point in the history

  4. Replace CBAr with CBAv 

    Co-Authored-By: commy2 <commy-2@gmx.de>
    @neilzar @commy2
    neilzar and commy2 committed Oct 2, 2019
    Configuration menu
    Copy the full SHA
    7af94f7 View commit details
    Browse the repository at this point in the history

  5. remove private where it shouldn't have been

    @neilzar
    neilzar committed Oct 2, 2019
    Configuration menu
    Copy the full SHA
    a33b3b5 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2019

  1. Add missing Turkish Translations

    @654wak654
    654wak654 committed Oct 3, 2019
    Configuration menu
    Copy the full SHA
    549cc55 View commit details
    Browse the repository at this point in the history

  2. Merge pull request CBATeam#1239 from 654wak654/tr-translations 

    Add Missing Turkish Translations
    @commy2
    commy2 committed Oct 3, 2019
    Configuration menu
    Copy the full SHA
    c7079ff View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2019

  1. XEH - Fix version report in rpt

    @PabstMirror
    PabstMirror committed Oct 9, 2019
    Configuration menu
    Copy the full SHA
    e4042c2 View commit details
    Browse the repository at this point in the history

  2. Merge pull request CBATeam#1240 from CBATeam/xehVer 

    XEH - Fix version report in rpt
    @commy2
    commy2 committed Oct 9, 2019
    Configuration menu
    Copy the full SHA
    f9f0d02 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2019

  1. Ignore invalid turrets

    @neilzar
    neilzar committed Oct 10, 2019
    Configuration menu
    Copy the full SHA
    f0097f2 View commit details
    Browse the repository at this point in the history

  2. Consider [] as driver

    @neilzar
    neilzar committed Oct 10, 2019
    Configuration menu
    Copy the full SHA
    b1ef956 View commit details
    Browse the repository at this point in the history

  3. Fix whitespace 

    Co-Authored-By: jonpas <jonpas33@gmail.com>
    @neilzar @jonpas
    neilzar and jonpas committed Oct 10, 2019
    Configuration menu
    Copy the full SHA
    b74c35d View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2019

  1. Add extra param information

    @neilzar
    neilzar committed Oct 11, 2019
    Configuration menu
    Copy the full SHA
    7bb6cd1 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2019

  1. Merge pull request CBATeam#1237 from neilzar/turret-event 

    Add turret event
    @commy2
    commy2 committed Oct 12, 2019
    Configuration menu
    Copy the full SHA
    e4a00b3 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2019

  1. Statemachine - Trivial performance changes

    @PabstMirror
    PabstMirror committed Oct 18, 2019
    Configuration menu
    Copy the full SHA
    1032469 View commit details
    Browse the repository at this point in the history

  2. Replace all use of count as a forEach

    @PabstMirror
    PabstMirror committed Oct 18, 2019
    Configuration menu
    Copy the full SHA
    b2829e1 View commit details
    Browse the repository at this point in the history

  3. Update fnc_startFallbackLoop.sqf

    @PabstMirror
    PabstMirror committed Oct 18, 2019
    Configuration menu
    Copy the full SHA
    79fe85b View commit details
    Browse the repository at this point in the history

  4. Merge pull request CBATeam#1242 from CBATeam/trivialSM 

     Replace all use of count as a forEach
    @commy2
    commy2 committed Oct 18, 2019
    Configuration menu
    Copy the full SHA
    855b523 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2019

  1. Scaled cba_optic_big_pip and cba_optic_small_pip models outwards on t… 

    …he sides to support 21:9 aspect ratio screens.
    @JonBons
    JonBons committed Oct 24, 2019
    Configuration menu
    Copy the full SHA
    4c342f6 View commit details
    Browse the repository at this point in the history

  2. Adjusted CBA optic camera FOV to 0.78 to account for model changes fo… 

    …r 21:9.
    @JonBons
    JonBons committed Oct 24, 2019
    Configuration menu
    Copy the full SHA
    25285ef View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2019

  1. Adjusted CBA optic camera FOV to 1.02 to make the camera match up wit… 

    …h what you saw before scoping in.

See CBATeam#1245 (comment) for comparison of old value.
    @JonBons
    JonBons committed Oct 26, 2019
    Configuration menu
    Copy the full SHA
    78e23c1 View commit details
    Browse the repository at this point in the history

  2. Changed CBA optic camera FOV back to 0.75 as there is some scaling is… 

    …sues with increasing this value.
    @JonBons
    JonBons committed Oct 26, 2019
    Configuration menu
    Copy the full SHA
    43f4caa View commit details
    Browse the repository at this point in the history

  3. Merge pull request CBATeam#1245 from JonBons/optics-21by9 

    Add support for 21:9 resolutions to CBA optics addon.
    @commy2
    commy2 committed Oct 26, 2019
    Configuration menu
    Copy the full SHA
    a2b02af View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2019

  1. Merge branch 'NoDatedDiaryRecord' of https://github.com/ColdEvul/CBA_A3… 

    … into NoDatedDiaryRecord
    @commy2
    commy2 committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    d9f94e7 View commit details
    Browse the repository at this point in the history

  2. store diary records in variables

    @commy2
    commy2 committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    5fe929e View commit details
    Browse the repository at this point in the history