Add ACE_Arsenal (#5734)
* Add CBA setting for modIcons
* Add CBA settings for camera control
* Merge the 2 inverted settings into one
There's no man crazy enough to need one inverted and the other normal
* Add back missing newline
* Change rscCommon, don't redefine base classes
* Change anim to "civil" when not in a weapon or special tab
* Fix current handgun ending up in launchers tab and vice versa
* Change back virtualItems first index to primary secondary handgun
* Add ace_arsenal_hide config check and config entry
* Add dogtags handling in postInit
* Add CBA setting for fontHeight for left and right panel
* magazineGroups
* Add base layout for loadouts GUI
* Prepare the SQF base for the loadouts display
* Continue laying the base for the SQF of the loadouts display
* Add CBA settings for the loadouts display
* Implement button logic for loadouts display
* Finish button logic, start adding filling and button funcs
* Add editBox for loadout names
* Add loadout saving and deleting
* Add loadouts loading
* Add select current after list is refreshed after saving
* Redo button layout, Add rename button, Add messages
* Add double click loading
* Fix loadout deleting not triggering curSel change
* Keep cursor at same index when deleting loadouts
Woops
* Reload pictures when saving over old loadout
* Fix loadout save not updating the pictures properly (again)
* Add close button for loadouts dialog
* Fix weight not updating when using arrows to add / remove items
* Make the arsenal layout a bit prettier
* Start adding non available items and missing mods for loadouts
* Remove useless lines in fillLoadouts
* Move buttonHide above panel fill in loadoutsClose
* Change the way weapons are checked in fillLoadoutsList
* Add weapon in container support for fillLoadoutsList
* Add mag in container check for fillLoadoutsList
* Add item check for containers in fillLoadoutsList
* Fix item duplication when loadout loadouts
* Switch anim to civil for the rest of the tabs that need it
* Make extra sure item duplication won't happen
* Fix right panel hiding issues
* Fix remove all button, use QGVAR for EHs names, add isMP check to share tab
* Fix initBox erroring out if the object is null
* Move loadout checking to it's own func
* Force panel reload every time loadoutList change
I'm forced to do this, I can't save arrays in listnboxes
* Change how loadouts are retrived from the listnbox
* Fix save overwriting existing loadout not updating right row
* Fix indentation in buttonLoadoutsSave
* Fix reserved var error
* Fix fillLoadoutlist tab check
* Fix accessories in containers not being checked properly via verifyLoadout
* Fix binos not being detected properly by verifyLoadout
* Fix pre-filled backpacks not behaving properly
* Add mine detector check in configScan and onArsenalOpen
* Add extra traces
* Add mine detector check in non cached part of addVirtualItems
* Move right panel greying to it's own func
* Fix right panel listnbox for items with mass under 1
* Redo unique items sorting in onArsenalOpen
* Add loadoutSaved EH, handle empty name box for loadout saving
* Reapply inisgnia after loadout is loaded
* Change LoadoutSaved to loadoutSaved
* Rename savedLoadout to onLoadoutSave
* Change buttonLoadoutsSave layout to prepare base weapon saving
* Save base class for weapons when saving loadouts
* Remove unused profiling code related code
* Add not implemented warning messages for export and import
* Fix error when saving with a container or weapon slot being empty
* Remove dogtags from loadout upon loadout saving
* Change how misc item mass is retrieved
* Remove vanilla "NoVoice" from voices to avoid an error related to it
* Use tolower for currentData and itemsToCheck in fillLeftPanel
Avoid camelCase issues with the commands that don't fucking respect it.
* Remove redundant check in postInit
* Fix sharedLoadouts condition in onArsenalOpen, Fix save button logic
* Prepare sharedLoadouts addition
* Add loadout sharing
* Add proper saving and loading for shared loadouts
* Change loadout deleted / unshared EH name, add said EH to unsharing
* Remove shared loadouts from disconnected players
* Fix error in buttonLoadoutsSave, add row when other share a loadout
* Change sharedLoadouts tab curSel selection to lnbData instead of lnbText
* Add data when adding a new row via CBA EH
* Remove mode, add arg to openBox to have arsenal prefilled
* Cleanup buttonClearAll code
* Fix itemInfo behavior when switching between items that don't have logos
Fix #23
* Add copy paste and arrow key support for searchbars
Close #22
* Add back newline at EOF for onKeyDown
* Change default camera setting from non inverted to inverted
* Fix import and export "not implemented" message
* Rename share button to Unshare when loadout selected is shared
* Improve missing items logging, cache verifyLoadout check
* Remove unused var
* Add full 3DEN support
* Remove 3DEN sphere and grid, set helper center dir properly
* Change 3DEN lightsource intensity
* Save 3DEN inventory properly
* Rewrite onArsenalClose 3DEN comment
* Fix sharedLoadouts check
* Add 3DEN support for defaultTab
* Add new event for 3rd parties in buttonCargo
* Move weight update to updateRightPanel for buttonCargo and selChangedListnBox
* Fix defaultLoadout save button
* Remove unallowed command
* Fix arsenal messages not working in 3DEN
* Add export current loadout, Add export defaultLoadoutsList
Signed-off-by: Josuan Albin <josuanalbin@outlook.fr>
* Add import button functionality
* Change export / import messages
* Change message to use scheduled only
* Attempt to sanitize data in import func
* Add a 3DEN attribute to save defaultLoadoutsList, fix shared loadout check
* Replace 2 last traces in verifyLoadout
* Change defaultLoadoutsList export format and add a 3DEN check for it's default value
* Fix original array being modified in fillLoadoutsList
* Improve shared loadout check
* Fix removeVirtualItems not removing Accs, nil virtualItems var in removeBox
* Add zeus support for arsenal rewrite, fix openBox camera check
* Add isPlayer check to arsenal rewrite part of bi module
Arsenal rewrite does not seem to work on remote players, welp, I tried at least
* Fix shared loadouts loadout index being null
Forgot to change that one getVar
* Hide shared column if sharing is disabled on My loadouts tab
* Remove trace from loadoutsLoad, add trace to shared and unshared EHs
* Fix postInit trace
* Fix sharing EHs being broken, remove traces in them, prevent possible issue
yeah, _x params doesn't work there :p
* Fix fillLoadoutsList error
* Start translating and code reviewing
* Add editing vehicle crew loadout support for arsenal
* Move left panel filling above 3DEN handling to avoid float crew members
* Fix onArsenalClose EOF, add header for it
* Move onButton EHs to config, remove placeholder stats func
* Add headers for onLoadouts funcs and verifyLoadout
* Clean up buttonClearAll
* Fix assigned items not being added properly to currentItems on loadout load
* Add more function headers
* Make rename work in default loadouts tab in 3DEN
* Add more functions headers, continue code review
* Add more functions headers, finish code review
* Fix loadout saving to profile from an other tab than my loadouts
* Fix loadout saving even more
* Attempt to fix loadouts handling
From totally broken to somewhat usable.
* Even more fixing
* Add back onLoadoutSave EH
* Add back author message in loadoutSave
* Add back EOF newline
* Add back loadout caching
* Remove unique items from saved and loaded loadouts
* Add unique item support for the remaining container tabs
* Fix mag check for magazine type in container
* Add support for CfgVehicles and CfgGlasses in miscItems
* Add button highlighting for loadouts display, fix mag put and throw check
* Change shared column to show a proper icon
* Revert "Move onButton EHs to config, remove placeholder stats func"
This reverts commit 1be5d92426e580683b265dd92c95fafa363765bb.
* Add back EOL newline in prep, remove stats placeholder again
* Add part of the german translation
* Add more translations, change how shared button text is managed
* Add scheduled check in openBox to avoid issues with people using addaction
Because you know they will.
* Add translations for import and export messages
* Fix comms tab defaulting to empty
* Align buttons perfectly for loadouts display, translation for delete action
* Add loadout saved translations
* Add load and rename messages translations
* localized interaction name in initBox
* Fix issue when admins deleted a loadout didn't change the icon status for authors
* Fix loadout import, update unique items list after import / loadout load
* Beautify UI a bit
* Add setting to toggle missing / unavailable items RPT logging
* Add settings strings
* Increase button size for main display
* Change DLC logo side in infoBox
* Change loadouts display buttons spacing, change deleteLoadout button active color
* Remove camera rotation limit
* Add polish translation
* German translation by @bux
* Order
* Fix typo in buttonExport, add credits in handleMouse
* Fix right panel item count not updating properly in certain scenarios
* Add loadoutName check when importing default loadouts, change assignedItems check
* Improve onSelChangedRight, fix typos in onSelChangedLeft and handleSearchbar
* Fix syntax check in removeVirtualItems count
* Shorten onSelChangedRightListnbox by improving current tab check
* Improve fillLeftPanel weapon tab filling
* Move lnbSetPicture occurences for the loadouts display to a define
* scan config opti
* Fix RPT logging check in fillLoadoutsList, use picture macro for shared tab
* Fix sharing and RPT logging settings having the same var
* Add newline at EOF for funcs that are missing it
* Move GVAR(sharedLoadoutsVars) to sharedLoadoutsNamespace
* newline eof
commy contributed too!
* Fix delete button not working as intended in public tab
* Replace bis_fnc_baseWeapon with CBA equivalent everywhere outisde of scanConfig
* Revert "Replace bis_fnc_baseWeapon with CBA equivalent everywhere outisde of scanConfig"
This reverts commit 496e6f822344e460312e68cd1334a0643ea28bef.
* Add new Cfg entry for handling unique items saving, add entry to chemlight shields
* Fix currentMag tab not detecting current mag properly (still experimental)
* Improve left and right filled EHs, add "Dog Tags:" for dogtag uniques
* Change how the right panel first update works
* Fix updateRightPanel very obscure bug and header typo
* Move postInit EHs for medical and dogtags to their respective postInit
* Fix medical postInit typo
* Add currentMag tabs for primary and secondary muzzles properly
* Fix container compatible mags tab not showing anything
* Replace an inline if to select in fillRightPanel
* Attempt to fix accs recognition when switching weapons
* Improve currentMag2 tab show / hide logic
Secondary and handguns can't have a secondary mauzzle
* Add strings for currentMag and currentMag2 tabs
* Readd strings that tabler accidentally removed
* Make sorting for the right panel stay the same when switching items / tabs
* Replace bis_fnc_addWeapon by the addWeapon command
bis_fnc_addWeapon failed when a weapon with the same classname was in one of the player's containers
Add mag for primary muzzle after the weapon is added, is possibly replaced by current mag(s) saved in curentItems
* Replace BIS_fnc_overviewAuthor in itemInfo
It works better
* Display itemInfo box properly for currentMag1 and 2 tabs
* Don't reset arsenal vision mode after quitting arsenal
* Improve showItem
* Remove trace from showItem
* Move getWeight and weight string from movement to common
* Fix typos in addVirtualItems
* Comment back compile cache for common
(Not yet for arsenal, not until it's validated for a merge)
* Replace secondaryMuzzleMag tab icon by @Max255PL 's
* Update @Max255PL 's icon
* Add missing author strings
* Add debug trace for a specific issue
* Add more traces in loadoutsSave
* Fix bug in loadoutsSave, remove debug traces
* Fix typo in loadoutsSave
* Fix uniqueBase cfg check for all cases in loadoutsSave
* Improve whitelisting for current weapon accs and mags
* Update CBA settings strings, change RPT logging to be turned off by default
* Update polish translation by @max255PL
* Fix saving loadouts when no loadout has ever been saved
* Make loadout screen lighter
* Save camera position and view mode for ace arsenal
* Improve loadouts screen presentation
* Improve loadouts screen readability
* Improve camera angle in loadout screen
* Improve loadout renaming, Fix bug linked to renaming
* Fix wrong loadout being used while renaming and color not being reapplied
* Fix other possible issue with renaming
* Change missing items color to be more colorblind friendly
* Fix typo and improve return check in getWeight
* Disable debug and re-enable compile cache for common and arsenal
* Remove uneccessary newline in arsenal's script_component.hpp
2017-12-07 07:48:10 +00:00
|
|
|
// Pixel grid
|
|
|
|
#define pixelScale 0.25
|
|
|
|
#define GRID_W (pixelW * pixelGridNoUIScale * pixelScale)
|
|
|
|
#define GRID_H (pixelH * pixelGridNoUIScale * pixelScale)
|
|
|
|
|
2018-01-05 17:56:21 +00:00
|
|
|
#define WIDTH_TOTAL (safezoneW - 2 * (93 * GRID_W))
|
|
|
|
#define WIDTH_GAP (WIDTH_TOTAL / 100)
|
|
|
|
#define WIDTH_SINGLE ((WIDTH_TOTAL - 6 * WIDTH_GAP) / 5)
|
|
|
|
|
Add ACE_Arsenal (#5734)
* Add CBA setting for modIcons
* Add CBA settings for camera control
* Merge the 2 inverted settings into one
There's no man crazy enough to need one inverted and the other normal
* Add back missing newline
* Change rscCommon, don't redefine base classes
* Change anim to "civil" when not in a weapon or special tab
* Fix current handgun ending up in launchers tab and vice versa
* Change back virtualItems first index to primary secondary handgun
* Add ace_arsenal_hide config check and config entry
* Add dogtags handling in postInit
* Add CBA setting for fontHeight for left and right panel
* magazineGroups
* Add base layout for loadouts GUI
* Prepare the SQF base for the loadouts display
* Continue laying the base for the SQF of the loadouts display
* Add CBA settings for the loadouts display
* Implement button logic for loadouts display
* Finish button logic, start adding filling and button funcs
* Add editBox for loadout names
* Add loadout saving and deleting
* Add loadouts loading
* Add select current after list is refreshed after saving
* Redo button layout, Add rename button, Add messages
* Add double click loading
* Fix loadout deleting not triggering curSel change
* Keep cursor at same index when deleting loadouts
Woops
* Reload pictures when saving over old loadout
* Fix loadout save not updating the pictures properly (again)
* Add close button for loadouts dialog
* Fix weight not updating when using arrows to add / remove items
* Make the arsenal layout a bit prettier
* Start adding non available items and missing mods for loadouts
* Remove useless lines in fillLoadouts
* Move buttonHide above panel fill in loadoutsClose
* Change the way weapons are checked in fillLoadoutsList
* Add weapon in container support for fillLoadoutsList
* Add mag in container check for fillLoadoutsList
* Add item check for containers in fillLoadoutsList
* Fix item duplication when loadout loadouts
* Switch anim to civil for the rest of the tabs that need it
* Make extra sure item duplication won't happen
* Fix right panel hiding issues
* Fix remove all button, use QGVAR for EHs names, add isMP check to share tab
* Fix initBox erroring out if the object is null
* Move loadout checking to it's own func
* Force panel reload every time loadoutList change
I'm forced to do this, I can't save arrays in listnboxes
* Change how loadouts are retrived from the listnbox
* Fix save overwriting existing loadout not updating right row
* Fix indentation in buttonLoadoutsSave
* Fix reserved var error
* Fix fillLoadoutlist tab check
* Fix accessories in containers not being checked properly via verifyLoadout
* Fix binos not being detected properly by verifyLoadout
* Fix pre-filled backpacks not behaving properly
* Add mine detector check in configScan and onArsenalOpen
* Add extra traces
* Add mine detector check in non cached part of addVirtualItems
* Move right panel greying to it's own func
* Fix right panel listnbox for items with mass under 1
* Redo unique items sorting in onArsenalOpen
* Add loadoutSaved EH, handle empty name box for loadout saving
* Reapply inisgnia after loadout is loaded
* Change LoadoutSaved to loadoutSaved
* Rename savedLoadout to onLoadoutSave
* Change buttonLoadoutsSave layout to prepare base weapon saving
* Save base class for weapons when saving loadouts
* Remove unused profiling code related code
* Add not implemented warning messages for export and import
* Fix error when saving with a container or weapon slot being empty
* Remove dogtags from loadout upon loadout saving
* Change how misc item mass is retrieved
* Remove vanilla "NoVoice" from voices to avoid an error related to it
* Use tolower for currentData and itemsToCheck in fillLeftPanel
Avoid camelCase issues with the commands that don't fucking respect it.
* Remove redundant check in postInit
* Fix sharedLoadouts condition in onArsenalOpen, Fix save button logic
* Prepare sharedLoadouts addition
* Add loadout sharing
* Add proper saving and loading for shared loadouts
* Change loadout deleted / unshared EH name, add said EH to unsharing
* Remove shared loadouts from disconnected players
* Fix error in buttonLoadoutsSave, add row when other share a loadout
* Change sharedLoadouts tab curSel selection to lnbData instead of lnbText
* Add data when adding a new row via CBA EH
* Remove mode, add arg to openBox to have arsenal prefilled
* Cleanup buttonClearAll code
* Fix itemInfo behavior when switching between items that don't have logos
Fix #23
* Add copy paste and arrow key support for searchbars
Close #22
* Add back newline at EOF for onKeyDown
* Change default camera setting from non inverted to inverted
* Fix import and export "not implemented" message
* Rename share button to Unshare when loadout selected is shared
* Improve missing items logging, cache verifyLoadout check
* Remove unused var
* Add full 3DEN support
* Remove 3DEN sphere and grid, set helper center dir properly
* Change 3DEN lightsource intensity
* Save 3DEN inventory properly
* Rewrite onArsenalClose 3DEN comment
* Fix sharedLoadouts check
* Add 3DEN support for defaultTab
* Add new event for 3rd parties in buttonCargo
* Move weight update to updateRightPanel for buttonCargo and selChangedListnBox
* Fix defaultLoadout save button
* Remove unallowed command
* Fix arsenal messages not working in 3DEN
* Add export current loadout, Add export defaultLoadoutsList
Signed-off-by: Josuan Albin <josuanalbin@outlook.fr>
* Add import button functionality
* Change export / import messages
* Change message to use scheduled only
* Attempt to sanitize data in import func
* Add a 3DEN attribute to save defaultLoadoutsList, fix shared loadout check
* Replace 2 last traces in verifyLoadout
* Change defaultLoadoutsList export format and add a 3DEN check for it's default value
* Fix original array being modified in fillLoadoutsList
* Improve shared loadout check
* Fix removeVirtualItems not removing Accs, nil virtualItems var in removeBox
* Add zeus support for arsenal rewrite, fix openBox camera check
* Add isPlayer check to arsenal rewrite part of bi module
Arsenal rewrite does not seem to work on remote players, welp, I tried at least
* Fix shared loadouts loadout index being null
Forgot to change that one getVar
* Hide shared column if sharing is disabled on My loadouts tab
* Remove trace from loadoutsLoad, add trace to shared and unshared EHs
* Fix postInit trace
* Fix sharing EHs being broken, remove traces in them, prevent possible issue
yeah, _x params doesn't work there :p
* Fix fillLoadoutsList error
* Start translating and code reviewing
* Add editing vehicle crew loadout support for arsenal
* Move left panel filling above 3DEN handling to avoid float crew members
* Fix onArsenalClose EOF, add header for it
* Move onButton EHs to config, remove placeholder stats func
* Add headers for onLoadouts funcs and verifyLoadout
* Clean up buttonClearAll
* Fix assigned items not being added properly to currentItems on loadout load
* Add more function headers
* Make rename work in default loadouts tab in 3DEN
* Add more functions headers, continue code review
* Add more functions headers, finish code review
* Fix loadout saving to profile from an other tab than my loadouts
* Fix loadout saving even more
* Attempt to fix loadouts handling
From totally broken to somewhat usable.
* Even more fixing
* Add back onLoadoutSave EH
* Add back author message in loadoutSave
* Add back EOF newline
* Add back loadout caching
* Remove unique items from saved and loaded loadouts
* Add unique item support for the remaining container tabs
* Fix mag check for magazine type in container
* Add support for CfgVehicles and CfgGlasses in miscItems
* Add button highlighting for loadouts display, fix mag put and throw check
* Change shared column to show a proper icon
* Revert "Move onButton EHs to config, remove placeholder stats func"
This reverts commit 1be5d92426e580683b265dd92c95fafa363765bb.
* Add back EOL newline in prep, remove stats placeholder again
* Add part of the german translation
* Add more translations, change how shared button text is managed
* Add scheduled check in openBox to avoid issues with people using addaction
Because you know they will.
* Add translations for import and export messages
* Fix comms tab defaulting to empty
* Align buttons perfectly for loadouts display, translation for delete action
* Add loadout saved translations
* Add load and rename messages translations
* localized interaction name in initBox
* Fix issue when admins deleted a loadout didn't change the icon status for authors
* Fix loadout import, update unique items list after import / loadout load
* Beautify UI a bit
* Add setting to toggle missing / unavailable items RPT logging
* Add settings strings
* Increase button size for main display
* Change DLC logo side in infoBox
* Change loadouts display buttons spacing, change deleteLoadout button active color
* Remove camera rotation limit
* Add polish translation
* German translation by @bux
* Order
* Fix typo in buttonExport, add credits in handleMouse
* Fix right panel item count not updating properly in certain scenarios
* Add loadoutName check when importing default loadouts, change assignedItems check
* Improve onSelChangedRight, fix typos in onSelChangedLeft and handleSearchbar
* Fix syntax check in removeVirtualItems count
* Shorten onSelChangedRightListnbox by improving current tab check
* Improve fillLeftPanel weapon tab filling
* Move lnbSetPicture occurences for the loadouts display to a define
* scan config opti
* Fix RPT logging check in fillLoadoutsList, use picture macro for shared tab
* Fix sharing and RPT logging settings having the same var
* Add newline at EOF for funcs that are missing it
* Move GVAR(sharedLoadoutsVars) to sharedLoadoutsNamespace
* newline eof
commy contributed too!
* Fix delete button not working as intended in public tab
* Replace bis_fnc_baseWeapon with CBA equivalent everywhere outisde of scanConfig
* Revert "Replace bis_fnc_baseWeapon with CBA equivalent everywhere outisde of scanConfig"
This reverts commit 496e6f822344e460312e68cd1334a0643ea28bef.
* Add new Cfg entry for handling unique items saving, add entry to chemlight shields
* Fix currentMag tab not detecting current mag properly (still experimental)
* Improve left and right filled EHs, add "Dog Tags:" for dogtag uniques
* Change how the right panel first update works
* Fix updateRightPanel very obscure bug and header typo
* Move postInit EHs for medical and dogtags to their respective postInit
* Fix medical postInit typo
* Add currentMag tabs for primary and secondary muzzles properly
* Fix container compatible mags tab not showing anything
* Replace an inline if to select in fillRightPanel
* Attempt to fix accs recognition when switching weapons
* Improve currentMag2 tab show / hide logic
Secondary and handguns can't have a secondary mauzzle
* Add strings for currentMag and currentMag2 tabs
* Readd strings that tabler accidentally removed
* Make sorting for the right panel stay the same when switching items / tabs
* Replace bis_fnc_addWeapon by the addWeapon command
bis_fnc_addWeapon failed when a weapon with the same classname was in one of the player's containers
Add mag for primary muzzle after the weapon is added, is possibly replaced by current mag(s) saved in curentItems
* Replace BIS_fnc_overviewAuthor in itemInfo
It works better
* Display itemInfo box properly for currentMag1 and 2 tabs
* Don't reset arsenal vision mode after quitting arsenal
* Improve showItem
* Remove trace from showItem
* Move getWeight and weight string from movement to common
* Fix typos in addVirtualItems
* Comment back compile cache for common
(Not yet for arsenal, not until it's validated for a merge)
* Replace secondaryMuzzleMag tab icon by @Max255PL 's
* Update @Max255PL 's icon
* Add missing author strings
* Add debug trace for a specific issue
* Add more traces in loadoutsSave
* Fix bug in loadoutsSave, remove debug traces
* Fix typo in loadoutsSave
* Fix uniqueBase cfg check for all cases in loadoutsSave
* Improve whitelisting for current weapon accs and mags
* Update CBA settings strings, change RPT logging to be turned off by default
* Update polish translation by @max255PL
* Fix saving loadouts when no loadout has ever been saved
* Make loadout screen lighter
* Save camera position and view mode for ace arsenal
* Improve loadouts screen presentation
* Improve loadouts screen readability
* Improve camera angle in loadout screen
* Improve loadout renaming, Fix bug linked to renaming
* Fix wrong loadout being used while renaming and color not being reapplied
* Fix other possible issue with renaming
* Change missing items color to be more colorblind friendly
* Fix typo and improve return check in getWeight
* Disable debug and re-enable compile cache for common and arsenal
* Remove uneccessary newline in arsenal's script_component.hpp
2017-12-07 07:48:10 +00:00
|
|
|
// IDCs
|
|
|
|
#define IDD_ace_arsenal 1127001
|
|
|
|
#define IDC_mouseArea 0
|
|
|
|
#define IDC_arrowMinus 101
|
|
|
|
#define IDC_arrowPlus 102
|
|
|
|
#define IDC_blockLeftFrame 3
|
|
|
|
#define IDC_blockLeftBackground 4
|
|
|
|
#define IDC_blockRightFrame 5
|
|
|
|
#define IDC_blockRighttBackground 6
|
|
|
|
#define IDC_loadIndicator 7
|
|
|
|
#define IDC_loadIndicatorBar 701
|
|
|
|
#define IDC_totalWeight 8
|
|
|
|
#define IDC_totalWeightText 801
|
|
|
|
#define IDC_message 9
|
|
|
|
#define IDC_menuBar 10
|
2017-12-24 19:41:13 +00:00
|
|
|
#define IDC_menuBarClose 1001
|
2018-01-28 21:39:46 +00:00
|
|
|
#define IDC_buttonHide 1002
|
|
|
|
#define IDC_buttonLoadouts 1003
|
|
|
|
#define IDC_buttonExport 1004
|
|
|
|
#define IDC_buttonImport 1005
|
Add ACE_Arsenal (#5734)
* Add CBA setting for modIcons
* Add CBA settings for camera control
* Merge the 2 inverted settings into one
There's no man crazy enough to need one inverted and the other normal
* Add back missing newline
* Change rscCommon, don't redefine base classes
* Change anim to "civil" when not in a weapon or special tab
* Fix current handgun ending up in launchers tab and vice versa
* Change back virtualItems first index to primary secondary handgun
* Add ace_arsenal_hide config check and config entry
* Add dogtags handling in postInit
* Add CBA setting for fontHeight for left and right panel
* magazineGroups
* Add base layout for loadouts GUI
* Prepare the SQF base for the loadouts display
* Continue laying the base for the SQF of the loadouts display
* Add CBA settings for the loadouts display
* Implement button logic for loadouts display
* Finish button logic, start adding filling and button funcs
* Add editBox for loadout names
* Add loadout saving and deleting
* Add loadouts loading
* Add select current after list is refreshed after saving
* Redo button layout, Add rename button, Add messages
* Add double click loading
* Fix loadout deleting not triggering curSel change
* Keep cursor at same index when deleting loadouts
Woops
* Reload pictures when saving over old loadout
* Fix loadout save not updating the pictures properly (again)
* Add close button for loadouts dialog
* Fix weight not updating when using arrows to add / remove items
* Make the arsenal layout a bit prettier
* Start adding non available items and missing mods for loadouts
* Remove useless lines in fillLoadouts
* Move buttonHide above panel fill in loadoutsClose
* Change the way weapons are checked in fillLoadoutsList
* Add weapon in container support for fillLoadoutsList
* Add mag in container check for fillLoadoutsList
* Add item check for containers in fillLoadoutsList
* Fix item duplication when loadout loadouts
* Switch anim to civil for the rest of the tabs that need it
* Make extra sure item duplication won't happen
* Fix right panel hiding issues
* Fix remove all button, use QGVAR for EHs names, add isMP check to share tab
* Fix initBox erroring out if the object is null
* Move loadout checking to it's own func
* Force panel reload every time loadoutList change
I'm forced to do this, I can't save arrays in listnboxes
* Change how loadouts are retrived from the listnbox
* Fix save overwriting existing loadout not updating right row
* Fix indentation in buttonLoadoutsSave
* Fix reserved var error
* Fix fillLoadoutlist tab check
* Fix accessories in containers not being checked properly via verifyLoadout
* Fix binos not being detected properly by verifyLoadout
* Fix pre-filled backpacks not behaving properly
* Add mine detector check in configScan and onArsenalOpen
* Add extra traces
* Add mine detector check in non cached part of addVirtualItems
* Move right panel greying to it's own func
* Fix right panel listnbox for items with mass under 1
* Redo unique items sorting in onArsenalOpen
* Add loadoutSaved EH, handle empty name box for loadout saving
* Reapply inisgnia after loadout is loaded
* Change LoadoutSaved to loadoutSaved
* Rename savedLoadout to onLoadoutSave
* Change buttonLoadoutsSave layout to prepare base weapon saving
* Save base class for weapons when saving loadouts
* Remove unused profiling code related code
* Add not implemented warning messages for export and import
* Fix error when saving with a container or weapon slot being empty
* Remove dogtags from loadout upon loadout saving
* Change how misc item mass is retrieved
* Remove vanilla "NoVoice" from voices to avoid an error related to it
* Use tolower for currentData and itemsToCheck in fillLeftPanel
Avoid camelCase issues with the commands that don't fucking respect it.
* Remove redundant check in postInit
* Fix sharedLoadouts condition in onArsenalOpen, Fix save button logic
* Prepare sharedLoadouts addition
* Add loadout sharing
* Add proper saving and loading for shared loadouts
* Change loadout deleted / unshared EH name, add said EH to unsharing
* Remove shared loadouts from disconnected players
* Fix error in buttonLoadoutsSave, add row when other share a loadout
* Change sharedLoadouts tab curSel selection to lnbData instead of lnbText
* Add data when adding a new row via CBA EH
* Remove mode, add arg to openBox to have arsenal prefilled
* Cleanup buttonClearAll code
* Fix itemInfo behavior when switching between items that don't have logos
Fix #23
* Add copy paste and arrow key support for searchbars
Close #22
* Add back newline at EOF for onKeyDown
* Change default camera setting from non inverted to inverted
* Fix import and export "not implemented" message
* Rename share button to Unshare when loadout selected is shared
* Improve missing items logging, cache verifyLoadout check
* Remove unused var
* Add full 3DEN support
* Remove 3DEN sphere and grid, set helper center dir properly
* Change 3DEN lightsource intensity
* Save 3DEN inventory properly
* Rewrite onArsenalClose 3DEN comment
* Fix sharedLoadouts check
* Add 3DEN support for defaultTab
* Add new event for 3rd parties in buttonCargo
* Move weight update to updateRightPanel for buttonCargo and selChangedListnBox
* Fix defaultLoadout save button
* Remove unallowed command
* Fix arsenal messages not working in 3DEN
* Add export current loadout, Add export defaultLoadoutsList
Signed-off-by: Josuan Albin <josuanalbin@outlook.fr>
* Add import button functionality
* Change export / import messages
* Change message to use scheduled only
* Attempt to sanitize data in import func
* Add a 3DEN attribute to save defaultLoadoutsList, fix shared loadout check
* Replace 2 last traces in verifyLoadout
* Change defaultLoadoutsList export format and add a 3DEN check for it's default value
* Fix original array being modified in fillLoadoutsList
* Improve shared loadout check
* Fix removeVirtualItems not removing Accs, nil virtualItems var in removeBox
* Add zeus support for arsenal rewrite, fix openBox camera check
* Add isPlayer check to arsenal rewrite part of bi module
Arsenal rewrite does not seem to work on remote players, welp, I tried at least
* Fix shared loadouts loadout index being null
Forgot to change that one getVar
* Hide shared column if sharing is disabled on My loadouts tab
* Remove trace from loadoutsLoad, add trace to shared and unshared EHs
* Fix postInit trace
* Fix sharing EHs being broken, remove traces in them, prevent possible issue
yeah, _x params doesn't work there :p
* Fix fillLoadoutsList error
* Start translating and code reviewing
* Add editing vehicle crew loadout support for arsenal
* Move left panel filling above 3DEN handling to avoid float crew members
* Fix onArsenalClose EOF, add header for it
* Move onButton EHs to config, remove placeholder stats func
* Add headers for onLoadouts funcs and verifyLoadout
* Clean up buttonClearAll
* Fix assigned items not being added properly to currentItems on loadout load
* Add more function headers
* Make rename work in default loadouts tab in 3DEN
* Add more functions headers, continue code review
* Add more functions headers, finish code review
* Fix loadout saving to profile from an other tab than my loadouts
* Fix loadout saving even more
* Attempt to fix loadouts handling
From totally broken to somewhat usable.
* Even more fixing
* Add back onLoadoutSave EH
* Add back author message in loadoutSave
* Add back EOF newline
* Add back loadout caching
* Remove unique items from saved and loaded loadouts
* Add unique item support for the remaining container tabs
* Fix mag check for magazine type in container
* Add support for CfgVehicles and CfgGlasses in miscItems
* Add button highlighting for loadouts display, fix mag put and throw check
* Change shared column to show a proper icon
* Revert "Move onButton EHs to config, remove placeholder stats func"
This reverts commit 1be5d92426e580683b265dd92c95fafa363765bb.
* Add back EOL newline in prep, remove stats placeholder again
* Add part of the german translation
* Add more translations, change how shared button text is managed
* Add scheduled check in openBox to avoid issues with people using addaction
Because you know they will.
* Add translations for import and export messages
* Fix comms tab defaulting to empty
* Align buttons perfectly for loadouts display, translation for delete action
* Add loadout saved translations
* Add load and rename messages translations
* localized interaction name in initBox
* Fix issue when admins deleted a loadout didn't change the icon status for authors
* Fix loadout import, update unique items list after import / loadout load
* Beautify UI a bit
* Add setting to toggle missing / unavailable items RPT logging
* Add settings strings
* Increase button size for main display
* Change DLC logo side in infoBox
* Change loadouts display buttons spacing, change deleteLoadout button active color
* Remove camera rotation limit
* Add polish translation
* German translation by @bux
* Order
* Fix typo in buttonExport, add credits in handleMouse
* Fix right panel item count not updating properly in certain scenarios
* Add loadoutName check when importing default loadouts, change assignedItems check
* Improve onSelChangedRight, fix typos in onSelChangedLeft and handleSearchbar
* Fix syntax check in removeVirtualItems count
* Shorten onSelChangedRightListnbox by improving current tab check
* Improve fillLeftPanel weapon tab filling
* Move lnbSetPicture occurences for the loadouts display to a define
* scan config opti
* Fix RPT logging check in fillLoadoutsList, use picture macro for shared tab
* Fix sharing and RPT logging settings having the same var
* Add newline at EOF for funcs that are missing it
* Move GVAR(sharedLoadoutsVars) to sharedLoadoutsNamespace
* newline eof
commy contributed too!
* Fix delete button not working as intended in public tab
* Replace bis_fnc_baseWeapon with CBA equivalent everywhere outisde of scanConfig
* Revert "Replace bis_fnc_baseWeapon with CBA equivalent everywhere outisde of scanConfig"
This reverts commit 496e6f822344e460312e68cd1334a0643ea28bef.
* Add new Cfg entry for handling unique items saving, add entry to chemlight shields
* Fix currentMag tab not detecting current mag properly (still experimental)
* Improve left and right filled EHs, add "Dog Tags:" for dogtag uniques
* Change how the right panel first update works
* Fix updateRightPanel very obscure bug and header typo
* Move postInit EHs for medical and dogtags to their respective postInit
* Fix medical postInit typo
* Add currentMag tabs for primary and secondary muzzles properly
* Fix container compatible mags tab not showing anything
* Replace an inline if to select in fillRightPanel
* Attempt to fix accs recognition when switching weapons
* Improve currentMag2 tab show / hide logic
Secondary and handguns can't have a secondary mauzzle
* Add strings for currentMag and currentMag2 tabs
* Readd strings that tabler accidentally removed
* Make sorting for the right panel stay the same when switching items / tabs
* Replace bis_fnc_addWeapon by the addWeapon command
bis_fnc_addWeapon failed when a weapon with the same classname was in one of the player's containers
Add mag for primary muzzle after the weapon is added, is possibly replaced by current mag(s) saved in curentItems
* Replace BIS_fnc_overviewAuthor in itemInfo
It works better
* Display itemInfo box properly for currentMag1 and 2 tabs
* Don't reset arsenal vision mode after quitting arsenal
* Improve showItem
* Remove trace from showItem
* Move getWeight and weight string from movement to common
* Fix typos in addVirtualItems
* Comment back compile cache for common
(Not yet for arsenal, not until it's validated for a merge)
* Replace secondaryMuzzleMag tab icon by @Max255PL 's
* Update @Max255PL 's icon
* Add missing author strings
* Add debug trace for a specific issue
* Add more traces in loadoutsSave
* Fix bug in loadoutsSave, remove debug traces
* Fix typo in loadoutsSave
* Fix uniqueBase cfg check for all cases in loadoutsSave
* Improve whitelisting for current weapon accs and mags
* Update CBA settings strings, change RPT logging to be turned off by default
* Update polish translation by @max255PL
* Fix saving loadouts when no loadout has ever been saved
* Make loadout screen lighter
* Save camera position and view mode for ace arsenal
* Improve loadouts screen presentation
* Improve loadouts screen readability
* Improve camera angle in loadout screen
* Improve loadout renaming, Fix bug linked to renaming
* Fix wrong loadout being used while renaming and color not being reapplied
* Fix other possible issue with renaming
* Change missing items color to be more colorblind friendly
* Fix typo and improve return check in getWeight
* Disable debug and re-enable compile cache for common and arsenal
* Remove uneccessary newline in arsenal's script_component.hpp
2017-12-07 07:48:10 +00:00
|
|
|
#define IDC_infoBox 11
|
|
|
|
#define IDC_infoBackground 1101
|
|
|
|
#define IDC_infoName 1102
|
|
|
|
#define IDC_infoAuthor 1103
|
|
|
|
#define IDC_DLCBackground 1104
|
|
|
|
#define IDC_DLCIcon 1105
|
|
|
|
#define IDC_mouseBlock 12
|
|
|
|
#define IDC_leftTabContent 13
|
|
|
|
#define IDC_rightTabContent 14
|
|
|
|
#define IDC_rightTabContentListnBox 15
|
|
|
|
#define IDC_sortLeftTab 16
|
|
|
|
#define IDC_sortRightTab 17
|
|
|
|
#define IDC_leftSearchbar 18
|
|
|
|
#define IDC_leftSearchbarButton 41
|
|
|
|
#define IDC_rightSearchbar 19
|
|
|
|
#define IDC_rightSearchbarButton 42
|
|
|
|
#define IDC_tabLeft 20
|
|
|
|
#define IDC_iconBackgroundPrimaryWeapon 2001
|
|
|
|
#define IDC_buttonPrimaryWeapon 2002
|
|
|
|
#define IDC_iconBackgroundHandgun 2003
|
|
|
|
#define IDC_buttonHandgun 2004
|
|
|
|
#define IDC_iconBackgroundSecondaryWeapon 2005
|
|
|
|
#define IDC_buttonSecondaryWeapon 2006
|
|
|
|
#define IDC_iconBackgroundHeadgear 2007
|
|
|
|
#define IDC_buttonHeadgear 2008
|
|
|
|
#define IDC_iconBackgroundUniform 2009
|
|
|
|
#define IDC_buttonUniform 2010
|
|
|
|
#define IDC_iconBackgroundVest 2011
|
|
|
|
#define IDC_buttonVest 2012
|
|
|
|
#define IDC_iconBackgroundBackpack 2013
|
|
|
|
#define IDC_buttonBackpack 2014
|
|
|
|
#define IDC_iconBackgroundGoggles 2015
|
|
|
|
#define IDC_buttonGoggles 2016
|
|
|
|
#define IDC_iconBackgroundNVG 2017
|
|
|
|
#define IDC_buttonNVG 2018
|
|
|
|
#define IDC_iconBackgroundBinoculars 2019
|
|
|
|
#define IDC_buttonBinoculars 2020
|
|
|
|
#define IDC_iconBackgroundMap 2021
|
|
|
|
#define IDC_buttonMap 2022
|
|
|
|
#define IDC_iconBackgroundGPS 2023
|
|
|
|
#define IDC_buttonGPS 2024
|
|
|
|
#define IDC_iconBackgroundRadio 2025
|
|
|
|
#define IDC_buttonRadio 2026
|
|
|
|
#define IDC_iconBackgroundCompass 2028
|
|
|
|
#define IDC_buttonCompass 2029
|
|
|
|
#define IDC_iconBackgroundWatch 2030
|
|
|
|
#define IDC_buttonWatch 2031
|
|
|
|
#define IDC_iconBackgroundFace 2032
|
|
|
|
#define IDC_buttonFace 2033
|
|
|
|
#define IDC_iconBackgroundVoice 2034
|
|
|
|
#define IDC_buttonVoice 2035
|
|
|
|
#define IDC_iconBackgroundInsigna 2036
|
|
|
|
#define IDC_buttonInsigna 2037
|
|
|
|
#define IDC_iconBackgroundOptic 21
|
|
|
|
#define IDC_buttonOptic 22
|
|
|
|
#define IDC_iconBackgroundItemAcc 23
|
|
|
|
#define IDC_buttonItemAcc 24
|
|
|
|
#define IDC_iconBackgroundMuzzle 25
|
|
|
|
#define IDC_buttonMuzzle 26
|
|
|
|
#define IDC_iconBackgroundBipod 27
|
|
|
|
#define IDC_buttonBipod 28
|
|
|
|
#define IDC_iconBackgroundCurrentMag 3001
|
|
|
|
#define IDC_buttonCurrentMag 3002
|
|
|
|
#define IDC_iconBackgroundCurrentMag2 3003
|
|
|
|
#define IDC_buttonCurrentMag2 3004
|
|
|
|
#define IDC_iconBackgroundMag 29
|
|
|
|
#define IDC_buttonMag 30
|
|
|
|
#define IDC_iconBackgroundMagALL 31
|
|
|
|
#define IDC_buttonMagALL 32
|
|
|
|
#define IDC_iconBackgroundThrow 33
|
|
|
|
#define IDC_buttonThrow 34
|
|
|
|
#define IDC_iconBackgroundPut 35
|
|
|
|
#define IDC_buttonPut 36
|
|
|
|
#define IDC_iconBackgroundMisc 37
|
|
|
|
#define IDC_buttonMisc 38
|
|
|
|
#define IDC_buttonRemoveAllSelected 39
|
|
|
|
#define IDC_buttonRemoveAll 40
|
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 16:03:22 +00:00
|
|
|
#define IDC_statsBox 51
|
|
|
|
#define IDC_statsTitle1 5101
|
|
|
|
#define IDC_statsBackground1 5102
|
|
|
|
#define IDC_statsBar1 5103
|
|
|
|
#define IDC_statsText1 5104
|
|
|
|
#define IDC_statsTitle2 5105
|
|
|
|
#define IDC_statsBackground2 5106
|
|
|
|
#define IDC_statsBar2 5107
|
|
|
|
#define IDC_statsText2 5108
|
|
|
|
#define IDC_statsTitle3 5109
|
|
|
|
#define IDC_statsBackground3 5110
|
|
|
|
#define IDC_statsBar3 5111
|
|
|
|
#define IDC_statsText3 5112
|
|
|
|
#define IDC_statsTitle4 5113
|
|
|
|
#define IDC_statsBackground4 5114
|
|
|
|
#define IDC_statsBar4 5115
|
|
|
|
#define IDC_statsText4 5116
|
|
|
|
#define IDC_statsTitle5 5117
|
|
|
|
#define IDC_statsBackground5 5118
|
|
|
|
#define IDC_statsBar5 5119
|
|
|
|
#define IDC_statsText5 5120
|
|
|
|
#define IDC_statsPreviousPage 52
|
|
|
|
#define IDC_statsNextPage 53
|
|
|
|
#define IDC_statsCurrentPage 54
|
|
|
|
#define IDC_statsButton 55
|
|
|
|
#define IDC_statsButtonClose 56
|
Add ACE_Arsenal (#5734)
* Add CBA setting for modIcons
* Add CBA settings for camera control
* Merge the 2 inverted settings into one
There's no man crazy enough to need one inverted and the other normal
* Add back missing newline
* Change rscCommon, don't redefine base classes
* Change anim to "civil" when not in a weapon or special tab
* Fix current handgun ending up in launchers tab and vice versa
* Change back virtualItems first index to primary secondary handgun
* Add ace_arsenal_hide config check and config entry
* Add dogtags handling in postInit
* Add CBA setting for fontHeight for left and right panel
* magazineGroups
* Add base layout for loadouts GUI
* Prepare the SQF base for the loadouts display
* Continue laying the base for the SQF of the loadouts display
* Add CBA settings for the loadouts display
* Implement button logic for loadouts display
* Finish button logic, start adding filling and button funcs
* Add editBox for loadout names
* Add loadout saving and deleting
* Add loadouts loading
* Add select current after list is refreshed after saving
* Redo button layout, Add rename button, Add messages
* Add double click loading
* Fix loadout deleting not triggering curSel change
* Keep cursor at same index when deleting loadouts
Woops
* Reload pictures when saving over old loadout
* Fix loadout save not updating the pictures properly (again)
* Add close button for loadouts dialog
* Fix weight not updating when using arrows to add / remove items
* Make the arsenal layout a bit prettier
* Start adding non available items and missing mods for loadouts
* Remove useless lines in fillLoadouts
* Move buttonHide above panel fill in loadoutsClose
* Change the way weapons are checked in fillLoadoutsList
* Add weapon in container support for fillLoadoutsList
* Add mag in container check for fillLoadoutsList
* Add item check for containers in fillLoadoutsList
* Fix item duplication when loadout loadouts
* Switch anim to civil for the rest of the tabs that need it
* Make extra sure item duplication won't happen
* Fix right panel hiding issues
* Fix remove all button, use QGVAR for EHs names, add isMP check to share tab
* Fix initBox erroring out if the object is null
* Move loadout checking to it's own func
* Force panel reload every time loadoutList change
I'm forced to do this, I can't save arrays in listnboxes
* Change how loadouts are retrived from the listnbox
* Fix save overwriting existing loadout not updating right row
* Fix indentation in buttonLoadoutsSave
* Fix reserved var error
* Fix fillLoadoutlist tab check
* Fix accessories in containers not being checked properly via verifyLoadout
* Fix binos not being detected properly by verifyLoadout
* Fix pre-filled backpacks not behaving properly
* Add mine detector check in configScan and onArsenalOpen
* Add extra traces
* Add mine detector check in non cached part of addVirtualItems
* Move right panel greying to it's own func
* Fix right panel listnbox for items with mass under 1
* Redo unique items sorting in onArsenalOpen
* Add loadoutSaved EH, handle empty name box for loadout saving
* Reapply inisgnia after loadout is loaded
* Change LoadoutSaved to loadoutSaved
* Rename savedLoadout to onLoadoutSave
* Change buttonLoadoutsSave layout to prepare base weapon saving
* Save base class for weapons when saving loadouts
* Remove unused profiling code related code
* Add not implemented warning messages for export and import
* Fix error when saving with a container or weapon slot being empty
* Remove dogtags from loadout upon loadout saving
* Change how misc item mass is retrieved
* Remove vanilla "NoVoice" from voices to avoid an error related to it
* Use tolower for currentData and itemsToCheck in fillLeftPanel
Avoid camelCase issues with the commands that don't fucking respect it.
* Remove redundant check in postInit
* Fix sharedLoadouts condition in onArsenalOpen, Fix save button logic
* Prepare sharedLoadouts addition
* Add loadout sharing
* Add proper saving and loading for shared loadouts
* Change loadout deleted / unshared EH name, add said EH to unsharing
* Remove shared loadouts from disconnected players
* Fix error in buttonLoadoutsSave, add row when other share a loadout
* Change sharedLoadouts tab curSel selection to lnbData instead of lnbText
* Add data when adding a new row via CBA EH
* Remove mode, add arg to openBox to have arsenal prefilled
* Cleanup buttonClearAll code
* Fix itemInfo behavior when switching between items that don't have logos
Fix #23
* Add copy paste and arrow key support for searchbars
Close #22
* Add back newline at EOF for onKeyDown
* Change default camera setting from non inverted to inverted
* Fix import and export "not implemented" message
* Rename share button to Unshare when loadout selected is shared
* Improve missing items logging, cache verifyLoadout check
* Remove unused var
* Add full 3DEN support
* Remove 3DEN sphere and grid, set helper center dir properly
* Change 3DEN lightsource intensity
* Save 3DEN inventory properly
* Rewrite onArsenalClose 3DEN comment
* Fix sharedLoadouts check
* Add 3DEN support for defaultTab
* Add new event for 3rd parties in buttonCargo
* Move weight update to updateRightPanel for buttonCargo and selChangedListnBox
* Fix defaultLoadout save button
* Remove unallowed command
* Fix arsenal messages not working in 3DEN
* Add export current loadout, Add export defaultLoadoutsList
Signed-off-by: Josuan Albin <josuanalbin@outlook.fr>
* Add import button functionality
* Change export / import messages
* Change message to use scheduled only
* Attempt to sanitize data in import func
* Add a 3DEN attribute to save defaultLoadoutsList, fix shared loadout check
* Replace 2 last traces in verifyLoadout
* Change defaultLoadoutsList export format and add a 3DEN check for it's default value
* Fix original array being modified in fillLoadoutsList
* Improve shared loadout check
* Fix removeVirtualItems not removing Accs, nil virtualItems var in removeBox
* Add zeus support for arsenal rewrite, fix openBox camera check
* Add isPlayer check to arsenal rewrite part of bi module
Arsenal rewrite does not seem to work on remote players, welp, I tried at least
* Fix shared loadouts loadout index being null
Forgot to change that one getVar
* Hide shared column if sharing is disabled on My loadouts tab
* Remove trace from loadoutsLoad, add trace to shared and unshared EHs
* Fix postInit trace
* Fix sharing EHs being broken, remove traces in them, prevent possible issue
yeah, _x params doesn't work there :p
* Fix fillLoadoutsList error
* Start translating and code reviewing
* Add editing vehicle crew loadout support for arsenal
* Move left panel filling above 3DEN handling to avoid float crew members
* Fix onArsenalClose EOF, add header for it
* Move onButton EHs to config, remove placeholder stats func
* Add headers for onLoadouts funcs and verifyLoadout
* Clean up buttonClearAll
* Fix assigned items not being added properly to currentItems on loadout load
* Add more function headers
* Make rename work in default loadouts tab in 3DEN
* Add more functions headers, continue code review
* Add more functions headers, finish code review
* Fix loadout saving to profile from an other tab than my loadouts
* Fix loadout saving even more
* Attempt to fix loadouts handling
From totally broken to somewhat usable.
* Even more fixing
* Add back onLoadoutSave EH
* Add back author message in loadoutSave
* Add back EOF newline
* Add back loadout caching
* Remove unique items from saved and loaded loadouts
* Add unique item support for the remaining container tabs
* Fix mag check for magazine type in container
* Add support for CfgVehicles and CfgGlasses in miscItems
* Add button highlighting for loadouts display, fix mag put and throw check
* Change shared column to show a proper icon
* Revert "Move onButton EHs to config, remove placeholder stats func"
This reverts commit 1be5d92426e580683b265dd92c95fafa363765bb.
* Add back EOL newline in prep, remove stats placeholder again
* Add part of the german translation
* Add more translations, change how shared button text is managed
* Add scheduled check in openBox to avoid issues with people using addaction
Because you know they will.
* Add translations for import and export messages
* Fix comms tab defaulting to empty
* Align buttons perfectly for loadouts display, translation for delete action
* Add loadout saved translations
* Add load and rename messages translations
* localized interaction name in initBox
* Fix issue when admins deleted a loadout didn't change the icon status for authors
* Fix loadout import, update unique items list after import / loadout load
* Beautify UI a bit
* Add setting to toggle missing / unavailable items RPT logging
* Add settings strings
* Increase button size for main display
* Change DLC logo side in infoBox
* Change loadouts display buttons spacing, change deleteLoadout button active color
* Remove camera rotation limit
* Add polish translation
* German translation by @bux
* Order
* Fix typo in buttonExport, add credits in handleMouse
* Fix right panel item count not updating properly in certain scenarios
* Add loadoutName check when importing default loadouts, change assignedItems check
* Improve onSelChangedRight, fix typos in onSelChangedLeft and handleSearchbar
* Fix syntax check in removeVirtualItems count
* Shorten onSelChangedRightListnbox by improving current tab check
* Improve fillLeftPanel weapon tab filling
* Move lnbSetPicture occurences for the loadouts display to a define
* scan config opti
* Fix RPT logging check in fillLoadoutsList, use picture macro for shared tab
* Fix sharing and RPT logging settings having the same var
* Add newline at EOF for funcs that are missing it
* Move GVAR(sharedLoadoutsVars) to sharedLoadoutsNamespace
* newline eof
commy contributed too!
* Fix delete button not working as intended in public tab
* Replace bis_fnc_baseWeapon with CBA equivalent everywhere outisde of scanConfig
* Revert "Replace bis_fnc_baseWeapon with CBA equivalent everywhere outisde of scanConfig"
This reverts commit 496e6f822344e460312e68cd1334a0643ea28bef.
* Add new Cfg entry for handling unique items saving, add entry to chemlight shields
* Fix currentMag tab not detecting current mag properly (still experimental)
* Improve left and right filled EHs, add "Dog Tags:" for dogtag uniques
* Change how the right panel first update works
* Fix updateRightPanel very obscure bug and header typo
* Move postInit EHs for medical and dogtags to their respective postInit
* Fix medical postInit typo
* Add currentMag tabs for primary and secondary muzzles properly
* Fix container compatible mags tab not showing anything
* Replace an inline if to select in fillRightPanel
* Attempt to fix accs recognition when switching weapons
* Improve currentMag2 tab show / hide logic
Secondary and handguns can't have a secondary mauzzle
* Add strings for currentMag and currentMag2 tabs
* Readd strings that tabler accidentally removed
* Make sorting for the right panel stay the same when switching items / tabs
* Replace bis_fnc_addWeapon by the addWeapon command
bis_fnc_addWeapon failed when a weapon with the same classname was in one of the player's containers
Add mag for primary muzzle after the weapon is added, is possibly replaced by current mag(s) saved in curentItems
* Replace BIS_fnc_overviewAuthor in itemInfo
It works better
* Display itemInfo box properly for currentMag1 and 2 tabs
* Don't reset arsenal vision mode after quitting arsenal
* Improve showItem
* Remove trace from showItem
* Move getWeight and weight string from movement to common
* Fix typos in addVirtualItems
* Comment back compile cache for common
(Not yet for arsenal, not until it's validated for a merge)
* Replace secondaryMuzzleMag tab icon by @Max255PL 's
* Update @Max255PL 's icon
* Add missing author strings
* Add debug trace for a specific issue
* Add more traces in loadoutsSave
* Fix bug in loadoutsSave, remove debug traces
* Fix typo in loadoutsSave
* Fix uniqueBase cfg check for all cases in loadoutsSave
* Improve whitelisting for current weapon accs and mags
* Update CBA settings strings, change RPT logging to be turned off by default
* Update polish translation by @max255PL
* Fix saving loadouts when no loadout has ever been saved
* Make loadout screen lighter
* Save camera position and view mode for ace arsenal
* Improve loadouts screen presentation
* Improve loadouts screen readability
* Improve camera angle in loadout screen
* Improve loadout renaming, Fix bug linked to renaming
* Fix wrong loadout being used while renaming and color not being reapplied
* Fix other possible issue with renaming
* Change missing items color to be more colorblind friendly
* Fix typo and improve return check in getWeight
* Disable debug and re-enable compile cache for common and arsenal
* Remove uneccessary newline in arsenal's script_component.hpp
2017-12-07 07:48:10 +00:00
|
|
|
|
|
|
|
#define IDD_loadouts_display 1127002
|
|
|
|
#define IDC_centerBox 3
|
|
|
|
#define IDC_centerTitle 301
|
|
|
|
#define IDC_contentPanel 302
|
|
|
|
#define IDC_textEditBox 303
|
|
|
|
#define IDC_buttonSave 304
|
|
|
|
#define IDC_buttonLoad 305
|
|
|
|
#define IDC_buttonShare 306
|
|
|
|
#define IDC_buttonDelete 307
|
|
|
|
#define IDC_buttonRename 308
|
2017-12-30 07:13:06 +00:00
|
|
|
#define IDC_loadoutsSearchbar 309
|
Add ACE_Arsenal (#5734)
* Add CBA setting for modIcons
* Add CBA settings for camera control
* Merge the 2 inverted settings into one
There's no man crazy enough to need one inverted and the other normal
* Add back missing newline
* Change rscCommon, don't redefine base classes
* Change anim to "civil" when not in a weapon or special tab
* Fix current handgun ending up in launchers tab and vice versa
* Change back virtualItems first index to primary secondary handgun
* Add ace_arsenal_hide config check and config entry
* Add dogtags handling in postInit
* Add CBA setting for fontHeight for left and right panel
* magazineGroups
* Add base layout for loadouts GUI
* Prepare the SQF base for the loadouts display
* Continue laying the base for the SQF of the loadouts display
* Add CBA settings for the loadouts display
* Implement button logic for loadouts display
* Finish button logic, start adding filling and button funcs
* Add editBox for loadout names
* Add loadout saving and deleting
* Add loadouts loading
* Add select current after list is refreshed after saving
* Redo button layout, Add rename button, Add messages
* Add double click loading
* Fix loadout deleting not triggering curSel change
* Keep cursor at same index when deleting loadouts
Woops
* Reload pictures when saving over old loadout
* Fix loadout save not updating the pictures properly (again)
* Add close button for loadouts dialog
* Fix weight not updating when using arrows to add / remove items
* Make the arsenal layout a bit prettier
* Start adding non available items and missing mods for loadouts
* Remove useless lines in fillLoadouts
* Move buttonHide above panel fill in loadoutsClose
* Change the way weapons are checked in fillLoadoutsList
* Add weapon in container support for fillLoadoutsList
* Add mag in container check for fillLoadoutsList
* Add item check for containers in fillLoadoutsList
* Fix item duplication when loadout loadouts
* Switch anim to civil for the rest of the tabs that need it
* Make extra sure item duplication won't happen
* Fix right panel hiding issues
* Fix remove all button, use QGVAR for EHs names, add isMP check to share tab
* Fix initBox erroring out if the object is null
* Move loadout checking to it's own func
* Force panel reload every time loadoutList change
I'm forced to do this, I can't save arrays in listnboxes
* Change how loadouts are retrived from the listnbox
* Fix save overwriting existing loadout not updating right row
* Fix indentation in buttonLoadoutsSave
* Fix reserved var error
* Fix fillLoadoutlist tab check
* Fix accessories in containers not being checked properly via verifyLoadout
* Fix binos not being detected properly by verifyLoadout
* Fix pre-filled backpacks not behaving properly
* Add mine detector check in configScan and onArsenalOpen
* Add extra traces
* Add mine detector check in non cached part of addVirtualItems
* Move right panel greying to it's own func
* Fix right panel listnbox for items with mass under 1
* Redo unique items sorting in onArsenalOpen
* Add loadoutSaved EH, handle empty name box for loadout saving
* Reapply inisgnia after loadout is loaded
* Change LoadoutSaved to loadoutSaved
* Rename savedLoadout to onLoadoutSave
* Change buttonLoadoutsSave layout to prepare base weapon saving
* Save base class for weapons when saving loadouts
* Remove unused profiling code related code
* Add not implemented warning messages for export and import
* Fix error when saving with a container or weapon slot being empty
* Remove dogtags from loadout upon loadout saving
* Change how misc item mass is retrieved
* Remove vanilla "NoVoice" from voices to avoid an error related to it
* Use tolower for currentData and itemsToCheck in fillLeftPanel
Avoid camelCase issues with the commands that don't fucking respect it.
* Remove redundant check in postInit
* Fix sharedLoadouts condition in onArsenalOpen, Fix save button logic
* Prepare sharedLoadouts addition
* Add loadout sharing
* Add proper saving and loading for shared loadouts
* Change loadout deleted / unshared EH name, add said EH to unsharing
* Remove shared loadouts from disconnected players
* Fix error in buttonLoadoutsSave, add row when other share a loadout
* Change sharedLoadouts tab curSel selection to lnbData instead of lnbText
* Add data when adding a new row via CBA EH
* Remove mode, add arg to openBox to have arsenal prefilled
* Cleanup buttonClearAll code
* Fix itemInfo behavior when switching between items that don't have logos
Fix #23
* Add copy paste and arrow key support for searchbars
Close #22
* Add back newline at EOF for onKeyDown
* Change default camera setting from non inverted to inverted
* Fix import and export "not implemented" message
* Rename share button to Unshare when loadout selected is shared
* Improve missing items logging, cache verifyLoadout check
* Remove unused var
* Add full 3DEN support
* Remove 3DEN sphere and grid, set helper center dir properly
* Change 3DEN lightsource intensity
* Save 3DEN inventory properly
* Rewrite onArsenalClose 3DEN comment
* Fix sharedLoadouts check
* Add 3DEN support for defaultTab
* Add new event for 3rd parties in buttonCargo
* Move weight update to updateRightPanel for buttonCargo and selChangedListnBox
* Fix defaultLoadout save button
* Remove unallowed command
* Fix arsenal messages not working in 3DEN
* Add export current loadout, Add export defaultLoadoutsList
Signed-off-by: Josuan Albin <josuanalbin@outlook.fr>
* Add import button functionality
* Change export / import messages
* Change message to use scheduled only
* Attempt to sanitize data in import func
* Add a 3DEN attribute to save defaultLoadoutsList, fix shared loadout check
* Replace 2 last traces in verifyLoadout
* Change defaultLoadoutsList export format and add a 3DEN check for it's default value
* Fix original array being modified in fillLoadoutsList
* Improve shared loadout check
* Fix removeVirtualItems not removing Accs, nil virtualItems var in removeBox
* Add zeus support for arsenal rewrite, fix openBox camera check
* Add isPlayer check to arsenal rewrite part of bi module
Arsenal rewrite does not seem to work on remote players, welp, I tried at least
* Fix shared loadouts loadout index being null
Forgot to change that one getVar
* Hide shared column if sharing is disabled on My loadouts tab
* Remove trace from loadoutsLoad, add trace to shared and unshared EHs
* Fix postInit trace
* Fix sharing EHs being broken, remove traces in them, prevent possible issue
yeah, _x params doesn't work there :p
* Fix fillLoadoutsList error
* Start translating and code reviewing
* Add editing vehicle crew loadout support for arsenal
* Move left panel filling above 3DEN handling to avoid float crew members
* Fix onArsenalClose EOF, add header for it
* Move onButton EHs to config, remove placeholder stats func
* Add headers for onLoadouts funcs and verifyLoadout
* Clean up buttonClearAll
* Fix assigned items not being added properly to currentItems on loadout load
* Add more function headers
* Make rename work in default loadouts tab in 3DEN
* Add more functions headers, continue code review
* Add more functions headers, finish code review
* Fix loadout saving to profile from an other tab than my loadouts
* Fix loadout saving even more
* Attempt to fix loadouts handling
From totally broken to somewhat usable.
* Even more fixing
* Add back onLoadoutSave EH
* Add back author message in loadoutSave
* Add back EOF newline
* Add back loadout caching
* Remove unique items from saved and loaded loadouts
* Add unique item support for the remaining container tabs
* Fix mag check for magazine type in container
* Add support for CfgVehicles and CfgGlasses in miscItems
* Add button highlighting for loadouts display, fix mag put and throw check
* Change shared column to show a proper icon
* Revert "Move onButton EHs to config, remove placeholder stats func"
This reverts commit 1be5d92426e580683b265dd92c95fafa363765bb.
* Add back EOL newline in prep, remove stats placeholder again
* Add part of the german translation
* Add more translations, change how shared button text is managed
* Add scheduled check in openBox to avoid issues with people using addaction
Because you know they will.
* Add translations for import and export messages
* Fix comms tab defaulting to empty
* Align buttons perfectly for loadouts display, translation for delete action
* Add loadout saved translations
* Add load and rename messages translations
* localized interaction name in initBox
* Fix issue when admins deleted a loadout didn't change the icon status for authors
* Fix loadout import, update unique items list after import / loadout load
* Beautify UI a bit
* Add setting to toggle missing / unavailable items RPT logging
* Add settings strings
* Increase button size for main display
* Change DLC logo side in infoBox
* Change loadouts display buttons spacing, change deleteLoadout button active color
* Remove camera rotation limit
* Add polish translation
* German translation by @bux
* Order
* Fix typo in buttonExport, add credits in handleMouse
* Fix right panel item count not updating properly in certain scenarios
* Add loadoutName check when importing default loadouts, change assignedItems check
* Improve onSelChangedRight, fix typos in onSelChangedLeft and handleSearchbar
* Fix syntax check in removeVirtualItems count
* Shorten onSelChangedRightListnbox by improving current tab check
* Improve fillLeftPanel weapon tab filling
* Move lnbSetPicture occurences for the loadouts display to a define
* scan config opti
* Fix RPT logging check in fillLoadoutsList, use picture macro for shared tab
* Fix sharing and RPT logging settings having the same var
* Add newline at EOF for funcs that are missing it
* Move GVAR(sharedLoadoutsVars) to sharedLoadoutsNamespace
* newline eof
commy contributed too!
* Fix delete button not working as intended in public tab
* Replace bis_fnc_baseWeapon with CBA equivalent everywhere outisde of scanConfig
* Revert "Replace bis_fnc_baseWeapon with CBA equivalent everywhere outisde of scanConfig"
This reverts commit 496e6f822344e460312e68cd1334a0643ea28bef.
* Add new Cfg entry for handling unique items saving, add entry to chemlight shields
* Fix currentMag tab not detecting current mag properly (still experimental)
* Improve left and right filled EHs, add "Dog Tags:" for dogtag uniques
* Change how the right panel first update works
* Fix updateRightPanel very obscure bug and header typo
* Move postInit EHs for medical and dogtags to their respective postInit
* Fix medical postInit typo
* Add currentMag tabs for primary and secondary muzzles properly
* Fix container compatible mags tab not showing anything
* Replace an inline if to select in fillRightPanel
* Attempt to fix accs recognition when switching weapons
* Improve currentMag2 tab show / hide logic
Secondary and handguns can't have a secondary mauzzle
* Add strings for currentMag and currentMag2 tabs
* Readd strings that tabler accidentally removed
* Make sorting for the right panel stay the same when switching items / tabs
* Replace bis_fnc_addWeapon by the addWeapon command
bis_fnc_addWeapon failed when a weapon with the same classname was in one of the player's containers
Add mag for primary muzzle after the weapon is added, is possibly replaced by current mag(s) saved in curentItems
* Replace BIS_fnc_overviewAuthor in itemInfo
It works better
* Display itemInfo box properly for currentMag1 and 2 tabs
* Don't reset arsenal vision mode after quitting arsenal
* Improve showItem
* Remove trace from showItem
* Move getWeight and weight string from movement to common
* Fix typos in addVirtualItems
* Comment back compile cache for common
(Not yet for arsenal, not until it's validated for a merge)
* Replace secondaryMuzzleMag tab icon by @Max255PL 's
* Update @Max255PL 's icon
* Add missing author strings
* Add debug trace for a specific issue
* Add more traces in loadoutsSave
* Fix bug in loadoutsSave, remove debug traces
* Fix typo in loadoutsSave
* Fix uniqueBase cfg check for all cases in loadoutsSave
* Improve whitelisting for current weapon accs and mags
* Update CBA settings strings, change RPT logging to be turned off by default
* Update polish translation by @max255PL
* Fix saving loadouts when no loadout has ever been saved
* Make loadout screen lighter
* Save camera position and view mode for ace arsenal
* Improve loadouts screen presentation
* Improve loadouts screen readability
* Improve camera angle in loadout screen
* Improve loadout renaming, Fix bug linked to renaming
* Fix wrong loadout being used while renaming and color not being reapplied
* Fix other possible issue with renaming
* Change missing items color to be more colorblind friendly
* Fix typo and improve return check in getWeight
* Disable debug and re-enable compile cache for common and arsenal
* Remove uneccessary newline in arsenal's script_component.hpp
2017-12-07 07:48:10 +00:00
|
|
|
#define IDC_buttonMyLoadoutsBackground 401
|
|
|
|
#define IDC_buttonMyLoadouts 402
|
|
|
|
#define IDC_buttonDefaultLoadoutsBackground 403
|
|
|
|
#define IDC_buttonDefaultLoadouts 404
|
|
|
|
#define IDC_buttonSharedLoadoutsBackground 405
|
|
|
|
#define IDC_buttonSharedLoadouts 406
|
|
|
|
|
|
|
|
#define FADE_DELAY 0.15
|
|
|
|
#define CAM_DIS_MAX 5
|
|
|
|
|
|
|
|
#define RIGHT_PANEL_ACC_IDCS IDC_buttonOptic, IDC_buttonItemAcc, IDC_buttonMuzzle, IDC_buttonBipod
|
|
|
|
#define RIGHT_PANEL_ACC_BACKGROUND_IDCS IDC_iconBackgroundOptic, IDC_iconBackgroundItemAcc, IDC_iconBackgroundMuzzle, IDC_iconBackgroundBipod
|
|
|
|
#define RIGHT_PANEL_ITEMS_IDCS IDC_buttonMag, IDC_buttonMagALL, IDC_buttonThrow, IDC_buttonPut, IDC_buttonMisc
|
|
|
|
#define RIGHT_PANEL_ITEMS_BACKGROUND_IDCS IDC_iconBackgroundMag, IDC_iconBackgroundMagALL, IDC_iconBackgroundThrow, IDC_iconBackgroundPut, IDC_iconBackgroundMisc
|
|
|
|
#define ARROWS_IDCS IDC_arrowMinus, IDC_arrowPlus
|
|
|
|
|
|
|
|
#define GETDLC\
|
|
|
|
{\
|
|
|
|
private _dlc = "";\
|
|
|
|
private _addons = configsourceaddonlist _this;\
|
|
|
|
if (count _addons > 0) then {\
|
|
|
|
private _mods = configsourcemodlist (configfile >> "CfgPatches" >> _addons select 0);\
|
|
|
|
if (count _mods > 0) then {\
|
|
|
|
_dlc = _mods select 0;\
|
|
|
|
};\
|
|
|
|
};\
|
|
|
|
_dlc\
|
|
|
|
}
|
|
|
|
|
|
|
|
#define ADDMODICON\
|
|
|
|
{\
|
|
|
|
private _dlcName = _this call GETDLC;\
|
|
|
|
if (_dlcName != "") then {\
|
|
|
|
_ctrlPanel lbsetpictureright [_lbAdd,(modParams [_dlcName,["logo"]]) param [0,""]];\
|
|
|
|
_modID = GVAR(modList) find _dlcName;\
|
|
|
|
if (_modID < 0) then {_modID = GVAR(modList) pushback _dlcName;};\
|
|
|
|
_ctrlPanel lbsetvalue [_lbAdd,_modID];\
|
|
|
|
};\
|
|
|
|
};
|
|
|
|
|
|
|
|
#define ADDBINOCULARSMAG\
|
|
|
|
private _magazines = getarray (configfile >> "cfgweapons" >> _item >> "magazines");\
|
|
|
|
if (count _magazines > 0) then {GVAR(center) addmagazine (_magazines select 0)};
|
|
|
|
|
|
|
|
#define TOGGLE_RIGHT_PANEL_WEAPON\
|
|
|
|
{\
|
|
|
|
_x = _display displayCtrl _x;\
|
|
|
|
_x ctrlSetFade 0;\
|
|
|
|
_x ctrlShow true;\
|
|
|
|
_x ctrlEnable true;\
|
|
|
|
_x ctrlCommit FADE_DELAY;\
|
|
|
|
} foreach [\
|
|
|
|
IDC_blockRightFrame,\
|
|
|
|
IDC_blockRighttBackground,\
|
|
|
|
IDC_rightTabContent,\
|
|
|
|
IDC_sortRightTab,\
|
|
|
|
RIGHT_PANEL_ACC_IDCS,\
|
|
|
|
IDC_rightSearchbar,\
|
|
|
|
IDC_rightSearchbarButton,\
|
|
|
|
IDC_buttonCurrentMag\
|
|
|
|
];\
|
|
|
|
private _buttonCurrentMag2Ctrl = _display displayCtrl IDC_buttonCurrentMag2;\
|
|
|
|
if (GVAR(currentLeftPanel) == IDC_buttonPrimaryWeapon) then {\
|
|
|
|
_buttonCurrentMag2Ctrl ctrlSetFade 0;\
|
|
|
|
_buttonCurrentMag2Ctrl ctrlShow true;\
|
|
|
|
_buttonCurrentMag2Ctrl ctrlEnable true;\
|
|
|
|
} else {\
|
|
|
|
_buttonCurrentMag2Ctrl ctrlSetFade 1;\
|
|
|
|
_buttonCurrentMag2Ctrl ctrlShow false;\
|
|
|
|
_buttonCurrentMag2Ctrl ctrlEnable false;\
|
|
|
|
};\
|
|
|
|
_buttonCurrentMag2Ctrl ctrlCommit FADE_DELAY;\
|
|
|
|
{\
|
|
|
|
_x = _display displayCtrl _x;\
|
|
|
|
_x ctrlSetFade 1;\
|
|
|
|
_x ctrlShow false;\
|
|
|
|
_x ctrlEnable false;\
|
|
|
|
_x ctrlCommit FADE_DELAY;\
|
|
|
|
} foreach [\
|
|
|
|
IDC_loadIndicator,\
|
|
|
|
RIGHT_PANEL_ITEMS_IDCS,\
|
|
|
|
IDC_rightTabContentListnBox,\
|
|
|
|
RIGHT_PANEL_ITEMS_BACKGROUND_IDCS,\
|
|
|
|
IDC_buttonRemoveAll\
|
2018-02-09 20:30:37 +00:00
|
|
|
];\
|
|
|
|
{\
|
|
|
|
_x = _display displayCtrl _x;\
|
|
|
|
_x ctrlSetPosition [\
|
|
|
|
safezoneX + safezoneW - 93 * GRID_W,\
|
|
|
|
safezoneY + 14 * GRID_H,\
|
|
|
|
80 * GRID_W,\
|
|
|
|
safezoneH - 28 * GRID_H\
|
|
|
|
];\
|
|
|
|
_x ctrlCommit 0;\
|
|
|
|
} foreach [\
|
|
|
|
IDC_rightTabContent,\
|
|
|
|
IDC_rightTabContentListnBox,\
|
|
|
|
IDC_blockRightFrame,\
|
|
|
|
IDC_blockRighttBackground\
|
Add ACE_Arsenal (#5734)
* Add CBA setting for modIcons
* Add CBA settings for camera control
* Merge the 2 inverted settings into one
There's no man crazy enough to need one inverted and the other normal
* Add back missing newline
* Change rscCommon, don't redefine base classes
* Change anim to "civil" when not in a weapon or special tab
* Fix current handgun ending up in launchers tab and vice versa
* Change back virtualItems first index to primary secondary handgun
* Add ace_arsenal_hide config check and config entry
* Add dogtags handling in postInit
* Add CBA setting for fontHeight for left and right panel
* magazineGroups
* Add base layout for loadouts GUI
* Prepare the SQF base for the loadouts display
* Continue laying the base for the SQF of the loadouts display
* Add CBA settings for the loadouts display
* Implement button logic for loadouts display
* Finish button logic, start adding filling and button funcs
* Add editBox for loadout names
* Add loadout saving and deleting
* Add loadouts loading
* Add select current after list is refreshed after saving
* Redo button layout, Add rename button, Add messages
* Add double click loading
* Fix loadout deleting not triggering curSel change
* Keep cursor at same index when deleting loadouts
Woops
* Reload pictures when saving over old loadout
* Fix loadout save not updating the pictures properly (again)
* Add close button for loadouts dialog
* Fix weight not updating when using arrows to add / remove items
* Make the arsenal layout a bit prettier
* Start adding non available items and missing mods for loadouts
* Remove useless lines in fillLoadouts
* Move buttonHide above panel fill in loadoutsClose
* Change the way weapons are checked in fillLoadoutsList
* Add weapon in container support for fillLoadoutsList
* Add mag in container check for fillLoadoutsList
* Add item check for containers in fillLoadoutsList
* Fix item duplication when loadout loadouts
* Switch anim to civil for the rest of the tabs that need it
* Make extra sure item duplication won't happen
* Fix right panel hiding issues
* Fix remove all button, use QGVAR for EHs names, add isMP check to share tab
* Fix initBox erroring out if the object is null
* Move loadout checking to it's own func
* Force panel reload every time loadoutList change
I'm forced to do this, I can't save arrays in listnboxes
* Change how loadouts are retrived from the listnbox
* Fix save overwriting existing loadout not updating right row
* Fix indentation in buttonLoadoutsSave
* Fix reserved var error
* Fix fillLoadoutlist tab check
* Fix accessories in containers not being checked properly via verifyLoadout
* Fix binos not being detected properly by verifyLoadout
* Fix pre-filled backpacks not behaving properly
* Add mine detector check in configScan and onArsenalOpen
* Add extra traces
* Add mine detector check in non cached part of addVirtualItems
* Move right panel greying to it's own func
* Fix right panel listnbox for items with mass under 1
* Redo unique items sorting in onArsenalOpen
* Add loadoutSaved EH, handle empty name box for loadout saving
* Reapply inisgnia after loadout is loaded
* Change LoadoutSaved to loadoutSaved
* Rename savedLoadout to onLoadoutSave
* Change buttonLoadoutsSave layout to prepare base weapon saving
* Save base class for weapons when saving loadouts
* Remove unused profiling code related code
* Add not implemented warning messages for export and import
* Fix error when saving with a container or weapon slot being empty
* Remove dogtags from loadout upon loadout saving
* Change how misc item mass is retrieved
* Remove vanilla "NoVoice" from voices to avoid an error related to it
* Use tolower for currentData and itemsToCheck in fillLeftPanel
Avoid camelCase issues with the commands that don't fucking respect it.
* Remove redundant check in postInit
* Fix sharedLoadouts condition in onArsenalOpen, Fix save button logic
* Prepare sharedLoadouts addition
* Add loadout sharing
* Add proper saving and loading for shared loadouts
* Change loadout deleted / unshared EH name, add said EH to unsharing
* Remove shared loadouts from disconnected players
* Fix error in buttonLoadoutsSave, add row when other share a loadout
* Change sharedLoadouts tab curSel selection to lnbData instead of lnbText
* Add data when adding a new row via CBA EH
* Remove mode, add arg to openBox to have arsenal prefilled
* Cleanup buttonClearAll code
* Fix itemInfo behavior when switching between items that don't have logos
Fix #23
* Add copy paste and arrow key support for searchbars
Close #22
* Add back newline at EOF for onKeyDown
* Change default camera setting from non inverted to inverted
* Fix import and export "not implemented" message
* Rename share button to Unshare when loadout selected is shared
* Improve missing items logging, cache verifyLoadout check
* Remove unused var
* Add full 3DEN support
* Remove 3DEN sphere and grid, set helper center dir properly
* Change 3DEN lightsource intensity
* Save 3DEN inventory properly
* Rewrite onArsenalClose 3DEN comment
* Fix sharedLoadouts check
* Add 3DEN support for defaultTab
* Add new event for 3rd parties in buttonCargo
* Move weight update to updateRightPanel for buttonCargo and selChangedListnBox
* Fix defaultLoadout save button
* Remove unallowed command
* Fix arsenal messages not working in 3DEN
* Add export current loadout, Add export defaultLoadoutsList
Signed-off-by: Josuan Albin <josuanalbin@outlook.fr>
* Add import button functionality
* Change export / import messages
* Change message to use scheduled only
* Attempt to sanitize data in import func
* Add a 3DEN attribute to save defaultLoadoutsList, fix shared loadout check
* Replace 2 last traces in verifyLoadout
* Change defaultLoadoutsList export format and add a 3DEN check for it's default value
* Fix original array being modified in fillLoadoutsList
* Improve shared loadout check
* Fix removeVirtualItems not removing Accs, nil virtualItems var in removeBox
* Add zeus support for arsenal rewrite, fix openBox camera check
* Add isPlayer check to arsenal rewrite part of bi module
Arsenal rewrite does not seem to work on remote players, welp, I tried at least
* Fix shared loadouts loadout index being null
Forgot to change that one getVar
* Hide shared column if sharing is disabled on My loadouts tab
* Remove trace from loadoutsLoad, add trace to shared and unshared EHs
* Fix postInit trace
* Fix sharing EHs being broken, remove traces in them, prevent possible issue
yeah, _x params doesn't work there :p
* Fix fillLoadoutsList error
* Start translating and code reviewing
* Add editing vehicle crew loadout support for arsenal
* Move left panel filling above 3DEN handling to avoid float crew members
* Fix onArsenalClose EOF, add header for it
* Move onButton EHs to config, remove placeholder stats func
* Add headers for onLoadouts funcs and verifyLoadout
* Clean up buttonClearAll
* Fix assigned items not being added properly to currentItems on loadout load
* Add more function headers
* Make rename work in default loadouts tab in 3DEN
* Add more functions headers, continue code review
* Add more functions headers, finish code review
* Fix loadout saving to profile from an other tab than my loadouts
* Fix loadout saving even more
* Attempt to fix loadouts handling
From totally broken to somewhat usable.
* Even more fixing
* Add back onLoadoutSave EH
* Add back author message in loadoutSave
* Add back EOF newline
* Add back loadout caching
* Remove unique items from saved and loaded loadouts
* Add unique item support for the remaining container tabs
* Fix mag check for magazine type in container
* Add support for CfgVehicles and CfgGlasses in miscItems
* Add button highlighting for loadouts display, fix mag put and throw check
* Change shared column to show a proper icon
* Revert "Move onButton EHs to config, remove placeholder stats func"
This reverts commit 1be5d92426e580683b265dd92c95fafa363765bb.
* Add back EOL newline in prep, remove stats placeholder again
* Add part of the german translation
* Add more translations, change how shared button text is managed
* Add scheduled check in openBox to avoid issues with people using addaction
Because you know they will.
* Add translations for import and export messages
* Fix comms tab defaulting to empty
* Align buttons perfectly for loadouts display, translation for delete action
* Add loadout saved translations
* Add load and rename messages translations
* localized interaction name in initBox
* Fix issue when admins deleted a loadout didn't change the icon status for authors
* Fix loadout import, update unique items list after import / loadout load
* Beautify UI a bit
* Add setting to toggle missing / unavailable items RPT logging
* Add settings strings
* Increase button size for main display
* Change DLC logo side in infoBox
* Change loadouts display buttons spacing, change deleteLoadout button active color
* Remove camera rotation limit
* Add polish translation
* German translation by @bux
* Order
* Fix typo in buttonExport, add credits in handleMouse
* Fix right panel item count not updating properly in certain scenarios
* Add loadoutName check when importing default loadouts, change assignedItems check
* Improve onSelChangedRight, fix typos in onSelChangedLeft and handleSearchbar
* Fix syntax check in removeVirtualItems count
* Shorten onSelChangedRightListnbox by improving current tab check
* Improve fillLeftPanel weapon tab filling
* Move lnbSetPicture occurences for the loadouts display to a define
* scan config opti
* Fix RPT logging check in fillLoadoutsList, use picture macro for shared tab
* Fix sharing and RPT logging settings having the same var
* Add newline at EOF for funcs that are missing it
* Move GVAR(sharedLoadoutsVars) to sharedLoadoutsNamespace
* newline eof
commy contributed too!
* Fix delete button not working as intended in public tab
* Replace bis_fnc_baseWeapon with CBA equivalent everywhere outisde of scanConfig
* Revert "Replace bis_fnc_baseWeapon with CBA equivalent everywhere outisde of scanConfig"
This reverts commit 496e6f822344e460312e68cd1334a0643ea28bef.
* Add new Cfg entry for handling unique items saving, add entry to chemlight shields
* Fix currentMag tab not detecting current mag properly (still experimental)
* Improve left and right filled EHs, add "Dog Tags:" for dogtag uniques
* Change how the right panel first update works
* Fix updateRightPanel very obscure bug and header typo
* Move postInit EHs for medical and dogtags to their respective postInit
* Fix medical postInit typo
* Add currentMag tabs for primary and secondary muzzles properly
* Fix container compatible mags tab not showing anything
* Replace an inline if to select in fillRightPanel
* Attempt to fix accs recognition when switching weapons
* Improve currentMag2 tab show / hide logic
Secondary and handguns can't have a secondary mauzzle
* Add strings for currentMag and currentMag2 tabs
* Readd strings that tabler accidentally removed
* Make sorting for the right panel stay the same when switching items / tabs
* Replace bis_fnc_addWeapon by the addWeapon command
bis_fnc_addWeapon failed when a weapon with the same classname was in one of the player's containers
Add mag for primary muzzle after the weapon is added, is possibly replaced by current mag(s) saved in curentItems
* Replace BIS_fnc_overviewAuthor in itemInfo
It works better
* Display itemInfo box properly for currentMag1 and 2 tabs
* Don't reset arsenal vision mode after quitting arsenal
* Improve showItem
* Remove trace from showItem
* Move getWeight and weight string from movement to common
* Fix typos in addVirtualItems
* Comment back compile cache for common
(Not yet for arsenal, not until it's validated for a merge)
* Replace secondaryMuzzleMag tab icon by @Max255PL 's
* Update @Max255PL 's icon
* Add missing author strings
* Add debug trace for a specific issue
* Add more traces in loadoutsSave
* Fix bug in loadoutsSave, remove debug traces
* Fix typo in loadoutsSave
* Fix uniqueBase cfg check for all cases in loadoutsSave
* Improve whitelisting for current weapon accs and mags
* Update CBA settings strings, change RPT logging to be turned off by default
* Update polish translation by @max255PL
* Fix saving loadouts when no loadout has ever been saved
* Make loadout screen lighter
* Save camera position and view mode for ace arsenal
* Improve loadouts screen presentation
* Improve loadouts screen readability
* Improve camera angle in loadout screen
* Improve loadout renaming, Fix bug linked to renaming
* Fix wrong loadout being used while renaming and color not being reapplied
* Fix other possible issue with renaming
* Change missing items color to be more colorblind friendly
* Fix typo and improve return check in getWeight
* Disable debug and re-enable compile cache for common and arsenal
* Remove uneccessary newline in arsenal's script_component.hpp
2017-12-07 07:48:10 +00:00
|
|
|
];
|
|
|
|
|
|
|
|
#define TOGGLE_RIGHT_PANEL_CONTAINER\
|
|
|
|
{\
|
|
|
|
_x = _display displayCtrl _x;\
|
|
|
|
_x ctrlSetFade 0;\
|
|
|
|
_x ctrlShow true;\
|
|
|
|
_x ctrlEnable true;\
|
|
|
|
_x ctrlCommit FADE_DELAY;\
|
|
|
|
} foreach [\
|
|
|
|
IDC_blockRightFrame, \
|
|
|
|
IDC_blockRighttBackground,\
|
|
|
|
IDC_loadIndicator,\
|
|
|
|
IDC_rightTabContentListnBox,\
|
|
|
|
IDC_sortRightTab,\
|
|
|
|
IDC_tabRight,\
|
|
|
|
RIGHT_PANEL_ACC_IDCS,\
|
|
|
|
RIGHT_PANEL_ITEMS_IDCS,\
|
|
|
|
IDC_rightSearchbar,\
|
|
|
|
IDC_rightSearchbarButton\
|
|
|
|
];\
|
|
|
|
{\
|
|
|
|
_x = _display displayCtrl _x;\
|
|
|
|
_x ctrlSetFade 1;\
|
|
|
|
_x ctrlShow false;\
|
|
|
|
_x ctrlEnable false;\
|
|
|
|
_x ctrlCommit FADE_DELAY;\
|
|
|
|
} foreach [\
|
|
|
|
IDC_buttonCurrentMag,\
|
|
|
|
IDC_buttonCurrentMag2,\
|
|
|
|
IDC_iconBackgroundCurrentMag,\
|
|
|
|
IDC_iconBackgroundCurrentMag2\
|
2018-02-09 20:30:37 +00:00
|
|
|
];\
|
|
|
|
{\
|
|
|
|
_x = _display displayCtrl _x;\
|
|
|
|
_x ctrlSetPosition [\
|
|
|
|
safezoneX + safezoneW - 93 * GRID_W,\
|
|
|
|
safezoneY + 14 * GRID_H,\
|
|
|
|
80 * GRID_W,\
|
|
|
|
safezoneH - 34 * GRID_H\
|
|
|
|
];\
|
|
|
|
_x ctrlCommit 0;\
|
|
|
|
} foreach [\
|
|
|
|
IDC_rightTabContent,\
|
|
|
|
IDC_rightTabContentListnBox,\
|
|
|
|
IDC_blockRightFrame,\
|
|
|
|
IDC_blockRighttBackground\
|
Add ACE_Arsenal (#5734)
* Add CBA setting for modIcons
* Add CBA settings for camera control
* Merge the 2 inverted settings into one
There's no man crazy enough to need one inverted and the other normal
* Add back missing newline
* Change rscCommon, don't redefine base classes
* Change anim to "civil" when not in a weapon or special tab
* Fix current handgun ending up in launchers tab and vice versa
* Change back virtualItems first index to primary secondary handgun
* Add ace_arsenal_hide config check and config entry
* Add dogtags handling in postInit
* Add CBA setting for fontHeight for left and right panel
* magazineGroups
* Add base layout for loadouts GUI
* Prepare the SQF base for the loadouts display
* Continue laying the base for the SQF of the loadouts display
* Add CBA settings for the loadouts display
* Implement button logic for loadouts display
* Finish button logic, start adding filling and button funcs
* Add editBox for loadout names
* Add loadout saving and deleting
* Add loadouts loading
* Add select current after list is refreshed after saving
* Redo button layout, Add rename button, Add messages
* Add double click loading
* Fix loadout deleting not triggering curSel change
* Keep cursor at same index when deleting loadouts
Woops
* Reload pictures when saving over old loadout
* Fix loadout save not updating the pictures properly (again)
* Add close button for loadouts dialog
* Fix weight not updating when using arrows to add / remove items
* Make the arsenal layout a bit prettier
* Start adding non available items and missing mods for loadouts
* Remove useless lines in fillLoadouts
* Move buttonHide above panel fill in loadoutsClose
* Change the way weapons are checked in fillLoadoutsList
* Add weapon in container support for fillLoadoutsList
* Add mag in container check for fillLoadoutsList
* Add item check for containers in fillLoadoutsList
* Fix item duplication when loadout loadouts
* Switch anim to civil for the rest of the tabs that need it
* Make extra sure item duplication won't happen
* Fix right panel hiding issues
* Fix remove all button, use QGVAR for EHs names, add isMP check to share tab
* Fix initBox erroring out if the object is null
* Move loadout checking to it's own func
* Force panel reload every time loadoutList change
I'm forced to do this, I can't save arrays in listnboxes
* Change how loadouts are retrived from the listnbox
* Fix save overwriting existing loadout not updating right row
* Fix indentation in buttonLoadoutsSave
* Fix reserved var error
* Fix fillLoadoutlist tab check
* Fix accessories in containers not being checked properly via verifyLoadout
* Fix binos not being detected properly by verifyLoadout
* Fix pre-filled backpacks not behaving properly
* Add mine detector check in configScan and onArsenalOpen
* Add extra traces
* Add mine detector check in non cached part of addVirtualItems
* Move right panel greying to it's own func
* Fix right panel listnbox for items with mass under 1
* Redo unique items sorting in onArsenalOpen
* Add loadoutSaved EH, handle empty name box for loadout saving
* Reapply inisgnia after loadout is loaded
* Change LoadoutSaved to loadoutSaved
* Rename savedLoadout to onLoadoutSave
* Change buttonLoadoutsSave layout to prepare base weapon saving
* Save base class for weapons when saving loadouts
* Remove unused profiling code related code
* Add not implemented warning messages for export and import
* Fix error when saving with a container or weapon slot being empty
* Remove dogtags from loadout upon loadout saving
* Change how misc item mass is retrieved
* Remove vanilla "NoVoice" from voices to avoid an error related to it
* Use tolower for currentData and itemsToCheck in fillLeftPanel
Avoid camelCase issues with the commands that don't fucking respect it.
* Remove redundant check in postInit
* Fix sharedLoadouts condition in onArsenalOpen, Fix save button logic
* Prepare sharedLoadouts addition
* Add loadout sharing
* Add proper saving and loading for shared loadouts
* Change loadout deleted / unshared EH name, add said EH to unsharing
* Remove shared loadouts from disconnected players
* Fix error in buttonLoadoutsSave, add row when other share a loadout
* Change sharedLoadouts tab curSel selection to lnbData instead of lnbText
* Add data when adding a new row via CBA EH
* Remove mode, add arg to openBox to have arsenal prefilled
* Cleanup buttonClearAll code
* Fix itemInfo behavior when switching between items that don't have logos
Fix #23
* Add copy paste and arrow key support for searchbars
Close #22
* Add back newline at EOF for onKeyDown
* Change default camera setting from non inverted to inverted
* Fix import and export "not implemented" message
* Rename share button to Unshare when loadout selected is shared
* Improve missing items logging, cache verifyLoadout check
* Remove unused var
* Add full 3DEN support
* Remove 3DEN sphere and grid, set helper center dir properly
* Change 3DEN lightsource intensity
* Save 3DEN inventory properly
* Rewrite onArsenalClose 3DEN comment
* Fix sharedLoadouts check
* Add 3DEN support for defaultTab
* Add new event for 3rd parties in buttonCargo
* Move weight update to updateRightPanel for buttonCargo and selChangedListnBox
* Fix defaultLoadout save button
* Remove unallowed command
* Fix arsenal messages not working in 3DEN
* Add export current loadout, Add export defaultLoadoutsList
Signed-off-by: Josuan Albin <josuanalbin@outlook.fr>
* Add import button functionality
* Change export / import messages
* Change message to use scheduled only
* Attempt to sanitize data in import func
* Add a 3DEN attribute to save defaultLoadoutsList, fix shared loadout check
* Replace 2 last traces in verifyLoadout
* Change defaultLoadoutsList export format and add a 3DEN check for it's default value
* Fix original array being modified in fillLoadoutsList
* Improve shared loadout check
* Fix removeVirtualItems not removing Accs, nil virtualItems var in removeBox
* Add zeus support for arsenal rewrite, fix openBox camera check
* Add isPlayer check to arsenal rewrite part of bi module
Arsenal rewrite does not seem to work on remote players, welp, I tried at least
* Fix shared loadouts loadout index being null
Forgot to change that one getVar
* Hide shared column if sharing is disabled on My loadouts tab
* Remove trace from loadoutsLoad, add trace to shared and unshared EHs
* Fix postInit trace
* Fix sharing EHs being broken, remove traces in them, prevent possible issue
yeah, _x params doesn't work there :p
* Fix fillLoadoutsList error
* Start translating and code reviewing
* Add editing vehicle crew loadout support for arsenal
* Move left panel filling above 3DEN handling to avoid float crew members
* Fix onArsenalClose EOF, add header for it
* Move onButton EHs to config, remove placeholder stats func
* Add headers for onLoadouts funcs and verifyLoadout
* Clean up buttonClearAll
* Fix assigned items not being added properly to currentItems on loadout load
* Add more function headers
* Make rename work in default loadouts tab in 3DEN
* Add more functions headers, continue code review
* Add more functions headers, finish code review
* Fix loadout saving to profile from an other tab than my loadouts
* Fix loadout saving even more
* Attempt to fix loadouts handling
From totally broken to somewhat usable.
* Even more fixing
* Add back onLoadoutSave EH
* Add back author message in loadoutSave
* Add back EOF newline
* Add back loadout caching
* Remove unique items from saved and loaded loadouts
* Add unique item support for the remaining container tabs
* Fix mag check for magazine type in container
* Add support for CfgVehicles and CfgGlasses in miscItems
* Add button highlighting for loadouts display, fix mag put and throw check
* Change shared column to show a proper icon
* Revert "Move onButton EHs to config, remove placeholder stats func"
This reverts commit 1be5d92426e580683b265dd92c95fafa363765bb.
* Add back EOL newline in prep, remove stats placeholder again
* Add part of the german translation
* Add more translations, change how shared button text is managed
* Add scheduled check in openBox to avoid issues with people using addaction
Because you know they will.
* Add translations for import and export messages
* Fix comms tab defaulting to empty
* Align buttons perfectly for loadouts display, translation for delete action
* Add loadout saved translations
* Add load and rename messages translations
* localized interaction name in initBox
* Fix issue when admins deleted a loadout didn't change the icon status for authors
* Fix loadout import, update unique items list after import / loadout load
* Beautify UI a bit
* Add setting to toggle missing / unavailable items RPT logging
* Add settings strings
* Increase button size for main display
* Change DLC logo side in infoBox
* Change loadouts display buttons spacing, change deleteLoadout button active color
* Remove camera rotation limit
* Add polish translation
* German translation by @bux
* Order
* Fix typo in buttonExport, add credits in handleMouse
* Fix right panel item count not updating properly in certain scenarios
* Add loadoutName check when importing default loadouts, change assignedItems check
* Improve onSelChangedRight, fix typos in onSelChangedLeft and handleSearchbar
* Fix syntax check in removeVirtualItems count
* Shorten onSelChangedRightListnbox by improving current tab check
* Improve fillLeftPanel weapon tab filling
* Move lnbSetPicture occurences for the loadouts display to a define
* scan config opti
* Fix RPT logging check in fillLoadoutsList, use picture macro for shared tab
* Fix sharing and RPT logging settings having the same var
* Add newline at EOF for funcs that are missing it
* Move GVAR(sharedLoadoutsVars) to sharedLoadoutsNamespace
* newline eof
commy contributed too!
* Fix delete button not working as intended in public tab
* Replace bis_fnc_baseWeapon with CBA equivalent everywhere outisde of scanConfig
* Revert "Replace bis_fnc_baseWeapon with CBA equivalent everywhere outisde of scanConfig"
This reverts commit 496e6f822344e460312e68cd1334a0643ea28bef.
* Add new Cfg entry for handling unique items saving, add entry to chemlight shields
* Fix currentMag tab not detecting current mag properly (still experimental)
* Improve left and right filled EHs, add "Dog Tags:" for dogtag uniques
* Change how the right panel first update works
* Fix updateRightPanel very obscure bug and header typo
* Move postInit EHs for medical and dogtags to their respective postInit
* Fix medical postInit typo
* Add currentMag tabs for primary and secondary muzzles properly
* Fix container compatible mags tab not showing anything
* Replace an inline if to select in fillRightPanel
* Attempt to fix accs recognition when switching weapons
* Improve currentMag2 tab show / hide logic
Secondary and handguns can't have a secondary mauzzle
* Add strings for currentMag and currentMag2 tabs
* Readd strings that tabler accidentally removed
* Make sorting for the right panel stay the same when switching items / tabs
* Replace bis_fnc_addWeapon by the addWeapon command
bis_fnc_addWeapon failed when a weapon with the same classname was in one of the player's containers
Add mag for primary muzzle after the weapon is added, is possibly replaced by current mag(s) saved in curentItems
* Replace BIS_fnc_overviewAuthor in itemInfo
It works better
* Display itemInfo box properly for currentMag1 and 2 tabs
* Don't reset arsenal vision mode after quitting arsenal
* Improve showItem
* Remove trace from showItem
* Move getWeight and weight string from movement to common
* Fix typos in addVirtualItems
* Comment back compile cache for common
(Not yet for arsenal, not until it's validated for a merge)
* Replace secondaryMuzzleMag tab icon by @Max255PL 's
* Update @Max255PL 's icon
* Add missing author strings
* Add debug trace for a specific issue
* Add more traces in loadoutsSave
* Fix bug in loadoutsSave, remove debug traces
* Fix typo in loadoutsSave
* Fix uniqueBase cfg check for all cases in loadoutsSave
* Improve whitelisting for current weapon accs and mags
* Update CBA settings strings, change RPT logging to be turned off by default
* Update polish translation by @max255PL
* Fix saving loadouts when no loadout has ever been saved
* Make loadout screen lighter
* Save camera position and view mode for ace arsenal
* Improve loadouts screen presentation
* Improve loadouts screen readability
* Improve camera angle in loadout screen
* Improve loadout renaming, Fix bug linked to renaming
* Fix wrong loadout being used while renaming and color not being reapplied
* Fix other possible issue with renaming
* Change missing items color to be more colorblind friendly
* Fix typo and improve return check in getWeight
* Disable debug and re-enable compile cache for common and arsenal
* Remove uneccessary newline in arsenal's script_component.hpp
2017-12-07 07:48:10 +00:00
|
|
|
];
|
|
|
|
|
|
|
|
#define TOGGLE_RIGHT_PANEL_HIDE\
|
|
|
|
{\
|
|
|
|
_x = _display displayCtrl _x;\
|
|
|
|
_x ctrlSetFade 1;\
|
|
|
|
_x ctrlShow false;\
|
|
|
|
_x ctrlEnable false;\
|
|
|
|
_x ctrlCommit FADE_DELAY;\
|
|
|
|
} foreach [\
|
|
|
|
IDC_blockRightFrame,\
|
|
|
|
IDC_blockRighttBackground,\
|
|
|
|
IDC_loadIndicator,\
|
|
|
|
IDC_rightTabContent,\
|
|
|
|
IDC_rightTabContentListnBox,\
|
|
|
|
IDC_sortRightTab,\
|
|
|
|
RIGHT_PANEL_ACC_BACKGROUND_IDCS,\
|
|
|
|
RIGHT_PANEL_ACC_IDCS,\
|
|
|
|
RIGHT_PANEL_ITEMS_BACKGROUND_IDCS,\
|
|
|
|
RIGHT_PANEL_ITEMS_IDCS,\
|
|
|
|
IDC_buttonRemoveAll,\
|
|
|
|
IDC_rightSearchbar,\
|
|
|
|
IDC_rightSearchbarButton,\
|
|
|
|
IDC_buttonCurrentMag,\
|
|
|
|
IDC_buttonCurrentMag2,\
|
|
|
|
IDC_iconBackgroundCurrentMag,\
|
|
|
|
IDC_iconBackgroundCurrentMag2\
|
|
|
|
];
|
|
|
|
|
|
|
|
#define LIST_DEFAULTS\
|
|
|
|
[\
|
|
|
|
[\
|
|
|
|
(primaryweapon GVAR(center) call bis_fnc_baseWeapon),\
|
|
|
|
(secondaryweapon GVAR(center) call bis_fnc_baseWeapon),\
|
|
|
|
(handgunweapon GVAR(center) call bis_fnc_baseWeapon)\
|
|
|
|
],\
|
|
|
|
[\
|
|
|
|
[primaryWeaponItems GVAR(center), secondaryWeaponItems GVAR(center), handgunItems GVAR(center)],\
|
|
|
|
[primaryWeaponMagazine GVAR(center), secondaryWeaponMagazine GVAR(center), handgunMagazine GVAR(center)]\
|
|
|
|
],\
|
|
|
|
uniformItems GVAR(center) + vestItems GVAR(center) + backpackItems GVAR(center),\
|
|
|
|
[headgear GVAR(center)],\
|
|
|
|
[uniform GVAR(center)],\
|
|
|
|
[vest GVAR(center)],\
|
|
|
|
[backpack GVAR(center)],\
|
|
|
|
[goggles GVAR(center)],\
|
|
|
|
[hmd GVAR(center)],\
|
|
|
|
[binocular GVAR(center)]\
|
|
|
|
]
|
|
|
|
|
|
|
|
#define CHECK_WEAPON_OR_ACC\
|
|
|
|
_item in (_weaponsArray select 0) ||\
|
|
|
|
{_item in (_weaponsArray select 1)} ||\
|
|
|
|
{_item in (_weaponsArray select 2)} ||\
|
|
|
|
{_item in (GVAR(virtualItems) select 9)} ||\
|
|
|
|
{_item in (_accsArray select 0)} ||\
|
|
|
|
{_item in (_accsArray select 1)} ||\
|
|
|
|
{_item in (_accsArray select 2)} ||\
|
|
|
|
{_item in (_accsArray select 3)}
|
|
|
|
|
|
|
|
#define CHECK_ASSIGNED_ITEMS\
|
|
|
|
_item in (GVAR(virtualItems) select 10) ||\
|
|
|
|
{_item in (GVAR(virtualItems) select 11)} ||\
|
|
|
|
{_item in (GVAR(virtualItems) select 12)} ||\
|
|
|
|
{_item in (GVAR(virtualItems) select 13)} ||\
|
|
|
|
{_item in (GVAR(virtualItems) select 14)} ||\
|
|
|
|
{_item in (GVAR(virtualItems) select 8)}
|
|
|
|
|
|
|
|
#define CHECK_CONTAINER\
|
|
|
|
_item in (GVAR(virtualItems) select 4) ||\
|
|
|
|
{_item in (GVAR(virtualItems) select 5)} ||\
|
|
|
|
{_item in (GVAR(virtualItems) select 6)}
|
|
|
|
|
|
|
|
#define CLASS_CHECK_ITEM\
|
|
|
|
isClass (_weaponCfg >> _item) ||\
|
|
|
|
{isClass (_vehcCfg >> _item)} ||\
|
|
|
|
{isClass (_glassesCfg >> _item)} ||\
|
|
|
|
{isClass (_magCfg >> _item)}
|
|
|
|
|
|
|
|
#define CHECK_CONTAINER_ITEMS\
|
|
|
|
_item in (GVAR(virtualItems) select 3) ||\
|
|
|
|
{_item in (_accsArray select 0)} ||\
|
|
|
|
{_item in (_accsArray select 1)} ||\
|
|
|
|
{_item in (_accsArray select 2)} ||\
|
|
|
|
{_item in (_accsArray select 3)} ||\
|
|
|
|
{_item in (GVAR(virtualItems) select 4)} ||\
|
|
|
|
{_item in (GVAR(virtualItems) select 5)} ||\
|
|
|
|
{_item in (GVAR(virtualItems) select 6)} ||\
|
|
|
|
{_item in (GVAR(virtualItems) select 7)} ||\
|
|
|
|
{_item in (GVAR(virtualItems) select 8)} ||\
|
|
|
|
{_item in (GVAR(virtualItems) select 10)} ||\
|
|
|
|
{_item in (GVAR(virtualItems) select 11)} ||\
|
|
|
|
{_item in (GVAR(virtualItems) select 12)} ||\
|
|
|
|
{_item in (GVAR(virtualItems) select 13)} ||\
|
|
|
|
{_item in (GVAR(virtualItems) select 14)} ||\
|
|
|
|
{_item in (GVAR(virtualItems) select 15)} ||\
|
|
|
|
{_item in (GVAR(virtualItems) select 16)} ||\
|
|
|
|
{_item in (GVAR(virtualItems) select 17)}
|
|
|
|
|
|
|
|
#define ADD_LOADOUTS_LIST_PICTURES\
|
|
|
|
_contentPanelCtrl lnbSetPicture [[_newRow, 2], getText (configFile >> "cfgWeapons" >> ((_loadout select 0) select 0) >> "picture")];\
|
|
|
|
_contentPanelCtrl lnbSetPicture [[_newRow, 3], getText (configFile >> "cfgWeapons" >> ((_loadout select 1) select 0) >> "picture")];\
|
|
|
|
_contentPanelCtrl lnbSetPicture [[_newRow, 4], getText (configFile >> "cfgWeapons" >> ((_loadout select 2) select 0) >> "picture")];\
|
|
|
|
_contentPanelCtrl lnbSetPicture [[_newRow, 5], getText (configFile >> "cfgWeapons" >> ((_loadout select 3) select 0) >> "picture")];\
|
|
|
|
_contentPanelCtrl lnbSetPicture [[_newRow, 6], getText (configFile >> "cfgWeapons" >> ((_loadout select 4) select 0) >> "picture")];\
|
|
|
|
_contentPanelCtrl lnbSetPicture [[_newRow, 7], getText (configFile >> "cfgVehicles" >> ((_loadout select 5) select 0) >> "picture")];\
|
|
|
|
_contentPanelCtrl lnbSetPicture [[_newRow, 8], getText (configFile >> "cfgWeapons" >> (_loadout select 6) >> "picture")];\
|
2017-12-24 19:41:13 +00:00
|
|
|
_contentPanelCtrl lnbSetPicture [[_newRow, 9], getText (configFile >> "cfgGlasses" >> (_loadout select 7) >> "picture")];
|