Commit Graph
463 Commits
Author SHA1 Message Date
Johann Kraus 1c19fffb31 Clean DUI until i found a better way to do it 2025-05-16 01:45:50 -03:00
gononono64 8665899043 Merge branch 'dev' of https://github.com/The-Order-Of-The-Sacred-Framework/community_bridge into dev 2025-05-15 18:35:40 -05:00
MrNewb 3652f2b1bd small patch for qbx when config not set 2025-05-15 11:16:37 -04:00
gononono64 2aef4125ff removed prints left in cache 2025-05-15 01:49:49 -05:00
gononono64 d89b087e4d cache fixed 2025-05-15 01:48:02 -05: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 8067547974 Merge pull request #96 from The-Order-Of-The-Sacred-Framework/main
sync
2025-05-14 03:54:55 -04:00
MrNewb 692f11444d Merge pull request #95 from The-Order-Of-The-Sacred-Framework/dev
fixfixfix
2025-05-14 03:52:31 -04:00
MrNewb 48fcf4a817 Update fxmanifest.lua 2025-05-14 03:52:15 -04:00
MrNewb 20c348824d fixfixfix 2025-05-14 03:47:28 -04:00
MrNewb a495fe8668 Merge pull request #93 from The-Order-Of-The-Sacred-Framework/dev
Dev
2025-05-13 01:52:07 -04:00
MrNewb df95934c1c 0.8.0
## 🚀 Version Bump Update

Hello everyone!
As we push this latest version, I wanted to take a moment to highlight what's new. This update includes **44 commits** and introduces **GitHub Actions** to the repository—so if all goes well, this notice should also make its way into Discord!

### 📜 Organizational Updates

* We've added a **Code of Conduct** for the organization—please take a moment to review it.
* We're excited to officially welcome **@JericoFX** to the team! His contributions in this update have been massive.

### 🔧 Highlights of This Update

* **Core Inventory Compatibility** (ESX + QB): Now fully (and hopefully seamlessly) integrated – thanks to @MrNewb.
* **Version Checker**: Minor improvements by @MrNewb.
* **Bridge Table Formatting**: Now matches `ox` formatting more closely – thanks to @MrNewb.
* **Documentation Efforts**: We've made major strides in improving notation and preparing for better documentation across the board.
* **Library & Load Structure**: Significant internal refactoring by @JericoFX and @gononono64.
* **Revive Player**: Functionality added to the bridge by @gononono64.
* **Switch/Match Functions**: Introduced by @JericoFX.
* **Player Data Functions**: Framework Native return data functions added by @JericoFX.
* **Marker System Fixes**: Marker and particle fixes, now with server-side support – thanks to @gononono64.
* **Cutscene System**: Added by @gononono64 with enhancements from @JericoFX.
* **DUI Manager**: Now includes mouse support and instance management – built by @JericoFX.
* **General Cleanup & Optimization**: Massive improvements to bridge stability and structure – thanks to @JericoFX & @gononono64.
* **Misc Fixes**: Includes `qs-inventory` fixes and `isPlayerDead` resolution – by @gononono64.

Thanks to everyone contributing, testing, and providing feedback. We're continuing to push toward better structure, documentation, and usability across all systems.

Stay tuned—and as always, report any issues you encounter!
2025-05-13 01:51:34 -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 1d0255185d Revert "Merge pull request #92 from JericoFX/dev"
This reverts commit d697317142, reversing
changes made to 7927927394.
2025-05-13 00:23:01 -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 d697317142 Merge pull request #92 from JericoFX/dev
Refactor cLib initialization and modularize server/client libraries
2025-05-12 23:02:42 -04:00
JericoFX c1c5626df3 add update function to cache 2025-05-12 14:31:33 -03:00
JericoFX 3ea66043ea Enhance cache module with improved type annotations and error handling; allow nil wait times for dynamic caching 2025-05-12 14:24:32 -03:00
JericoFX 68aa645494 Refactor global environment setup by removing redundant assignments to _ENV 2025-05-12 12:13:16 -03:00
JericoFX 42fe204615 Refactor cLib initialization and modularize server/client libraries 2025-05-12 11:46:47 -03:00
gononono64 7927927394 lil more cleanup
i love prints!
2025-05-12 02:48:11 -05:00
gononono64 340b57d301 marker fix
wasnt drawing at the correct location just the first location.

cleaned up prints in particles
2025-05-12 02:44:27 -05:00
MrNewb b39e9afb2f Merge pull request #90 from JericoFX/patch-1
Add the modules to the env
2025-05-12 02:12:35 -04:00
MrNewb 19fb85e62d Merge pull request #91 from The-Order-Of-The-Sacred-Framework/main
Create main.yml
2025-05-12 02:12:09 -04:00
MrNewb 671c6ea421 Create main.yml 2025-05-12 02:07:49 -04:00
gononono64 2f7c40e809 Server-sided markers and particles 2025-05-12 00:58:25 -05:00
Johann Kraus 6b63c290ea Add the modules to the env
This will allow to the others resources to use the modules from the ENV table.
2025-05-11 23:50:48 -03:00
MrNewb 5bff52034c Update init.lua 2025-05-11 22:30:25 -04:00
gononono64 b3417f9fde fixed minor issue in cutscenes
insert witty joke here
2025-05-11 20:14:35 -05: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
MrNewb 2f68a092d5 Merge pull request #88 from JericoFX/dev
A set of changes Dui + Cleaning
2025-05-11 19:43:40 -04:00
JericoFX 2687b81488 Old Lady cleaning v2 2025-05-11 12:58:11 -03:00
JericoFX 78444c7aae Old Lady Cleaning 2025-05-11 12:58:01 -03:00
JericoFX 67c9fbf783 Implement DUI Manager with mouse support and instance management 2025-05-11 12:57:34 -03:00
JericoFX 78bb1f8c05 Add utility functions for player data retrieval and enhance existing functions 2025-05-11 12:16:49 -03:00
gononono64 498f8670ee Bazinga Scenes
I bring you bazinga scenes. These are regular cutscenes but here now. Okay good bye
2025-05-11 00:47:33 -05:00
gononono64 e6feb5cde3 marker and a fixiewixie
oppsie doopsies
2025-05-09 23:05:44 -05:00
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
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