Commit Graph
259 Commits
Author SHA1 Message Date
MrNewb 3652f2b1bd small patch for qbx when config not set 2025-05-15 11:16:37 -04:00
MrNewb 6b660d8084 feat: GetPlayerJobData
return {
        jobName = jobData.name,
        jobLabel = jobData.label,
        gradeName = jobData.grade_name,
        gradeLabel = jobData.grade_label,
        gradeRank = jobData.grade,
        boss = isBoss,
        onDuty = jobData.onduty,
    }
2025-05-14 04:48:23 -04:00
MrNewb 20c348824d fixfixfix 2025-05-14 03:47:28 -04:00
MrNewb 5629bab494 Update server.lua 2025-05-13 01:25:47 -04:00
MrNewb 99f82095d7 fuck 2025-05-13 01:06:52 -04:00
MrNewb 2a5fa897a9 Revert "psuh for crowley"
This reverts commit 0dc3d51319.
2025-05-13 00:22:49 -04:00
MrNewb 0dc3d51319 psuh for crowley 2025-05-12 23:13:08 -04:00
MrNewb 567bd7a824 TODO 2025-05-11 20:36:07 -04:00
MrNewb 5e016afc25 fix sharedConfig load order 2025-05-11 20:18:46 -04:00
JericoFX 78bb1f8c05 Add utility functions for player data retrieval and enhance existing functions 2025-05-11 12:16:49 -03:00
MrNewb 7e0124f02e returns added everywhere per crowleys request 2025-05-10 00:01:56 -04:00
Johann Kraus 1242d9ef7c Add GetPlayer functions to framework and New FUnctions to Utility 2025-05-09 23:06:01 -03:00
gononono64 69edf6f6ab forgot qbox and did some cleanup 2025-05-09 20:09:57 -05:00
gononono64 6f700ed7cf Update client.lua 2025-05-09 19:07:17 -05:00
gononono64 38d0d5527a New features and cleanup
Added Networked Markers
Added Anim module
Added framework default file for things that are native to game related to player
Started on a batch network event trigger to allow for single event call for multiple events

Updated params notation for ids
Removed prints from client_entity + actions + ext
2025-05-09 19:06:50 -05: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 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
gononono64 93ebca8762 Merge branch 'dev' of https://github.com/The-Order-Of-The-Sacred-Framework/community_bridge into dev 2025-05-05 13:57:09 -05:00
Luxu 70199ea310 okokPhone integration 2025-05-05 18:17:28 +01: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
gononono64 3cb9829f4f Qs-inventory and Framework IsPlayerDead fixes
qs item info had typo. IsPlayerDead was missing last stand for qb
also removed couple debug prints
2025-05-04 11:06:55 -05:00
gononono64 3c96d6a2bc GetIsPlayerDead added
Added GetIsPlayerDead to framework serverside. Needs testing on esx and qbox
2025-05-02 03:13:07 -05:00
MrNewb 81ab66fbbf rumaier found a bug 2025-05-01 11:44:22 -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
gononono64 b9842eedfe Merge branch 'dev' of https://github.com/The-Order-Of-The-Sacred-Framework/community_bridge into dev 2025-04-21 04:54:45 -05:00
gononono64 64540c4c31 too many iteminfos 2025-04-21 04:54:35 -05:00
Sky 630bdd6956 Update _qb-input.lua (again :P )
- Added single checkpoint usability
- Added check for options table variable
- Added checked option to be passed for toggling box as true/ false
2025-04-20 11:20:34 +01:00
Sky 28c220082c Update _qb-input.lua
Fixed issue with default option not working correctly when creating qb-input menu
2025-04-20 10:40:14 +01:00
Sky de98315aff Merge branch 'The-Order-Of-The-Sacred-Framework:dev' into dev 2025-04-20 10:38:24 +01:00
MrNewb ad80c94833 notes 2025-04-19 14:37:10 -04:00
MrNewb 2fb2edff9b Fuel.GetFuelName 2025-04-19 14:36:10 -04:00
gononono64 bd0074a156 Inventory Update
Added serverside iteminfo and consolidated image path. Now returns full nui path in .image
2025-04-16 05:24:03 -05: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
cityparadise 985b71442c Remove Client Based Debug
- Removed Client Based Debug Option (using shared in settings folder.)
2025-04-14 12:18:44 +01:00