Commit Graph

919 Commits

Author SHA1 Message Date
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
Kakarot 2493da2804 Merge pull request #716 from QBLes/patch-1
Updated to Events.lua
2022-06-15 18:09:20 -07:00
Kakarot 1b795179b7 Merge branch 'main' into patch-1 2022-06-15 18:07:59 -07:00
Kakarot 51ea1ee743 Merge pull request #617 from Lionh34rt/main
PlayerData.job.isleo
2022-06-15 18:07:29 -07:00
Kakarot 53190a87ab Merge branch 'main' into main 2022-06-15 18:00:39 -07:00
Kakarot 83cdc53efa Merge pull request #656 from Getpwnedbydolbajoba/patch-1
Estonian translation.
2022-06-15 17:53:23 -07:00
Kakarot 9e917f4e94 Merge branch 'main' into patch-1 2022-06-15 17:52:43 -07:00
Kakarot 29448781ba Merge pull request #659 from Qwerty1Verified/patch-1
🐛fix(clearinv): Player id definition
2022-06-15 17:51:43 -07:00
Kakarot b43f9cecc9 Merge branch 'main' into patch-1 2022-06-15 17:51:02 -07:00
Kakarot 8cb6c676a6 Merge pull request #718 from uShifty/patch-4
fix: Phone number generation
2022-06-15 17:48:43 -07:00
Kakarot fdf03c522d Merge pull request #660 from kywan/patch-1
Update config.lua
2022-06-15 17:47:51 -07:00
Kakarot b951cfcc15 Merge branch 'main' into patch-1 2022-06-15 17:46:31 -07:00
Kakarot fd3591e3ee Merge branch 'main' into patch-1 2022-06-15 17:46:14 -07:00
Kakarot 9c2a0a9905 Merge pull request #666 from JackBro2022/patch-2
Additional fixes to 4K scaling
2022-06-15 17:44:30 -07:00
Kakarot cb45b7be74 Merge pull request #663 from JackBro2022/patch-1
Better support for 4k screens
2022-06-15 17:43:59 -07:00
Kakarot 00ed5251f1 Merge branch 'main' into patch-1 2022-06-15 17:43:04 -07:00
Kakarot d855d5ab29 Merge branch 'main' into patch-2 2022-06-15 17:42:57 -07:00
Kakarot 7794794f3a Merge branch 'main' into main 2022-06-15 17:40:12 -07:00
Kakarot 46fb87cd55 Merge branch 'main' into patch-1 2022-06-15 17:38:23 -07:00
Kakarot 9f0c613b37 Merge pull request #689 from Okkie-NL/patch-1
Updated nl.lua to add missing lines
2022-06-15 17:35:28 -07:00
Kakarot db91e67d3b Merge pull request #697 from serhatalmez/main
Added UpdateItem function.
2022-06-15 17:34:47 -07:00
Kakarot 25b653c295 Merge branch 'main' into patch-1 2022-06-15 17:32:59 -07:00
Kakarot 9d3506f5d0 Merge branch 'main' into main 2022-06-15 17:32:51 -07:00
Kakarot 337c91d081 Merge pull request #715 from Lionh34rt/patch-2
ExploitBan export
2022-06-15 17:31:37 -07:00
Kakarot 794020274e Merge branch 'main' into patch-2 2022-06-15 17:29:51 -07:00
Kakarot 3808b8dc0d Merge branch 'main' into patch-1 2022-06-15 17:29:47 -07:00
Kakarot 92eab1feb3 Merge branch 'main' into patch-4 2022-06-15 17:29:18 -07:00
Kakarot 9107130831 Merge pull request #721 from nzkfc/patch-2
Forces cars to spawn clean
2022-06-15 17:28:03 -07:00
Kakarot 0473af00d1 Merge pull request #723 from LuquinhasVulgoRC/main
Create pt-br.lua
2022-06-15 17:27:50 -07:00
mmoftah97 7c57f6a817 Address PR Comments. 2022-06-15 19:08:46 -04:00
mmoftah97 acb313c34d FEAT: Allow getting offline Player object 2022-06-15 19:08:46 -04:00