Commit Graph
485 Commits
Author SHA1 Message Date
MrNewb 98b883950d Add ZSX_UIV2 support for helptext, notify, and progressbar
Introduced new client modules for helptext, notify, and progressbar using ZSX_UIV2. Updated client and shared configuration files to include ZSX_UIV2 as an option for ProgressBarSystem, Notify, and HelpText. Bumped fxmanifest version to 0.13.2.
2026-01-24 18:08:34 -05:00
Sinaps Dev 0f2e41d72f IsVehicleOwnedByPlayer method 2025-12-28 17:10:26 +01:00
MrNewb 48f8122197 Remove cache and batch event libraries, update locales
Deleted the cache and batch event libraries from the codebase, including all related client, server, and shared files. Removed server-side particle library and associated client event handlers. Updated utility and clothing modules to remove cache dependencies. Improved utility logging and deprecated point functions with notices. Updated all locales to use a consistent 'PurchasedItem' message format and added Bulgarian (bg) translation. Bumped version to 0.13.1 in fxmanifest.
2025-12-23 19:27:27 -05:00
MrNewb 343af95794 Remove example scripts and update core logic
Deleted all files in the examples directory to clean up unused or test scripts. Updated fxmanifest.lua to enable ox_lib initialization. Improved error handling and entity tracking in utility functions, added prop removal, and made minor localization and code style adjustments throughout the codebase. Significant reword of inventory module, notification module, and framework module. Added support for wasabi_uikit, added support for keep-progressbars,
2025-12-14 16:22:35 -05:00
Mr.Crowley c40a260ea2 magic space was introduced with last patch
removed
2025-11-14 19:34:47 -06:00
Mr.Crowley a1901fc400 Bux fixes and cleanup
placeable_objects cleaned up white space and removed commented out code

points: issue with teleporting outside of a cell. Does not fire onremove event functions. Fixed

utility: Implemented fix for special characters for blips.

