Commit Graph

6437 Commits

Author SHA1 Message Date
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
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
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
Thekuca cdfe4ddf43 revert(client/main): revert to old callbacks 2023-06-04 00:32:37 +02:00
Thekuca b32ac5aed2 revert(client/callbacks): revert old code 2023-06-04 00:20:33 +02:00
Thekuca d8b4de8f05 revert(server/callback): revert old code 2023-06-04 00:17:26 +02:00
Thekuca 86a8eeaa9f Merge pull request #1022 from Kuuzoo/dev
feat(es_extended): support for drift tyres
2023-05-29 14:11:56 +02:00
Thekuca 8f773621dd Merge pull request #1043 from FekyDEV/patch-1
feat(esx_progressbar): option to externally cancel the progressbar
2023-05-29 14:09:51 +02:00
Thekuca 0e61550dc7 Merge pull request #1053 from thesysadmindev/dev
feat(es_extended): Added in randomisation of default spawn coordinates
2023-05-29 14:08:16 +02:00
TheFantomas 8cd2f75012 revert "a969785d3697a384132202a07d4b357afb668048" 2023-05-28 13:30:27 +02:00
TheFantomas 5842f30865 revert "a969785d3697a384132202a07d4b357afb668048" 2023-05-28 13:29:18 +02:00
TheFantomas 86270a3b1c Forgot 2023-05-25 15:13:21 +02:00
TheFantomas 3b06d8cf59 DefaultSpawns 2023-05-25 15:12:59 +02:00
TheFantomas b740fa187a Hmm 2023-05-25 15:12:22 +02:00
thesysadmindev dc3f8deada Merge branch 'dev' into dev 2023-05-25 21:11:14 +10:00
Thekuca a969785d36 Merge pull request #1052 from Cyzxin/dev
feat(es_extended): /removeaccountmoney
2023-05-25 13:03:08 +02:00
Thekuca e406a2b6c3 Update commands.lua 2023-05-25 13:02:06 +02:00
thesysadmindev c2772dbd56 feat(es_extended) Added in randomisation of default spawn coordinates
Replaced Config.DefaultSpawn in [core]\es_extended\config.lua:L21 with a table of default spawn coordinates, and updated [core]\es_extended\server\main.lua:L254 to use new coordinates table.
2023-05-25 20:17:39 +10:00
Cyzxin de0d33b2f6 feat(es_extended): /removeaccountmoney 2023-05-25 08:57:50 +01:00
Thekuca fff399dd48 Merge pull request #1049 from Cyzxin/main
feat(es_extended): ESX.RefreshItems and /refreshitem command
2023-05-23 11:30:52 +02:00
Thekuca 9ee4bcddf1 Update common.lua 2023-05-23 11:29:50 +02:00
Thekuca fab8f3aa74 Update functions.lua 2023-05-23 11:28:09 +02:00
Thekuca adee354a47 Merge branch 'dev' into main 2023-05-23 11:23:56 +02:00
Thekuca 5245de9e08 feat(Locales): add new translations for dlc weapons 2023-05-22 23:59:34 +02:00
Thekuca f442b53276 feat(Locales): add new locales for dlc weapons 2023-05-22 23:58:00 +02:00
Thekuca d490499735 Merge pull request #884 from itsfaizy/main
feat(weapons): LS Drug Wars DLC Weapons
2023-05-22 23:49:27 +02:00
Thekuca de416d59a9 fix(Weapons): typo 2023-05-22 23:47:50 +02:00
Thekuca a0257da083 Merge branch 'dev' into main 2023-05-22 23:43:20 +02:00
TheFantomas 05948ffdb9 Merge branch 'dev' into main 2023-05-22 19:23:47 +02:00
Cyzxin 6be5fd5478 Fixed Translation For RefreshJob Command
Added /refreshitems To Update The ESX.Items Table
2023-05-22 09:47:07 +01:00
TheFantomas b1f879fd2a Remove .editorconfig 2023-05-21 10:53:56 +02:00
Thekuca 6b54644ce4 fix(server/commands): typo 2023-05-19 15:55:35 +02:00
Thekuca fec1a9d8aa refactor(server/commands): refactor code 2023-05-19 15:53:16 +02:00
Thekuca 648147f99e refactor(overrides/oxinventory): unused args 2023-05-19 15:24:07 +02:00
Thekuca bb526ea0bc refactor(common/modules/table): small refactor 2023-05-19 15:19:00 +02:00
Thekuca ff3ee5843e fix(client/functions): shadowing upvalue 2023-05-19 15:12:45 +02:00
Thekuca 353d9df9f7 refactor(client/main): refactor code 2023-05-19 15:06:32 +02:00