mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
ec840a793d
11 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
PabstMirror
|
e32bcb1f9a | Arsenal - Adjust macros for newest pboProject | ||
mharis001
|
0b19a8d527 |
Arsenal - 3DEN Attribute (#6257)
* Initial commit * Add/remove items and switching between categories * Add ability to change mode * Save attribute and clear button * Search bar and double click to toggle * Add export button * Add attribute init function * Fix multiple selection with different items * Correct bad code and remove unneeded include * Update stringtable.xml From common pbo whitelist (modified) and a3 stringtables * Disable attribute on humans * Move includes to top ref #6407 |
||
Josuan Albin
|
0a313ce41f |
Fix right tab listNbox not showing last item on first load (#6390)
Go figure why that happens tho :/ |
||
|
Josuan Albin
|
1994e301fd |
More various ace arsenal fixes (#6192)
* Compile stats on preInit * Remove uneeded check in add/removeStat * Remove perf profiler vars They aren't required anymore * Fix case issue in verifyLoadout, remove uneeded line * Fix ace arsenal cam not working porperly underwater By removing those checks the cam is allowed to clip through objects and work properly underwater, sounds like features to me :D * Fix gunbag behavior in ace arsenal Switching between gunbags will keep the weapon, switching to another backpack then back to a gunbag will also keep the weapon. * Fix text scaling in the searchbars and loadout name edit boxes Also made the text bigger by default |
||
|
Josuan Albin
|
1d6e07d18f |
Add ACE Arsenal stats (#6110)
* Add test class * Add stats mockup * Merge branch 'master' of https://github.com/acemod/ACE3 into arsenalStats * Finish mockup, add basic hide/show logic * Add base for stats * Use CBA EHs for stats to allow 3rd party mods of it * Add handleStats and most of the UI behaviors for stats * Continue work on stats * Add container stats * Add page support for stats * Add text for the ROF stat * Add accuracy in MOA for the accuracy stat * Change accuracy shown number to 1 decimal instead of 2 * Add MIL in the dispersion stat text * Change stats layout, remove dummy text strings * Add some AB stats * Remove last test string * Replace configExtremes by normal lookup where it's relevant * Add "undefined value" string when AB stat isn't present Mostly for laucnhers * Fix typo in preInit * Change drag model stat to ballistic coef * Fix issue with unused stats, change text to white when bar is present * Rewrite some part of handleStats Reason: add support for conditions, less redundant code, less reasons for dedmen to emasculate me * Re-add _hideUnusedFnc, handle empty stats arrays * Pass args to stat conditions, add test condition stat * Add hearing related stats * Remove the padding between stats and the stat bar / text * Add strings for stats * Change stats window to fit baer's suggestion * Algin the close stats button, add missing strings * Finish code review * Add missing newline * Remove duplicate strings * Add explosive range stat * Use proper string for the explo range stat * Fix capitalization for ctrlParent * Fix conditional stats blocking other stats * Add better integration for ballistics, hearing and explosive stats * Replace the private array in handleStat by params * Add backblast stats * Add backblast stat strings * Add flashlight map color and g-force reduction stats * Shorten preInit * Change stats close button to fit arsenal design * Improve stats page indicator look * Rework how stats are stored and retrieved * Remove args config entry, add priority entry, add vanilla weapon stats * Add vanilla container stats * Remove some lines in preInit * Add ballistics stats * Add hearing stats * Remove uneeded config entries * Add explosive range stat * Add backblast stats * Add spaces after semicolons in statements To make JJ happy because I don't care. * Add flashlights map color stat * Add gforce reduction stat FINALLY FUCKING DONE * Fix headers for the new stats funcs * Add add / remove stat API * Fix typo in removeStat header * Remove uneeded inline func * Clean up add / remove stat * Move all CfgACEArsenalStats entries to their own file * Replace STR_ACE_Ballistics_statAmmo by a BI string * Add script profiler related macro and code * Use the highest ballistic coef instead of first one defined * Add support for future ammo displayname * Add ACE_standardAtmosphere for ballistic coef * Add mag muzzle velocity stat * Add weapon muzzle velocity stat * Add comment explaining the ENABLE_PERF_PROFILING macro * Change cfgACEArsenalStats to ACE_Arsenal_Stats * Make JJ less pissy about spaces around = * Fix indentation in weaponMuzzleVelocity, use param * Use GVAR and EGVAR when appropriate * Prefix all stats except the base class * Fix Merge * Fix aspect ratio scaling of stats panel * Minor fixes |
||
|
Josuan Albin
|
8b9480de40 |
Add various misc improvements for ACE Arsenal (#6111)
* Disable anim previews when center isn't the player * Abuse configs to change the edit loadout 3DEN entry * Remove inheriting as it's not needed * Remove uneeded condition * Add zeus modules for ACE Arsenal, revert old arsenal modules * Add 3 new arsenal EHs * Add a setting to disable the identity tabs in ace arsenal * Pass loadoutName in the onloadoutLoad EH * Change foreach to forEach and ctrlcommit to ctrlCommit * Resize the right window when the load bar isn't there * Add a tooltip for the "clear container" button * Improve onKeyDown, add classname copying using ctrl+c |
||
|
Josuan Albin
|
29a0b2ef09 |
Misc arsenal fixes (#6083)
* Change backpack and scope checks in scanConfig and addVirtualItems Reason: was not a good implementation Might cause issue of people compalining about tents. * Give IDC to menuBar controls, disable import button in MP Reason: copyFromClipboard is disabled in MP * Add tooltip strings for the loadouts, export, import menu buttons * Remove double space in onArsenalOpen |
||
|
Josuan Albin
|
0acbde1489 |
Various ACE Arsenal fixes (see description) (#5996)
* Copy the array properly when using preStart cache in openBox * Fix add and removeVirtualItems erroring out when passing false as arg * Disable face, voice, and insignia tabs in 3DEN * Move grenadeList and putList outside of foreach in scanConfig * Fix grenadeList and putList indentation * Change the camera handling in onArsenalClose Fixes the camera not being focused on the player after using ACE Arsenal on an other unit outside of zeus / 3DEN. Remove the code that moved the curatorCam near the edited unit after ACE Arsenal is closed. * Fix message control overflowing, move width defines to defines.hpp * Add ability to exit arsenal and not apply a loadout in 3DEN * Add ACE3 logo to common, fix config pathing to a non existing file |
||
|
Josuan Albin
|
1b332129e6 |
Add QOL improvement for the ACE Arsenal loadouts screen (#5973)
* Add search bar in loadouts screen * Add onKeyDown support for the loadouts display * Add ctrl+key support to both editbox in the loadouts screen * Fix syntax error |
||
commy2
|
057cc8d6d5 | rename 'close' to 'try' in arsenal | ||
|
Josuan Albin
|
2bde515aaa |
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 |