dialogue: upped wait time on close. This allows use to reopen the menu right away without firing the animation to close
2025-11-14 18:36:35 -06:00
MrNewb 444040dd39 This was crowleys commit and work - Refactor entity behaviors and improve particle handling
Refactored entity behavior triggers to simplify argument passing and added OnSet handler for particle behaviors. Improved particle effect management and event handling, updated locale and lib initialization in several modules, and fixed skill metadata access. Also streamlined point zone logic and menu/zone system initialization for better reliability.
2025-10-26 16:20:27 -04:00
MrNewb 179c3bad85 Add vehicle key integration modules
Introduces client-side modules for various vehicle key resources, each providing standardized GiveKeys and RemoveKeys functions. This enables compatibility with multiple vehicle key systems by abstracting their APIs behind a common interface.
2025-10-26 15:20:45 -04:00
MrNewb 266697b1fe Remove all vehicle key client modules
Deleted all client-side vehicle key integration modules from both 'vehicleKey' and 'vehiclekey' directories. This change likely reflects a refactor, migration, or deprecation of the vehicle key system integrations.
2025-10-26 15:20:31 -04:00
MrNewb 1d9431f88e folder name changes 2025-10-26 15:19:35 -04:00
MrNewb b42219f0a3 Merge pull request #163 from divide29/main
add integration for emergencydispatch
2025-10-21 09:06:42 -04:00
divide29 ff57646be2 fix: wrong index in data.jobs client 2025-10-21 13:04:34 +00:00
divide29 85e784b3f6 fix wrong index in data.jobs 2025-10-21 09:58:34 +00:00
MrNewb 3a9424659b Refactor Dispatch.SendAlert for clarity
Assigns alert data to a local variable before passing it to exports.tk_dispatch:addCall, improving readability and maintainability.
2025-10-19 23:04:54 -04:00
MrNewb 664b397404 Refactor Target resource name function placement
Moved the GetResourceName function definition to the top of both ox_target and qb-target client modules for consistency and clarity. Also performed minor code cleanup and reordering for improved readability.
2025-10-19 22:59:18 -04:00
Mr.Crowley 45a98528b1 Merge pull request #160 from Luke20201/main
Add fd_dispatch support
2025-10-19 21:58:17 -05:00
MrNewb 61f4d05f0a Add descriptions to framework job count functions
Added @description annotations to all relevant functions and event handlers in both client and server framework modules for improved code documentation and clarity.
2025-10-19 22:21:22 -04:00
divide29 c6759228a3 add integration for emergencydispatch 2025-10-17 22:50:00 +00:00
MrNewb 19911d9173 Refactor target system client logic and zone functions
Simplifies debug flag initialization and resource state checks in both ox_target and qb-target client scripts. Updates Target.FixOptions to streamline option handling and canInteract logic. Target.AddBoxZone and Target.AddSphereZone now return the zone name for improved usability.
2025-10-15 18:05:56 -04:00
MrNewb a7b3a34998 Add LuaDoc @description to fuel API functions
Replaced comment blocks with LuaDoc @description tags for GetResourceName, GetFuel, and SetFuel functions across all fuel module client files. This improves code documentation consistency and supports better tooling integration.
2025-10-12 21:54:52 -04:00
MrNewb c73faa43db Add checks for alternative inventory resources
Added resource state checks for 'codem-inventory' and 'origen_inventory' in both client and server scripts to ensure compatibility and prevent conflicts when those resources are present.
2025-10-12 21:53:27 -04:00
MrNewb c582ce69e9 Add check for 17mov_CharacterSystem resource
Added a conditional check for the '17mov_CharacterSystem' resource in all clothing module scripts. This prevents the modules from loading if '17mov_CharacterSystem' is present, improving compatibility and avoiding conflicts.
2025-10-12 21:52:12 -04:00
MrNewb 91e295947b Merge pull request #162 from solaire-fivem/qb-core-code-cleanup
Enforcing consistent annotations and fixing spelling mistakes
2025-10-05 18:56:23 -04:00
solaire-fivem 3ce3b7fe57 Enforcing consistent annotations and fixing spelling mistakes 2025-10-04 19:39:26 +01:00
Luke20201 ab414b2b48 fix location returning hash instead of string 2025-09-28 18:11:14 +01:00
Luke20201 c0e5241d40 add fd_dispatch support 2025-09-28 17:26:03 +01:00
ONyambura a4959882b3 FIX - QB-Core - Framework/Inventory - Item properties fix
QB-Core Framework.
Some inventories has item property `count` instead of `amount`.
+/- Added fallback to `count` if `amount` doesn't exists.
2025-09-26 19:02:30 +03:00
MrNewb 582ce9e640 Refactor item info retrieval in inventory modules
Updated Inventory.GetItemInfo to use the full items table for lookups instead of fetching individual items. Added Inventory.Items function to both client and server for consistent access to the items table. Improved handling of missing data and streamlined code for better maintainability.
2025-09-13 18:04:05 -04:00
MrNewb 41c90f9082 Add wasabi_mdt dispatch integration
Introduces client and server modules for dispatch integration with the wasabi_mdt resource. Provides functions to send alerts and retrieve the resource name, enabling compatibility with the wasabi_mdt dispatch system.
2025-09-11 17:34:54 -04:00
MrNewb 3dfbaa8573 Localize target menu and interaction prompts
Replaced hardcoded target menu titles, descriptions, and interaction prompts with localized strings from en.json. Updated client.lua to use Language.Locale for menu and help text, improving internationalization and consistency.
2025-09-10 21:47:58 -04:00
MrNewb 90c65dc55e Add GetResourceName function to all modules
Introduces a standardized GetResourceName function to banking, clothing, dispatch, doorlock, framework, fuel, helptext, housing, and other modules. This function returns the name of the in-use resource, improving resource identification and interoperability across the codebase.
2025-09-10 12:27:12 -04:00
MrNewb f4e5d9485f Refactor hunger and thirst retrieval methods
Simplified Framework.GetHunger and Framework.GetThirst functions in both qb-core and qbx_core by using Framework.GetPlayerMetaData instead of accessing player data directly. This improves code readability and consistency.
2025-09-10 11:29:42 -04:00
MrNewb 08c3d937d6 Round hunger and thirst values to nearest integer
Updated GetHunger and GetThirst functions to return rounded integer values using math.floor(value + 0.5) for consistency and to avoid floating point results.
2025-09-10 11:29:42 -04:00
MrNewb 8bf02f6372 Fix hunger and thirst status retrieval
Changed Framework.GetHunger and Framework.GetThirst to fetch the 'status' instead of 'hunger' or 'thirst' directly. This ensures the functions correctly iterate over the status table to find the relevant values.
2025-09-10 11:29:42 -04:00
MrNewb aae3d540ff Update server.lua 2025-09-10 11:29:42 -04:00
MrNewb 943f86d47b Add nil check for player data in GetStatusData
Prevents errors by returning 0 if player data is unavailable when calling Framework.GetStatusData.
2025-09-10 11:29:42 -04:00
MrNewb cfd746d889 Refactor hunger and thirst retrieval logic
Introduced Framework.GetStatusData to centralize status lookup. Updated GetHunger and GetThirst to use the new function, improving code reuse and maintainability.
2025-09-10 11:29:41 -04:00
MrNewb 87345fafce Add GetHunger and GetThirst functions to frameworks
Introduced GetHunger and GetThirst functions to client and server files for es_extended, qb-core, and qbx_core frameworks. These functions return the player's hunger and thirst values rounded to the nearest integer, improving consistency in status retrieval.
2025-09-10 11:29:41 -04:00
MrNewb 0186815079 Merge pull request #146 from solaire-fivem/fix-issue-with-the-GetHunger-and-GetThirst-server-sided-functions
Fix issue with GetThirst and GetHunger not working in ESX
2025-09-04 04:45:49 -04:00
Solaire 18ac3ce0ca Round the result 2025-09-03 22:58:17 +01:00
MrNewb facffe26c5 Merge pull request #148 from TheOrderFivem/JobCounts
Job counts
2025-09-03 01:25:02 -04:00
MrNewb 9c61f7967d Update callback module import paths
Changed all references from 'lib/utility/shared/callbacks.lua' to 'lib/callback/shared/callback.lua' in client and server files for framework, inventory, and phone modules to reflect new file structure or module location.

