Commit Graph

72 Commits

Author SHA1 Message Date
SKITTLE 3748f19056 Update vehicles.lua 2023-04-30 00:11:07 +05:30
Kakarot 9d384f9d35 Merge branch 'main' into patch-2 2023-04-27 16:19:01 -07:00
Kakarot 3d0c273e3e PR #951 2023-04-27 18:09:31 -05:00
Kakarot 7a0ad63325 Merge pull request #967 from r3ps4J:main
Fix subs not getting replaced in locales
2023-04-27 15:25:59 -07:00
RowDog cffc1712f3 remove all tabs replace with spaces 2023-04-02 13:59:08 +01:00
RowDog 0ee8ff7f38 sorted some spacing 2023-03-31 22:23:02 +01:00
RowDog 052c3fa6ff capitilize the description 2023-03-31 21:30:43 +01:00
RowDog 4675e97f5c add items to shared 2023-03-31 20:53:10 +01:00
r3ps4J 85d25bb911 Fix subs not getting replaced in locales 2023-03-30 12:01:26 +02:00
Ilker Kulgu e17a6993dd EMS jobtype (#946)
* EMS jobtype

* Bump

* Update fxmanifest.lua

---------

Co-authored-by: zwkf <dev@charlie.fyi>
2023-03-03 18:01:56 +00:00
JaySixty 14625ec5b1 Move location of starter items (#865)
* Update; Location of starter items

Moved the starter items to near top of the file - commonly searched for, and would be expected at top of the file

* Bump

---------

Co-authored-by: zwkf <dev@charlie.fyi>
2023-02-24 02:49:41 +00:00
KamuiKody 0a42541f34 remove unnecessary table (#936)
at startup  there is no need to repopulate the same table it doesnt get called anywhere else in the entire resource folder.

Co-authored-by: zwkf <dev@charlie.fyi>
2023-02-13 09:56:55 +00:00
Jack 7b68f72cec Update vehicles.lua (#929)
* Update vehicles.lua

Remove the space after this, as when somebody tries to pull it out, it will break PDM due to the space in the model hash.

* Bump version number

Co-authored-by: zwkf <dev@charlie.fyi>
2023-01-26 01:58:28 +00:00
Peter 15be92922e Update ignus
Fixed ignus being classed as sports when its super
2023-01-19 21:05:53 +00:00
Peter 33979cbede [FIX] more shared/vehicles.lua car names & brands (#901)
Co-authored-by: Zerio <54480523+Z3rio@users.noreply.github.com>
2022-12-22 23:22:05 +01:00
Peter 3ca665c76a [FIX] shared/vehicles.lua car names & other issues (#893)
Co-authored-by: Zerio <54480523+Z3rio@users.noreply.github.com>
2022-12-22 18:22:30 +01:00
Joel a96052ee26 Refactor: Removes indenting, reduces to one line (#899) 2022-12-21 16:42:45 +01:00
R0adRa93 cc64ee38e8 Getting QB-Core ready for qb-jobs (#883)
Co-authored-by: Zerio <54480523+Z3rio@users.noreply.github.com>
2022-12-16 23:38:31 +01:00
David Malchin 1ef7337ce5 [BUG] Locale instances not actually being created (#860)
Co-authored-by: Zerio <54480523+Z3rio@users.noreply.github.com>
2022-12-14 17:55:17 +01:00
KamuiKody 72f036b608 vehicle mispelling 2022-11-19 06:39:50 -05:00
Stevie 5fd425fb1a Update vehicles.lua 2022-11-02 06:58:33 +00:00
R0adRa93 235e15abc4 Update vehicles.lua
replaced /t with /s/s/s/s
2022-10-16 10:49:06 -04:00
R0adRa93 93715043ea Update vehicles.lua
fixed linting issues
2022-10-16 10:44:31 -04:00
r0adra93 2caa8787d4 Update vehicles.lua
added commercial vehicles to the lua.
2022-10-14 23:14:58 -04:00
r0adra93 6ef632ac6f Update vehicles.lua
Capitalized remaining values that weren't capitalized.
2022-10-06 02:57:39 -04:00
r0adra93 15b2e7136c added categoryLabel to shared/vehicles.lua
Added categoryLabel to shared/vehicles.lua table.
2022-10-06 02:18:22 -04:00
r0adra93 5e765b09e7 Merge remote-tracking branch 'upstream/main' into r0ad-veh 2022-10-06 01:51:37 -04:00
Stan 24ff22331d Merge branch 'main' into patch-1 2022-09-23 17:29:35 +01:00
r0adra93 b23c7ee9de Merge remote-tracking branch 'upstream/main' into r0ad-veh 2022-09-19 06:50:14 -04:00
buntyverma69 fec6b290d5 add missing oxygen tank tube item 2022-09-11 20:33:27 +05:30
r0adra93 f0e9a4248a test for multi stores
test for multi stores
2022-09-10 14:22:28 -04:00
David Malchin 1a3aa824fa Add locale convar and locale fallback 2022-09-04 00:46:21 +03:00
Mekz1222 6e0e1b204d Added smg suppressor item
Added missing item for smg suppressor
2022-09-02 05:02:45 +03:00
Kakarot 968fa01b4b Update jobs.lua 2022-08-30 20:40:34 -05:00
Spudgun 1dde823486 feat: first character of word to uppercase function 2022-08-23 19:53:06 +12:00
Spudgun 7b33f25210 update: common functions and weapon type info 2022-08-20 21:07:42 +12:00
Kakarot 8fffc421bb Merge Dev (#794)
* [Update] Stuff and Things - Fix Exploit

- Update doors on teleport so they don't get stuck (requires my doorlock PR that creates a updateDoors() export
- Support for heading with TeleportToCoords event
- Support for teleporting to location name with /tp and a default file with locations to use
- Remove 'QBCore:Server:AddItem' event (requires PR to other resources that use it)
- Support for an array of items that do the same thing with QBCore.Functions.CreateUsableItem
- Player exists check before removing or adding permission
- Trigger OnPlayerUnload as a server side event too
- Player.Functions.GetMetaData function
- Added reason to money remove logs
- Set dirt level to 0 on /car vehicles

* Export to Event

* Deprecate instead of remove?

* Player+License verification fix

* Update events.lua

* Export change for qb-management

* [Hotfix] Errors after Merge

* [Change] src to source

* Prevent people using /me to troll

This prevents people using that /me troll with the huge font size and different colors.

* Remove DoorUpdate event

* Update client/events.lua

Co-authored-by: BerkieBb <82737367+BerkieBb@users.noreply.github.com>

* Update server/functions.lua

Co-authored-by: BerkieBb <82737367+BerkieBb@users.noreply.github.com>

* Adjustments for BB

* Linting

* fix(server/functions): use indexed variables

Co-authored-by: David Malchin <malchin459@gmail.com>

* chore(server/events): remove unnecessary _

Co-authored-by: David Malchin <malchin459@gmail.com>

* chore(server/events): remove unnecessary _'s

Co-authored-by: David Malchin <malchin459@gmail.com>

* chore(server/events): language

Co-authored-by: David Malchin <malchin459@gmail.com>

* chore(server/events): language

Co-authored-by: David Malchin <malchin459@gmail.com>

* chore(server/events): language

Co-authored-by: David Malchin <malchin459@gmail.com>

* chore(server/events): language

Co-authored-by: David Malchin <malchin459@gmail.com>

* chore(server/player): indentation

Co-authored-by: David Malchin <malchin459@gmail.com>

* [Chore] Remove Money

Removed repetitive code that made zero sense

* Update en.lua

* Update player.lua

* Update player.lua

* Update functions.lua

Co-authored-by: ItsANoBrainer <itsanobrainergg@protonmail.com>
Co-authored-by: Scullyy <51968381+Scullyy@users.noreply.github.com>
Co-authored-by: Idris Dev <IdrisDose@users.noreply.github.com>
Co-authored-by: Idris <idrisdev@gmail.com>
Co-authored-by: BerkieBb <82737367+BerkieBb@users.noreply.github.com>
Co-authored-by: David Malchin <malchin459@gmail.com>
Co-authored-by: Chris Usiak <christopher.usiak@oakland.k12.mi.us>
2022-08-19 11:48:39 -05:00
BerkieBb d88e51ee4f Remove inventory code from the core (#784)
* tweak(config): remove inventory code

* tweak(client/functions): remove inventory code

* cleanup(server/commands): remove inventory command

* cleanup(server/events): remove hasitem callback

* cleanup(server/functions): remove inventory code

* cleanup(server/player): remove inventory code

* feat(server/player): QBCore:Player:SetPlayerData server side

Removed QBCore:Server:PlayerLoaded for PR that will be merged before me that adds it

* feat(server/player): QBCore:Server:OnGangUpdate

* fix(shared/items): remove duplicate snowball

* fix(server/events): warn for exploitable event

* fix(server/functions): startup error

* feat(server/player): some backwards compatibility

* fix(server/events): warn for exploitable event

* feat(server/player): Player.Functions.AddField

* feat(server/exports): SetField and AddField

* fix(server/player): inventory state check
2022-08-19 11:33:38 -05:00
dexter9006 fc19a6ac65 Update vehicles.lua
small typo fix
2022-08-16 16:02:13 +01:00
Holidayy95 77112e43ec 2699 cars (#770)
* 2699 cars

* edit

* #BlameBlue

* #
2022-07-28 22:01:03 +03: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
nzkfc 304654b340 Update vehicles.lua 'sportsclassic' to 'sportsclassics' (#759)
* Update vehicles.lua

* Update vehicles.lua
2022-07-20 11:49:39 +03:00
Kakarot 53190a87ab Merge branch 'main' into main 2022-06-15 18:00:39 -07:00
TheiLLeniumStudios db11c7dcec Fix linting issues 2022-05-04 08:08:29 +00:00
Lionh34rt 8685a55f26 Update shared/jobs.lua
Co-authored-by: ItsANoBrainer <itsanobrainergg@protonmail.com>
2022-04-22 22:24:20 +02:00
uShifty a6160cf738 typo: VehicleHashs to VehicleHashes 2022-04-10 20:45:48 -07:00
uShifty 9d83a952c2 feat: Implement QBCore.Shared.VehicleHashs
Describe Pull request
Indexs the vehicles jenkins joaat(Hash) value as the key of the table as the key so we dont have to do some shitty ass loop through the vehicles comparing joaat values. I have no clue why this secondary table was removed in the first place if I had to guess people were lazy but this should help the lazys by automatically filling the table.

Questions (please complete the following information):
Have you personally loaded this code into an updated qbcore project and checked all it's functionality? [yes/no] (Be honest) 
Yes

Does your code fit the style guidelines? [yes/no] 
Yes

Does your PR fit the contribution guidelines? [yes/no]
Yes
2022-04-09 23:09:57 -07:00
Lionh34rt c8c406df9f PlayerData.job.isleo 2022-04-04 14:24:18 +02: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 ce206bbc9e Merge pull request #551 from buntyverma69/patch-1
Fixed helicopters not going air depot
2022-03-22 20:57:30 -07:00