 David Malchin
|
7fab401ed2
|
Fix Styling (#758)
* style: ensure consistent indentation
* style: add spacing
* style: add newlines
* style: simplify html
* fix: update javascript indent size in contribution guidelines
|
2022-07-18 23:45:46 +03:00 |
|
|
Stan
|
657f55b599
|
Merge pull request #753 from aw3rque/patch-2
Update tr.lua
|
2022-07-11 18:13:33 +01:00 |
|
|
efe
|
e64437444e
|
Update tr.lua
|
2022-07-11 20:10:04 +03:00 |
|
|
Stan
|
ff7d613969
|
Merge pull request #752 from aw3rque/patch-1
Update tr.lua
|
2022-07-11 18:04:26 +01:00 |
|
|
efe
|
403f2e666b
|
Update tr.lua
|
2022-07-11 20:03:09 +03:00 |
|
|
efe
|
28d17860e6
|
Update tr.lua
|
2022-07-11 20:01:19 +03:00 |
|
|
efe
|
4d0c1bcfcd
|
Update tr.lua
|
2022-07-11 19:56:46 +03:00 |
|
|
Tom Osborne
|
2c00ca53ad
|
Merge pull request #737 from BerkieBb/main
feat(server/commands): multiple permission support and fix argsrequired
|
2022-07-09 16:56:49 +01:00 |
|
|
BerkieBb
|
b650e9dacc
|
Merge branch 'main' into main
|
2022-07-09 17:40:10 +02:00 |
|
|
Kakarot
|
e3d692fc4c
|
Merge pull request #742 from BerkieBb/quickfix
fix(server/functions): hasitem single item check
|
2022-06-30 13:12:20 -07:00 |
|
|
BerkieBb
|
e90962fb4e
|
Merge branch 'main' into main
|
2022-06-30 21:57:13 +02:00 |
|
|
BerkieBb
|
c26879a702
|
fix(server/functions): hasitem single item check
|
2022-06-30 21:51:33 +02:00 |
|
|
Niunisas
|
52cb62c3b2
|
Fix HasItem check if amount is provided and item not found (#741)
* fix(server/events): amount checking fix
* fix(client/functions): item checking fix
|
2022-06-30 20:20:45 +02:00 |
|
|
BerkieBb
|
87d3636c12
|
feat(server/commands): multiple permission support and fix argsrequired
|
2022-06-27 18:10:00 +02:00 |
|
|
Kakarot
|
82ac1bec32
|
Revert phone number changes
|
2022-06-24 17:11:15 -05:00 |
|
|
Kakarot
|
61b279a24f
|
Merge pull request #733 from BerkieBb/main
Fix object amount parameter for hasitem function
|
2022-06-23 17:11:04 -05:00 |
|
|
BerkieBb
|
0b2f3c2a4e
|
fix(server/functions): object amount parameter
|
2022-06-23 21:40:59 +02:00 |
|
|
BerkieBb
|
4fc5e46d0b
|
fix(client/functions): object amount parameter
|
2022-06-23 21:40:29 +02:00 |
|
|
Kakarot
|
21b6d5ae39
|
Merge pull request #699 from 7R3C3/main
Fixed da.lua
|
2022-06-21 14:14:19 -05:00 |
|
|
Kakarot
|
092ac4ed80
|
Merge branch 'main' into main
|
2022-06-21 14:10:44 -05:00 |
|
|
Morfar
|
3103ea2b9b
|
Update da.lua
Updated da.lua with missing arguments following the new one from en.lua
|
2022-06-21 17:33:31 +02:00 |
|
|
Kakarot
|
fa81591e3a
|
Merge pull request #732 from TheHorizon-Fivem/patch-2
phone issue
|
2022-06-20 22:05:14 -05:00 |
|
|
TheHorizon-Fivem
|
cd20d2b791
|
phone issue
a fix for the phone issue
https://github.com/qbcore-framework/qb-phone/issues/306 fixed by https://github.com/peppinoita but he didnt make a pull request for it
|
2022-06-20 19:48:18 +02:00 |
|
|
Kakarot
|
6caf27c45a
|
Merge pull request #729 from JonasDev99/patch-1
Fixed wrong type SetVehicleProperties / SetVehicleDoorBroken
|
2022-06-18 14:02:26 -05:00 |
|
|
Kakarot
|
6a9156b778
|
Merge pull request #730 from Antho7Twitch/patch-1
fix(es locale)
|
2022-06-18 14:02:18 -05:00 |
|
|
Kakarot
|
5949d83cc1
|
Merge branch 'main' into patch-1
|
2022-06-18 14:01:13 -05:00 |
|
|
Kakarot
|
daf44b158d
|
Merge branch 'main' into patch-1
|
2022-06-18 14:01:03 -05:00 |
|
|
Kakarot
|
f92a76f013
|
Merge pull request #728 from BerkieBb/main
Client and Server side functions for hasitem without callbacks
|
2022-06-18 14:00:47 -05:00 |
|
|
AnthoHansen
|
bb03c70458
|
fix(es locale)
|
2022-06-18 14:01:12 +02:00 |
|
|
Jonas Suter
|
f9161afe1a
|
fixed wrong type
|
2022-06-18 09:51:36 +02:00 |
|
|
Kakarot
|
46f4ea625c
|
Merge branch 'main' into main
|
2022-06-16 22:58:25 -07:00 |
|
|
Kakarot
|
bb555091ca
|
Update payment when changed in shared
|
2022-06-17 00:19:17 -05:00 |
|
|
BerkieBb
|
cc0cf6a942
|
feat(server/functions): server side hasitem check
|
2022-06-17 01:10:16 +02:00 |
|
|
BerkieBb
|
483f14d66a
|
feat(client/functions): client side hasitem check
|
2022-06-17 01:09:50 +02:00 |
|
|
Kakarot
|
935937758c
|
Merge pull request #661 from MaximusR9/patch-1
Add Remove and Update export functions
|
2022-06-16 11:45:17 -07:00 |
|
|
Kakarot
|
fb9eb1489f
|
Merge branch 'main' into patch-1
|
2022-06-16 11:42:30 -07:00 |
|
|
Kakarot
|
69bfedb1bf
|
Merge pull request #672 from LifeGoal/patch-1
Update sv.lua
|
2022-06-16 11:41:50 -07:00 |
|
|
Kakarot
|
7f5fcc48ec
|
Merge branch 'main' into patch-1
|
2022-06-16 11:41:07 -07:00 |
|
|
Kakarot
|
0a529972af
|
Merge branch 'main' into patch-1
|
2022-06-16 11:40:51 -07:00 |
|
|
Kakarot
|
3f04db2df0
|
Update events.lua
|
2022-06-16 11:45:32 -05:00 |
|
|
MaximusR9
|
b726a0cb0c
|
Update exports.lua
|
2022-06-16 18:43:07 +05:00 |
|
|
MaximusR9
|
3f838431b5
|
Merge branch 'main' into patch-1
|
2022-06-16 05:09:15 -07:00 |
|
|
Viktor
|
ee30ce7e69
|
Fixed problems
|
2022-06-16 12:52:52 +01:00 |
|
|
Kakarot
|
d57181e191
|
Merge pull request #684 from ItsANoBrainer/ClientCallbacks
[Feature] Client Callbacks
|
2022-06-15 20:07:59 -07:00 |
|
|
Kakarot
|
03d24a3dcb
|
Merge branch 'main' into ClientCallbacks
|
2022-06-15 20:06:51 -07:00 |
|
|
Kakarot
|
8d201eff22
|
Merge pull request #702 from mmoftah/main
FEAT: Allow getting offline Player object
|
2022-06-15 19:37:02 -07:00 |
|
|
ItsANoBrainer
|
7daf9f121a
|
Merge branch 'main' into ClientCallbacks
|
2022-06-15 21:56:46 -04:00 |
|
|
Kakarot
|
1be8447c2b
|
Merge branch 'main' into main
|
2022-06-15 18:14:30 -07:00 |
|
|
Kakarot
|
e4db9203a5
|
Merge branch 'main' into patch-1
|
2022-06-15 18:10:16 -07:00 |
|
|
Kakarot
|
458fdf9147
|
Merge branch 'main' into patch-1
|
2022-06-15 18:10:04 -07:00 |
|