Commit Graph
768 Commits
Author SHA1 Message Date
MrNewb facffe26c5 Merge pull request #148 from TheOrderFivem/JobCounts
Job counts
2025-09-03 01:25:02 -04:00
MrNewb 209d257f1c Merge pull request #147 from TheOrderFivem/loggs
Loggs
2025-09-03 01:13:43 -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
MrNewb 63d2f675f6 Buffer and batch Discord log messages
Introduces a queue and timer to batch log messages before sending them to Discord, reducing the number of HTTP requests. Refactors the built-in log handler to use the new queuing system and improves code consistency. Looks gross but works.
2025-09-01 03:33:29 -04: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 7f14eef82b Refactor logging system and centralize config
Reworked the logging system to use a unified handler approach supporting built-in, qb, ox_lib, and Fivemerr log systems. Deprecated Logs.Send and Logs.Notify in favor of Logs.CreateLog. Centralized all logging configuration options in serverConfig.lua for easier management and extensibility.
2025-09-01 02:29:15 -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
Mr.Crowley c399fbaca4 Refactor behavior and entity invocation handling
Standardizes the use of the 'invoked' property for entities and behaviors, ensuring behaviors are scoped per invoking resource. Updates behavior registration, retrieval, removal, and cleanup logic to support resource-specific behavior tables, improving modularity and preventing cross-resource conflicts.
2025-08-31 20:50:46 -05: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
Mr.Crowley b0f5cd85a9 Add dialogue example script
Introduces a Lua script demonstrating a simple NPC dialogue interaction using Bridge.Dialogue. The script spawns a ped, opens a dialogue menu, and handles user selections with follow-up actions.
2025-08-31 03:23:09 -05:00
MrNewb c0e8b7e447 Merge pull request #144 from TheOrderFivem/crowleys-branch
prep for behaviors
2025-08-31 03:12:26 -04:00
Mr.Crowley f2ff03734e prep for behaviors
readded behaviors
2025-08-30 19:12:56 -05:00
MrNewb 26bd9e1cad Update server_entity.lua 2025-08-30 03:43:01 -04: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
MrNewb ac9f0ae777 Restore legacy shop logic
Reverts shop registration to pre-commit #e06e04a behavior, removing the CreateShop function and restoring RegisterShop. This fixes breaking changes affecting multiple resources and inventories without any deprecation path.
2025-08-29 23:47:52 -04:00
MrNewb 996339f0bc Update init.lua 2025-08-28 12:47:40 -04:00
Mr.Crowley 495b24e53f fixed last mess 2025-08-27 06:13:02 -05:00
Mr.Crowley e06e04a2c6 hope this works 2025-08-27 05:47:44 -05:00
Mr.Crowley 5b6641fc60 silly me
woopsies
2025-08-24 20:02:47 -05:00
MrNewb 7693648c32 yeeeeet 2025-08-24 17:32:16 -04:00
Mr.Crowley 8c309e248e Added behaviors and documentation to oxlibs zones
Will provide file in example when more features are implimented
2025-08-23 22:53:49 -05:00
Mr.Crowley 59fa75a618 Merge branch 'dev' of https://github.com/The-Order-Of-The-Sacred-Framework/community_bridge into dev 2025-08-22 16:49:24 -05:00
Mr.Crowley fcd279b30a Zones compatibility
Createzone, remove zone, cleanup on resource stop, cleanup on invoked resource stop,
2025-08-22 16:49:17 -05:00
MrNewb b81ea486ff Merge pull request #142 from solaire-fivem/fix-minor-typo
Fix typo "platerData" to "playerData"
2025-08-22 17:25:43 -04:00
solaire-fivem 48cba10ad2 fix minor typo, 'platerData' to 'playerData' 2025-08-22 22:08:41 +01:00
Mr.Crowley 2da3fed196 following convention for blips
switched to follow naming convention for others
2025-08-22 03:33:42 -05:00
Mr.Crowley 4e313c40cb Update to utility for blip
added .CreateBlipRadius which makes a circular blip with some radius in meters
2025-08-22 03:27:03 -05:00
MrNewb f2fad0cb5b Update server.lua 2025-08-21 05:37:44 -04:00
Mr.Crowley a1181c2758 distance compatibility 2025-08-21 02:27:38 -05:00
Mr.Crowley d0d72bdba5 here we go again 2025-08-21 00:09:54 -05:00
Mr.Crowley cba3ba1d98 forgot to save init file 2025-08-20 23:51:03 -05:00
Mr.Crowley f900bc5ce1 Clean up 2025-08-20 23:49:22 -05:00
MrNewb b896b94001 sync 2025-08-20 23:38:22 -04:00
Mr.Crowley b06d2fb49e Discarded entityactions and updated target
Discarded entityactions: was not used and bloat. Need a new system that handled networked entities static vs dynamic (non-moving non networked vs moving networked)

updated target to improve performance on canInteract. It seems that the target systems spam this function. Using a state and checking every second instead of allowing spamming

Added ClientEntity.ChangeModel
2025-08-20 22:23:07 -05:00
MrNewb cbd340326d Merge pull request #141 from XenoS-ITA/refactor-fuel-and-vehiclekey
Refactor fuel and vehiclekey
2025-08-20 21:44:49 -04:00
MrNewb c17b4e1fe6 Update client.lua 2025-08-20 19:38:47 -04:00
Xenos.exe 49b9b58f88 Merge branch 'TheOrderFivem:main' into refactor-fuel-and-vehiclekey 2025-08-21 01:33:56 +02:00
XenoS-ITA de52a3e8e1 refactor(attributions): remove dirk_lib from attributions 2025-08-21 01:25:40 +02:00
XenoS-ITA a289e6f1d2 refactor(vehicleKey): add client.lua for mVehicle 2025-08-21 01:24:41 +02:00
XenoS-ITA 783c15ad9c refactor(vehicleKey): remove obsolete client.lua file for mono_carkeys 2025-08-21 01:24:27 +02:00
XenoS-ITA 9e810d4b24 refactor(vehicleKey): enhance key management functions with assertions, improved documentation and remove vehicle keys where they was missing 2025-08-21 01:23:58 +02:00
XenoS-ITA 3289711297 refactor(fuel): more consistency, now SetFuel doesnt return and every SetFuel as type, that will be used only by ti_fuel 2025-08-21 00:34:00 +02:00
MrNewb 718214d135 This is busted, should be removed.
Should be removed as not working for external resources.
It will work in the bridge itself but could lead to bloat/misuse and we shouldn't be responsible.
2025-08-20 16:59:04 -04:00
MrNewb 957e2e2ff6 Merge pull request #140 from TheOrderFivem/dev
feat: major system refactor, feature patches, and compatibility improvements
2025-08-19 07:30:39 -04:00
MrNewb 75f431e3ac Merge pull request #139 from PiotreeQ/patch-1
Update server.lua
2025-08-19 07:29:13 -04:00
MrNewb ec8067828f prep for version bump 2025-08-19 06:30:52 -04:00
pScripts 28b616f72d Update server.lua 2025-08-19 11:08:43 +02:00