TRX/community_bridge
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
429 Commits 2 Branches 0 Tags
2687b8148896b96acac6d0d4ff74a10b9a414564
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
MrNewb 7e0124f02e returns added everywhere per crowleys request 2025-05-10 00:01:56 -04:00
MrNewb 3e63414973 Merge pull request #87 from JericoFX/dev-1 
Add GetPlayer functions to framework and New FUnctions to Utility
 2025-05-09 22:10:18 -04:00
MrNewb 91d69a6742 wip 2025-05-09 06:21:18 -04:00
MrNewb e1235dfc7c reorganized, notation 2025-05-09 06:03:09 -04:00
MrNewb 53d27c528e minor cleanup, functions notated 2025-05-09 03:17:28 -04:00
MrNewb c651b767ba missing fallback added 2025-05-09 03:16:27 -04:00
MrNewb a1bd168994 ---@diagnostic disable: duplicate-set-field 2025-05-09 02:26:02 -04:00
MrNewb 6bd3df2e80 ---@diagnostic disable: duplicate-set-field 2025-05-09 02:01:37 -04:00
MrNewb 485c2d3460 inv diagnostics + repacked tables 2025-05-09 02:00:02 -04:00
MrNewb c0662e1069 version checker tweak 2025-05-09 01:59:36 -04:00
MrNewb 80001d4eec Merge pull request #84 from The-Order-Of-The-Sacred-Framework/main 
Merge pull request #83 from The-Order-Of-The-Sacred-Framework/dev
 2025-05-06 14:58:49 -04:00
MrNewb a7f52a0e33 Merge pull request #83 from The-Order-Of-The-Sacred-Framework/dev 
Version bump
 2025-05-06 14:57:20 -04:00
MrNewb 97c7d290b9 feat: add new features and functionality, bump version for upcoming main push 2025-05-06 14:48:22 -04:00
MrNewb 11114bf529 core_inventory compatibility 
The current implementation isn’t the cleanest, but it gets the job done. I’ve had to rig parts of it together, and it hasn’t yet had a proper cleanup pass. This update adds support for core_inventory on both ESX and QB frameworks. Previously, the QB fallback worked fine, but an issue affecting ESX users was discovered.

To resolve this, a change was needed in how framework-registered usable items are handled—allowing us to pass the item’s ID as the slot when using core_inventory, while maintaining slot-based behavior otherwise. This approach ensures compatibility without requiring any modifications to other resources.

I've personally tested this on ESX, but since I haven’t been able to coordinate with the core_inventory team, QB Core users will essentially be the first wave of testers for this integration.
 2025-05-06 14:39:29 -04:00
MrNewb afb0e6b45e Merge pull request #81 from JericoFX/main 
Add State bag handler
 2025-05-05 23:49:05 -04:00
MrNewb 20b7b976a8 Small patch 2025-05-05 14:57:02 -04:00
MrNewb 162b28075a Merge pull request #79 from luxu-gg/dev 
okokPhone integration
 2025-05-05 14:51:22 -04:00
MrNewb faa733c7ea Merge pull request #78 from JericoFX/main 
Update on cache and config
 2025-05-05 14:48:32 -04:00
MrNewb 3e6bc0dd81 account type for qb format to esx 2025-05-05 10:45:00 -04:00
MrNewb 9863393775 small cleanup -- found by @retrizo 2025-05-04 14:51:56 -04:00
MrNewb 486dca3eb7 Merge pull request #77 from The-Order-Of-The-Sacred-Framework/main 
sync
 2025-05-02 12:04:11 -04:00
MrNewb a3a06d4ae9 Merge pull request #76 from The-Order-Of-The-Sacred-Framework/dev 
0.6.1
 2025-05-02 12:02:32 -04:00
MrNewb a0cb0edf78 0.6.1 2025-05-02 12:01:56 -04:00
MrNewb d528c1f342 whitespace 2025-05-02 09:09:15 -04:00
MrNewb ac44b4b34d Merge pull request #75 from The-Order-Of-The-Sacred-Framework/dev 
0.6.0
 2025-05-01 12:10:13 -04:00
MrNewb 01d2f4e1f6 0.6.0 2025-05-01 12:09:37 -04:00
MrNewb 81ab66fbbf rumaier found a bug 2025-05-01 11:44:22 -04:00
MrNewb f44d76c791 guards 2025-04-29 16:22:46 -04:00
MrNewb 7cc4821345 Update README.md 2025-04-28 10:49:53 -04:00
MrNewb 80ffa8992a Update README.md 2025-04-28 10:36:29 -04:00
MrNewb c83c5130e1 Update README.md 2025-04-28 10:35:37 -04:00
MrNewb 4138bc84ef misc cleanup 
Adjusted force config values to match the required values. Also removed unused config options.
Swapped default logger to built-in
 2025-04-28 10:31:14 -04:00
