mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
94ceed201c
10 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
jonpas
|
742626ff1a
|
General - Relative script_component.hpp includes (#9378)
Co-authored-by: PabstMirror <pabstmirror@gmail.com> |
||
Grim
|
d33a158e2e
|
Arsenal - Favorites System (#9307)
* improve page handling * drop MAX_STATS_PER_PAGE for now * hide stats box when empty * improve hiding * improve _fnc_hideUnused * condition * prevent page overflow Co-authored-by: PabstMirror <pabstmirror@gmail.com> * favorites var * function prep * favorites only * improve favorites adding, add include * fix stupid * fix color setting (todo: lnb color) * add button, finalize * setting tooltip * stringtable again * fix setting overwrite, improve tooltip * fix losing weapon items * fix macro * fix setting to intended overwrite * remove unnecessary private * docs * more docs * is * improve button text * docs * fix tooltip not showing unless menuBar was clicked * improve weapon accessory lookup * empty line * update refresh calls * fix left panel * cleanup currentCargo * use BI string for favorites * BI strings again * no favorites for face/voice/insignia * stringtable again * add missing setColorRight * Add comment for favorites setup --------- Co-authored-by: PabstMirror <pabstmirror@gmail.com> |
||
johnb432
|
174841751c
|
Arsenal - Improve support for unique equipment (#9287)
* work on arsenal actions * cycle through pages * docs * cleanup * Update addons/gunbag/functions/fnc_weaponName.sqf Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com> * missing fil * Update addons/arsenal/functions/fnc_itemInfo.sqf * Update addons/arsenal/functions/fnc_refresh.sqf Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com> * remove CBA_loadoutSet gunbag cache * update fnc_refresh * Added unique item support for left panel items * Cleanup * fix 3den * add scopeEditor --------- Co-authored-by: Brett <brett@mayson.io> Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com> Co-authored-by: Salluci <salluci.lovi@gmail.com> Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com> |
||
|
johnb432
|
c8404f496e
|
Arsenal - Add/Fix/Improve/Change numerous aspects (#9040)
* Arsenal update * Fixes * Update fnc_onSelChangedLeft.sqf * Update fnc_updateUniqueItemsList.sqf * Header fixes * Fix for defines.hpp Co-authored-by: Dystopian <sddex@ya.ru> * Moved fnc_baseWeapon, filtered invalid items * Update addons/arsenal/functions/fnc_scanConfig.sqf Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com> * Fixes and tweaks - Sorting is guaranteed to give a fixed order - Dog tags no longer throw errors when reloading the ACE arsenal mission when you had some saved in your loadout before quitting the last time you played. * Cleanup, bug fixes and additions - Added the ability to add items from "CfgMagazines" into the "Misc. items" or custom tabs. - Added "baseWeapon" class support for weapon attachments. If a weapon attachment has the config property "baseWeapon" defined, it will take that item and show that in the arsenal. - Added stronger filtering on item scopes (scope > 0 at least for every item) - Added "descending" (default, as it is now) and "ascending" sort order as a drop down menu, - Unique backpacks in containers can now be removed with either the "-" or "clear all items" button. - When sorting by a number, 2 decimal points have been added, so that when you sort by weight it returns the correct order. * More fixes and tweaks - Converted the arsenal to partially work with hashmaps instead of arrays (for configItems and virtualItems, currentItems is still an array). - Because of the above, performance of FUNC(addVirtualItems) and FUNC(removeVirtualItems) has improved immensely. - Sorting now caches results, reducing repeated sorting times drastically. - CBA disposable launchers are handled differently now: Within the arsenal, you can change weapon attachments on disposable launchers, but you can't change their magazines (primary or secondary). Item info on the right and the stats show correct information. - FUNC(addSort) now checks if the new sorting method already exists and doesn't add it if it does. - FUNC(removeSort) now exists. You can't remove the default sort type (alphabetically) to avoid problems with the arsenal. - Both FUNC(addStat) and FUNC(compileStats) actually taken priority into account now. Because of that priority on several stats needed to be tweaked. - FUNC(removeStat) ensures that there are no gaps within the stat array (so if there is an empty spot in the stats page, it's because there is a stat, but the condition for it being shown hasn't been met). * Update fnc_replaceUniqueItemsLoadout.sqf * Update fnc_onSelChangedLeft.sqf * Update fnc_scanConfig.sqf * Update docs/wiki/framework/arsenal-framework.md Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com> * Minor cleanup * Baseweapon filtering * Improvements + better unique items support * Update fnc_fillRightPanel.sqf * Update fnc_onSelChangedLeft.sqf Fixed: Switching between weapons with incompatible primary magazines while a compatible secondary magazine is loaded doesn't equip the new weapon's primary magazine. * Update addons/common/functions/fnc_uniqueUnitItems.sqf Co-authored-by: PabstMirror <pabstmirror@gmail.com> * undefined variable Co-authored-by: PabstMirror <pabstmirror@gmail.com> * fix undefined loadout var * Update fnc_fillLoadoutsList.sqf --------- Co-authored-by: Dystopian <sddex@ya.ru> Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com> Co-authored-by: PabstMirror <pabstmirror@gmail.com> |
||
BrettMayson
|
438a90b63d
|
Common - Add CBA extended loadout (#8923)
* extended loadouts - earplugs, gunbag, and arsenal identity * arsenal - maintain default loadout size check * restore comment Co-authored-by: jonpas <jonpas33@gmail.com> * fix forgotten example Co-authored-by: jonpas <jonpas33@gmail.com> |
||
PabstMirror
|
7bc6fdfa66
|
Cleanup - Trim all trailing whitespace (#8651) | ||
Dedmen Miller
|
e2ac18a05d |
[WIP] Fix script errors reporting wrong line numbers (#6407)
* advanced_ballistics * advanced_fatigue * advanced_throwing * ai * aircraft * arsenal * atragmx * attach * backpacks * ballistics * captives * cargo * chemlights * common * concertina_wire * cookoff * dagr * disarming * disposable * dogtags * dragging * explosives * fastroping * fcs * finger * frag * gestures * gforces * goggles * grenades * gunbag * hearing * hitreactions * huntir * interact_menu * interaction * inventory * kestrel4500 * laser * laserpointer * logistics_uavbattery * logistics_wirecutter * magazinerepack * map * map_gestures * maptools * markers * medical * medical_ai * medical_blood * medical_menu * microdagr * minedetector * missileguidance * missionmodules * mk6mortar * modules * movement * nametags * nightvision * nlaw * optics * optionsmenu * overheating * overpressure * parachute * pylons * quickmount * rangecard * rearm * recoil * refuel * reload * reloadlaunchers * repair * respawn * safemode * sandbag * scopes * slideshow * spectator * spottingscope * switchunits * tacticalladder * tagging * trenches * tripod * ui * vector * vehiclelock * vehicles * viewdistance * weaponselect * weather * winddeflection * yardage450 * zeus * arsenal defines.hpp * optionals * DEBUG_MODE_FULL 1 * DEBUG_MODE_FULL 2 * Manual fixes * Add SQF Validator check for #include after block comment * explosives fnc_openTimerUI * fix uniqueItems |
||
Ozan Eğitmen
|
db6a40f91d |
Arsenal - Add Default Loadouts API (#6558)
* Add addDefaultLoadout function
* Initialize defaultLoadoutsList by default
* Close params bracket
* Revert "Initialize defaultLoadoutsList by default"
This reverts commit
|
||
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
|
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 |