Commit Graph

973 Commits

Author SHA1 Message Date
Stan 82e4bd5f98 Merge pull request #745 from Atlantis-QB/main
improvements(es.lua)
2022-07-25 13:31:13 +01:00
AnthoHansen abc108e760 Merge branch 'qbcore-framework:main' into main 2022-07-25 14:23:11 +02:00
Stan 851b56dab3 Merge pull request #756 from D4isDAVID/main
Update Russian and Hebrew locales
2022-07-24 10:55:46 +01:00
David Malchin 42215714d3 Merge branch 'main' into main 2022-07-24 11:56:26 +03:00
David Malchin e22e9217fe Update he.lua 2022-07-24 11:55:09 +03:00
SuperDaniel 2120ce506d Update loops.lua (#749)
Correction of typographical error.

Co-authored-by: BerkieBb <82737367+BerkieBb@users.noreply.github.com>
2022-07-24 00:10:56 +03:00
David Malchin e990409c11 Merge branch 'main' into main 2022-07-23 19:39:00 +03:00
NetOut 38ed80fed2 Fixed isnetworked (#764)
With the above way, the condition was always true because (false or true) is true or (nil or true) is true.

With this change it is fixed.
2022-07-23 16:01:23 +03:00
Kakarot 2b0e0c8edc Model check 2022-07-23 02:14:20 -05:00
Kakarot 1b2915a75f Vehicle server-spawning functions/callback 2022-07-22 22:59:01 -05:00
David Malchin 8b5f5b2b37 Fix styling, docs, and a possible bug (#762)
* 🎨 Fix spacing and indentation

* 🎨 Use single quotes over backticks

* 📝 Fix docs

* 🐛 Make replace function clear and extend locales correctly

* Revert "🎨 Use single quotes over backticks"

* Update config.lua
2022-07-22 12:14:02 +03:00
David Malchin 770ea44530 Update he.lua 2022-07-21 15:11:16 +03:00
David Malchin cbed255874 Update he.lua 2022-07-21 15:10:08 +03:00
David Malchin 9245a209c1 Update he.lua 2022-07-21 14:38:20 +03:00
David Malchin 215094281d Update Hebrew locale 2022-07-21 14:16:59 +03:00
David Malchin e41ba89f87 Update Russian locale 2022-07-21 14:16:59 +03:00
Stan 42f39ea651 Merge pull request #761 from RadhwaneDZ/patch-2
Update ar.lua
2022-07-20 15:25:13 +01:00
RadhwaneDZ 72223bd196 Update ar.lua 2022-07-20 15:17:38 +01:00
nzkfc 304654b340 Update vehicles.lua 'sportsclassic' to 'sportsclassics' (#759)
* Update vehicles.lua

* Update vehicles.lua
2022-07-20 11:49:39 +03:00
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
AnthoHansen 8c7aa7cea9 improvements(es.lua)
- Improvements of Spanish localization.
2022-07-01 18:08:09 +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