Commit Graph

669 Commits

Author SHA1 Message Date
BerkieBb b5de979b79 fix(server/player): error on character creation 2022-03-19 11:16:10 +01:00
Idris Dev ae231817fb Update auto_assign.yml 2022-03-18 10:31:58 +11:00
Idris Dev 6a147056c8 Merge pull request #536 from BerkieBb/dev
[dev branch] Some additions
2022-03-18 08:24:59 +11:00
BerkieBb 103754e6bb Merge branch 'dev' into dev 2022-03-15 09:33:43 +01:00
Idris bf0a4a2192 Merge branch 'main' of https://github.com/qbcore-framework/qb-core into dev 2022-03-15 18:04:37 +11:00
BerkieBb 73300a2edf Revert "feat (server/player): Added Job update on duty update" - IdrisDose 2022-03-14 23:59:28 +01:00
Idris Dev 617dc0e760 Merge pull request #564 from qbcore-framework/revert-519-main
Revert "Trigger Job Update on Duty Update"
2022-03-15 09:57:49 +11:00
Idris Dev 17fc6544e5 Revert "feat (server/player): Added Job update on duty update (#519)"
This reverts commit f58478b61f.
2022-03-15 09:57:38 +11:00
BerkieBb 05e740c963 tweak(manifest): remove progressbar dependency 2022-03-13 21:43:09 +01:00
BerkieBb 8efd4266a5 fix(client/functions): error when progressbar is not started 2022-03-13 21:42:23 +01:00
BerkieBb 93a95e268b tweak(server/player): ping when player was banned
Co-authored-by: ItsANoBrainer <itsanobrainergg@protonmail.com>
2022-03-13 21:18:05 +01:00
BerkieBb 696629de91 Merge pull request #1 from ItsANoBrainer/dev2
[Hotfix] Missing Job/Gang found
2022-03-13 21:14:41 +01:00
ItsANoBrainer 440b4eb01c [Hotfix] Missing Job/Gang found
- If a job or gang isnt found in shared, it will error out and character can not spawn
2022-03-13 16:13:32 -04:00
BerkieBb e63d9f744d fix(client/functions): undefined variable 2022-03-13 20:44:17 +01:00
BerkieBb db11f3d9cc fix(server/exports): wrong variable 2022-03-13 20:43:26 +01:00
BerkieBb a063eca8f0 Prevent duplicated phone and account numbers [Scully] 2022-03-12 12:54:29 +01:00
BerkieBb 2e75bdbdb5 fix(server/exports): wrong variable
Co-authored-by: ItsANoBrainer <itsanobrainergg@protonmail.com>
2022-03-12 12:30:13 +01:00
BerkieBb 4cf4030ad3 fix(client/functions): undefined variable
Co-authored-by: ItsANoBrainer <itsanobrainergg@protonmail.com>
2022-03-12 12:26:42 +01:00
Idris Dev aeacfa9ca0 Merge pull request #517 from Scullyy/main
Prevent duplicated phone and account numbers
2022-03-12 14:03:24 +11:00
BerkieBb 8d9a970aa1 fix(server/functions): old permission check 2022-03-07 18:59:21 +01:00
BerkieBb d57c592ee3 fix(server/main): database permission getter 2022-03-07 18:58:54 +01:00
BerkieBb 9ea595bf22 Merge branch 'qbcore-framework:dev' into dev 2022-03-07 10:08:21 +01:00
Idris Dev 423e959f38 Update Number 10? 2022-03-06 21:36:23 +11:00
Idris Dev 40f16a836e Update auto_assign.yml 2022-03-06 21:35:33 +11:00
Idris Dev 44a5bd4ab7 Update auto_assign.yml 2022-03-06 21:34:34 +11:00
Idris Dev de27d316fb Update auto_assign.yml 2022-03-06 21:25:34 +11:00
Idris 1db8792a26 Merge branch 'main' of https://github.com/qbcore-framework/qb-core into dev 2022-03-06 21:16:46 +11:00
Idris Dev deee263c4a Update auto_assign.yml 2022-03-06 21:16:36 +11:00
Idris 5bf8abf66b Merge branch 'main' of https://github.com/qbcore-framework/qb-core into dev 2022-03-06 21:15:14 +11:00
Idris Dev e9e0cffd67 Create auto_assign.yml 2022-03-06 21:11:19 +11:00
Idris Dev f50cca0791 Update HTML to reflect new location of assets 2022-03-02 10:19:54 +11:00
jnccloud 8760d61bcd Merge branch 'dev' into patch-1 2022-03-01 17:26:03 -05:00
Idris Dev 352efae1d5 Merge pull request #555 from t3xtm3/dev
tweak(index.html): Fix css/js href
2022-03-02 07:37:18 +11:00
BerkieBb 815ff542ac fix(client/functions): notify text type 2022-03-01 21:10:38 +01:00
BerkieBb 3da18e61ea chore(client/functions): remove unused variable 2022-03-01 20:50:40 +01:00
BerkieBb cc0ed41653 fix(client/functions): blip creation log and dubble if statement 2022-03-01 20:50:21 +01:00
BerkieBb 64b5ec4885 fix(client/functions): blip creation 2022-03-01 20:41:55 +01:00
BerkieBb 5dd1f78af5 fix(server/commands): add kickall 2022-03-01 20:25:35 +01:00
BerkieBb 32d32e78fc fix(server/events): add kickall 2022-03-01 20:25:14 +01:00
BerkieBb d1e20143b1 Merge branch 'dev' into dev 2022-03-01 20:08:59 +01:00
BerkieBb 99f5bdb235 feat(server/commands): open and close server commands 2022-03-01 19:43:50 +01:00
BerkieBb 1319c57009 chore(client/events): pvp naming 2022-03-01 19:43:16 +01:00
BerkieBb c8fd9a590d feat: removed connectqueue as a dependency 2022-03-01 19:42:03 +01:00
BerkieBb d57218594f feat(config): whitelist config and connectqueue config 2022-03-01 19:41:37 +01:00
BerkieBb 20635c389d feat(server/events): closed server check, whitelist functionality and optional connectqueue config 2022-03-01 19:41:05 +01:00
BerkieBb 3cc48b0767 feat(server/functions): make isWhitelisted usable 2022-03-01 19:40:05 +01:00
jnccloud 2f0c82d5f9 Update HTML to reflect new location of assets 2022-03-01 13:19:41 -05:00
BerkieBb 0ba5d9cb40 refactor!: cleanup and some features 2022-03-01 18:54:18 +01:00
wert 67b1e20a92 tweak(index.html): Fix css/js href 2022-03-01 15:03:28 +00:00
Idris Dev a76a651379 feat (vehicles): Updated Missing Vehicle Properties
[Update] Missing Vehicle Properties
2022-03-01 18:20:48 +11:00