Commit Graph

690 Commits

Author SHA1 Message Date
Kakarot 3bb1023654 WIP permission system 2022-03-28 01:24:40 -05:00
Idris Dev 1dfdb46105 fix (Zap): Fixed user not getting god perms when using Zap Hosting. 2022-03-25 21:35:37 +11:00
Kakarot d0ea8571e3 Pull #521 2022-03-22 23:03:49 -05:00
Kakarot 78bde93f42 Merge pull request #566 from Yonatannn/patch-1
Create he.lua
2022-03-22 21:02:21 -07:00
Kakarot b466e4fc77 Merge pull request #567 from crashys/patch-1
Update pt.lua
2022-03-22 21:02:16 -07:00
Kakarot 95f48b3c53 Merge pull request #570 from elvodkaa/patch-1
Update ar.lua
2022-03-22 21:02:11 -07:00
Kakarot 2789f759b4 Merge pull request #546 from SKITTLE6969/Item.lua-update
Update Items.lua theft and jewelry
2022-03-22 21:00:50 -07:00
Kakarot 52ac1b3b33 Pull #550 2022-03-22 22:59:53 -05:00
Kakarot ce206bbc9e Merge pull request #551 from buntyverma69/patch-1
Fixed helicopters not going air depot
2022-03-22 20:57:30 -07:00
Kakarot 2df3026ba1 Merge pull request #552 from buntyverma69/patch-3
Fixed Boats not going depot
2022-03-22 20:56:41 -07:00
Kakarot 9c818ecd02 Update natives 2022-03-22 22:52:27 -05:00
Kakarot de28c3c9db Update commands.lua 2022-03-22 22:48:36 -05:00
Idris Dev 98c907b9ed chore (typo): QBCore:Notfy -> QBCore:Notify 2022-03-23 14:21:30 +11:00
Idris Dev 19bcd8786c feat: Update 1.1.0 (Dev branch merge into Main) 2022-03-23 14:15:59 +11:00
El Vod Kaa 99af63c83c Update ar.lua 2022-03-19 14:45:24 +01:00
Idris Dev f3eebf8b6c Merge pull request #568 from BerkieBb/dev
fix(server/player): error on character creation
2022-03-19 21:21:08 +11:00
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
Crashys 2d9349da92 Update pt.lua
One word missed translation on line 16 "grade".
2022-03-16 12:08:44 +01:00
yonatannn 27085c918f Create he.lua
Hebrew Lang
2022-03-16 10:11:12 +02: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