MrNewb 6e418f406c Notify and HelpText split into seperate modules 
Notify and HelpText split into separate modules, settings moved into shared.
 2025-04-28 10:21:03 -04:00
MrNewb 2fd01dd2ae missing hidehelptext stuff 2025-04-28 10:10:15 -04:00
MrNewb a17eb15217 WIP - skills module 2025-04-28 09:17:43 -04:00
MrNewb 9881292602 standard name returns in fuel 
module.GetFuelName      moved to --------------> Module.GetResourceName
 2025-04-28 09:00:45 -04:00
MrNewb 8efb869dbe typos corrected 2025-04-28 08:25:13 -04:00
MrNewb 90734e4567 Merge pull request #69 from skys-scripts/dev 
Remove Client Based Debug
 2025-04-28 04:27:53 -04:00
MrNewb b41e214aed NO :P 2025-04-23 16:11:43 -04:00
MrNewb 34254c69f6 Merge pull request #72 from The-Order-Of-The-Sacred-Framework/main 
Update fxmanifest.lua
 2025-04-19 15:54:03 -04:00
MrNewb ad412ffaec Update fxmanifest.lua 2025-04-19 15:46:06 -04:00
MrNewb f26ba53520 Merge pull request #71 from The-Order-Of-The-Sacred-Framework/main 
sync
 2025-04-19 15:45:38 -04:00
MrNewb c67c0a817f Merge pull request #70 from The-Order-Of-The-Sacred-Framework/dev 
Dev into main
 2025-04-19 15:44:52 -04:00
MrNewb ad80c94833 notes 2025-04-19 14:37:10 -04:00
MrNewb 2fb2edff9b Fuel.GetFuelName 2025-04-19 14:36:10 -04:00
MrNewb 5d3a9d1950 Get/SetPlayerDuty 2025-04-15 08:04:43 -04:00
MrNewb 329d3328d8 experimental housing module - wip 2025-04-15 07:06:57 -04:00
MrNewb 01f7b385c1 comments + disable dup warning 2025-04-15 03:00:44 -04:00
MrNewb 2700c9baa9 small patch 2025-04-14 02:45:12 -04:00
MrNewb 870f440a1b GetPlayers added 
while theres a native to do this, the purpose of this is using the framework methods, this will only return logged in players ie wont include people who are in multichar and still not logged in
 2025-04-14 01:16:06 -04:00
MrNewb 663e3bc9c1 NEEDS TESTED -- Core Inventory 2025-04-13 19:58:51 -04:00
MrNewb 322516854b Merge pull request #68 from skys-scripts/dev 
Update shops icon in client.lua
 2025-04-13 19:41:15 -04:00
MrNewb a5bc7dcbcc Prevent confusion on github api downtime 
I have been getting tickets/dms when the api is down, to prevent this I have just disabled the failure portion. This isnt ideal but I dont see alerting a server owner the api is down as a solution either.
 2025-04-12 02:32:55 -04:00
MrNewb e6ffe48d82 prints moved to prefexied prints + comments 2025-04-12 02:31:47 -04:00
MrNewb d1da9710da cleanup (use unit tests) 2025-04-12 02:30:59 -04:00
MrNewb 801db83402 GetItemInfo fixes, oops 
Ive also adjusted comments in here because it bugged me.
 2025-04-12 02:30:38 -04:00
MrNewb c15b4dd292 configValue 2025-04-10 22:21:38 -04:00
MrNewb 93a8e20a77 Merge branch 'dev' of https://github.com/The-Order-Of-The-Sacred-Framework/community_bridge into dev 2025-04-10 22:20:14 -04:00
MrNewb d52574a3ce jpr seems to be qb only so updating this for image pathing 2025-04-10 07:04:46 -04:00
MrNewb 6ddbb47e97 GetItemInfo fix on ps/qb inventory 2025-04-10 07:04:15 -04:00
MrNewb 64d302d0da itembox patch 2025-04-10 07:03:32 -04:00
MrNewb 01db36ea80 Merge pull request #67 from The-Order-Of-The-Sacred-Framework/dev 
0.5.0
 2025-04-08 23:58:12 -04:00
MrNewb 24cb04a01b structure 
arrangement's moved around, easier to find. Touched up the notes
 2025-04-08 19:27:34 -04:00
MrNewb 526516031d Merge pull request #66 from OGReaperx/dev 
Added qb-target circleZones and ox_target sphereZones
 2025-04-08 19:12:04 -04:00
MrNewb ff29032394 Merge pull request #64 from skys-scripts/dev 
Added Accessibility Module w/ Misc Fix
 2025-04-08 19:11:31 -04:00