Commit#f900bc5 did not adjust these, correcting.
2025-09-01 17:05:34 -04:00
solaire-fivem 71cd1e0676 Fix issue with GetThirst and GetHunger not working in ESX 2025-09-01 14:22:03 +01:00
MrNewb e9fa5a2891 Fix type annotation for job count function
Updated the type annotation for the 'tbl' parameter in Framework.GetJobCountTotal from 'any' to 'table' for improved clarity and correctness.
2025-09-01 02:31:14 -04:00
MrNewb 014dba1012 Add job count tracking to framework
Introduces job count tracking and retrieval functions to both client and server modules. The server now maintains and updates a global state of job counts, synchronizing changes to clients. Refactors job registration logic for accuracy and consistency, and adds utility functions for total job counts and player source retrieval.

This usage with the state may be a problem on initial start for highly populated servers as 200 players load in for example...
2025-08-31 22:49:31 -04:00
MrNewb 9fdb41e9f6 Add job count management on player events
Introduces event handlers to update job counts when players load, change jobs, or unload across multiple framework modules. Ensures job count tracking stays accurate by adding or removing counts based on player actions. (would like to update this to have some client event tables?)
2025-08-31 22:49:29 -04:00
MrNewb b532e33fc7 Merge pull request #145 from solaire-fivem/solaire-improving-readability
ESX: Cleanup the client and server lua files in the framework module
2025-08-31 14:33:50 -04:00
solaire-fivem f5017792e3 es_extended framework code cleanup 2025-08-31 18:41:12 +01:00
MrNewb a435a4a75c Restore stash registration return values
Reverts stash registration to return a boolean and id, undoing a breaking change from commit #e06e04a. This restores compatibility with multiple resources and inventories that rely on the previous behavior. Also returning a success status on registration has many uses.
2025-08-29 23:53:44 -04:00
MrNewb 9062e5b2a8 Restore shop opening logic to pre-e06e04a behavior
Reverts breaking changes from commit #e06e04a by restoring the previous shop opening logic. This fixes compatibility issues with multiple resources that were affected by the change.
2025-08-29 23:49:59 -04:00