Commit Graph

6472 Commits

Author SHA1 Message Date
Gellipapa b48b5fb95a Merge branch 'dev' into main 2023-06-22 23:42:41 +02:00
Gellipapa 04c287330a ✏️ fix typo 2023-06-22 23:37:41 +02:00
Gellipapa ef01331201 🩹 fix menu stuck 2023-06-22 23:30:34 +02:00
Gellipapa 3d4e07fb8e 🩹 fix get current resource name 2023-06-22 23:27:46 +02:00
Gellipapa 21476321e4 Merge pull request #1007 from Taavi-AU/main
add esx:spawnVehicle callback
2023-06-22 10:33:01 +02:00
Taavi 3382605469 Update main.lua 2023-06-22 12:28:28 +08:00
Gellipapa 858cf3f2f7 Merge pull request #1073 from GLN123/patch-2
Blocking the same character from entering the server
2023-06-21 19:09:50 +02:00
GLN dc6567d184 Update main.lua 2023-06-21 15:46:19 +02:00
TheFantomas 87a5d09ab2 Merge pull request #1074 from lxi1400/main
fix(readme.md): fix spelling and grammar
2023-06-21 15:24:15 +02:00
TheFantomas e5b9897b24 Merge branch 'dev' into main 2023-06-21 15:23:46 +02:00
Taavi 3489682ac3 incorrect spelling for source 2023-06-21 19:20:55 +08:00
Taavi c3dea9e80c fix warp = nil 2023-06-21 19:20:13 +08:00
Taavi d96cb4c52c remove vehicle = nil, useless 2023-06-21 19:16:22 +08:00
Taavi f7ec2e5b7c remove stupid vars
can be reverted if better with vars, imo its uglier with vars
2023-06-21 19:15:09 +08:00
Taavi 369971387b format 2023-06-21 19:12:24 +08:00
lxi aba27c43fe fix spelling and grammar 2023-06-21 01:31:11 -05:00
GLN 6224c10049 Update main.lua 2023-06-21 05:21:03 +02:00
Tony Stark 35873f7bd1 fix coords and better way of checking heading 2023-06-20 23:26:38 +05:30
Tony Stark 59fd0e551d timeout for loop and parameters changed to table 2023-06-20 23:18:06 +05:30
Gellipapa 042b565ca6 Merge pull request #1060 from TheKetur55/patch-1
Save Custom Wheels
2023-06-18 20:51:06 +02:00
TheFantomas d60b099523 Support for Back wheels & Some Fixes 2023-06-18 14:57:05 +02:00
Gellipapa 8693af2ed7 Merge pull request #1071 from esx-framework/revert-1070-patch-7
Revert "Update de.lua"
2023-06-17 18:43:16 +02:00
Gellipapa f8b9455a86 Revert "Update de.lua" 2023-06-17 18:42:25 +02:00
Gellipapa e2c96fd690 Merge pull request #1070 from Lenny822/patch-7
Update de.lua
2023-06-17 17:00:58 +02:00
Lenny 3c524c50c4 Merge branch 'dev' into patch-7 2023-06-17 15:21:10 +02:00
Lenny cf0d1aaa9b Update de.lua
Because mine wasnt uploaded or something, this is the newer and updated one.
2023-06-17 11:37:19 +02:00
Gellipapa db65089113 Merge pull request #1061 from FilipeCuco/main
feat(multichar): multiple spawns
2023-06-17 01:22:55 +02:00
Gellipapa 08dcffe7ae Merge pull request #1065 from TrymTube/main
ox_inventory - startmoney
2023-06-17 01:21:46 +02:00
TheFantomas 74b3ccd9d9 formatting v2 2023-06-16 19:39:13 +02:00
TheFantomas 8a544383ba formatting 2023-06-16 19:37:32 +02:00
TheFantomas 4b6eaedee2 Merge branch 'dev' into main 2023-06-16 19:35:27 +02:00
Gellipapa 41859cd762 Merge pull request #1056 from r3ps4J/fix/xplayer-shownotification
fix(es_extended/server/classes/player.lua): Fix showNotification function parameters to correspond with esx:showNotification event
2023-06-15 10:36:03 +02:00
Gellipapa b18713295e Merge pull request #1037 from CENSOR1337/main
refactor(xPlayer): delete getMeta error message
2023-06-14 22:25:08 +02:00
CENSOR_1337 fa82e7e648 refactor: subIndex will only handle string 2023-06-15 01:15:07 +07:00
CENSOR_1337 2c36f7a039 refactor: simple return value 2023-06-15 01:12:15 +07:00
CENSOR_1337 5d77ed304d typo: 2023-06-14 16:59:19 +07:00
CENSOR_1337 31a952eda5 refactor: maintenance code flow of getMeta
* recursive function call on table sub index
2023-06-14 16:51:26 +07:00
CENSOR_1337 c8a7e5500e refactor: print an error getMeta when debug enabled 2023-06-14 07:46:29 +07:00
Thekuca 48f8bd0e9c Merge pull request #960 from wasabirobby/main
feat(es_extended/server/functions.lua): ESX.CreateJob(tb)
2023-06-13 14:43:15 +02:00
Thekuca 0e87104351 Update functions.lua 2023-06-13 14:41:35 +02:00
mx developement 85da00f424 Update main.lua 2023-06-12 21:39:09 +02:00
Thekuca 48076f2fa5 Merge pull request #1058 from falszywyyy/main
refactor(server/player): Optimized player coords updating system
2023-06-10 00:50:18 +02:00
Thekuca 9221e6d91d Merge branch 'dev' into main 2023-06-10 00:48:35 +02:00
Lockwood 8144e80f8c feat(multichar): multiple spawns 2023-06-09 19:46:21 +01:00
KeyTur ab527c6df1 Save Custom Wheels 2023-06-09 11:38:35 +02:00
Thekuca b9e0e9bb2e Merge pull request #1057 from r3ps4J/feat/xplayer-showadvancednotification
feat(es_extended/server/classes/player.lua): Add showAdvancedNotification function
2023-06-08 14:00:45 +02:00
Hubert 1b918cca3f Added showAdvancedNotification for xPlayer 2023-06-08 13:47:44 +02:00
Hubert f2e0441538 Optimized saving of player position
The changes I applied to the code regarding self.getCoords(), changing the conditions when joining the server at coordinates to userData.coords and getting rid of the self.updateCoords() function. I believe that my changes when saving are more efficient, because the player's position is not overwritten unnecessarily every second if he changes his position, but the position is saved when leaving the server to the database, and then loaded when entering the server.
2023-06-07 21:53:45 +02:00
r3ps4J 4ebb5fbd72 feat(es_extended/server/classes/player.lua): Add showAdvancedNotification function 2023-06-06 08:22:33 +00:00
r3ps4J d680d5ac4f fix(es_extended/server/classes/player.lua): Fix showNotification function parameters to correspond with esx:showNotification event 2023-06-06 08:18:17 +00:00