MrNewb 29d75163a9 intelisense stuff 2025-04-08 19:10:02 -04:00
MrNewb e5190cdca0 client side GetItemCount 
Qbox is hardcoded for ox and the only inventory I know that supports it other than ox is quasar, both are bridged so should be completely fine
 2025-04-07 14:37:22 -04:00
MrNewb 9ad8c6188c Drawtext for non target partial support 2025-04-07 14:33:05 -04:00
MrNewb 6ed438a609 possible redutzu-mdt support. 
I looked at the docs, I dont have this to test though
 2025-04-02 12:53:02 -04:00
MrNewb 6bdee6ad91 Documentation, deprecated old points, removed incomplete clothing bridge. 
Documentation added, deprecated old points, removed incomplete clothing bridge. I migrated the points into the new system and added deprecation notices. Cleaned some white spaces because they made me unhappy. Added GetStreetNameAtCoords as it may be useful to return a string for others. Added support for lb-tablet dispatch alerts (thank you loaf)
 2025-04-02 07:27:13 -04:00
MrNewb 5f6b8f47eb Update Attributions.md 
dirk sucks
 2025-03-28 10:25:35 -04:00
MrNewb bfbf3e8f61 Update points.lua 2025-03-24 19:54:06 -04:00
MrNewb 87ce06a61f add compator sleeplessinteract v2 (this is very nice) 
Well done demi
 2025-03-24 19:22:20 -04:00
MrNewb cad3604e4d whitespace, some documentation added 2025-03-24 18:06:52 -04:00
MrNewb 9528fc2a4a itembuilder tests 2025-03-24 14:09:19 -04:00
MrNewb e772a6a49a Merge pull request #60 from jimgordon20/dev 
Add files via upload
 2025-03-16 11:26:11 -04:00
MrNewb 8e49501534 patch for latest oxlib 2025-03-16 07:17:20 -04:00
MrNewb 996d8d9065 Update tables.lua 2025-03-13 01:10:42 -04:00
MrNewb 4e95d7e9b4 stuff 2025-03-10 02:08:52 -04:00
MrNewb ea3b9040ce ModuleName for target and DisableTargeting added 2025-03-10 01:38:37 -04:00
MrNewb 4ee642fc37 weather tweaks 2025-03-10 01:35:58 -04:00
MrNewb 8b59fe22aa get framework jobs 
These are not the same format, will need touchups
 2025-03-10 01:17:18 -04:00
MrNewb 4fa529bfdf Merge pull request #59 from The-Order-Of-The-Sacred-Framework/main 
Merge pull request #58 from The-Order-Of-The-Sacred-Framework/dev
 2025-03-09 23:47:51 -04:00
MrNewb 7f5da592e5 Merge pull request #58 from The-Order-Of-The-Sacred-Framework/dev 
Dev sync 0.4.0
 2025-03-09 23:43:08 -04:00
MrNewb 6eb444b7b3 Update fxmanifest.lua 2025-03-09 23:42:26 -04:00
MrNewb 3de3bf2883 shops FIN 2025-03-09 06:14:38 -04:00
MrNewb e54213398e wip 2025-03-09 05:49:05 -04:00
MrNewb 85c1414ca0 add support for r_notify 2025-03-09 01:50:19 -05:00
MrNewb 31f7475089 Update server.lua 2025-03-09 01:50:10 -05:00
MrNewb 6c18fd7a6c Patch blip issue, add param to blip, guard in removeped, 
Patch blip error on bridge restart, add param to blip, guard in removeped, redid lib point functions (now much much much easier to work with,
 2025-03-07 11:45:39 -05:00
MrNewb f5913a0c45 Update server.lua 2025-03-07 06:29:23 -05:00
MrNewb fcc717cd5d tailing whitespace removed 2025-03-07 04:24:35 -05:00
MrNewb bcc0c4d964 Update clientConfig.lua 2025-03-07 04:23:06 -05:00
MrNewb dee14600ba HasItem + partial support for shops 2025-03-07 04:08:40 -05:00
MrNewb 0d31632dfb ProgressBarSystem to new auto detect 2025-03-04 22:42:35 -05:00
MrNewb f517d23a41 phone in the auto/manual config 2025-03-04 22:33:30 -05:00
MrNewb 064d3b7ccd target to new format 2025-03-04 22:28:34 -05:00
MrNewb aede7a3d2a vehicle keys moved to new auto/config format 2025-03-04 22:24:19 -05:00
MrNewb 355d8dd29f Update clientConfig.lua 2025-03-04 22:18:04 -05:00
MrNewb 799c774f1f menu overrides 2025-03-04 22:15:29 -05:00