starred/esx_core-esx-framework
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-09-04 08:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
128 Commits 17 Branches 43 Tags
27781811b2b90f2e71b95e9880b21be42ae5b00f
Commit Graph
128 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Linden 27781811b2 Merge remote-tracking branch 'esx_status/master' 2021-06-25 06:03:56 +10:00
Linden bd21330485 Merge remote-tracking branch 'esx_accessories/master' 2021-06-25 06:01:32 +10:00
Linden 28d4ed59d0 Merge remote-tracking branch 'cron/master' 2021-06-25 05:54:23 +10:00
Linden 2c1eb8ceb9 Async 2021-06-25 05:54:19 +10:00
Linden 5878f71a0e Revert "Setup repository" 
This reverts commit b656ed6a43.
 2021-06-25 05:34:42 +10:00
Linden b656ed6a43 Setup repository 2021-06-25 04:00:05 +10:00
ESXCrackhead 92a9779f93 Merge pull request #59 from thelindat/patch-2 
fix(client/main): Fix nil tables after dying; resolve server hitch from update event
 2021-06-23 08:06:39 -05:00
Linden 4aa9525fcf fix(client/main): Remove update triggerserverevent when modifying statuses (it only needed to trigger with the interval) 2021-06-14 17:49:00 +10:00
Linden acb264c027 revert(client/main): Go back to table.insert for GetStatusData 
Not even sure why I did it as size+1 and not i; but doesn't seem to work with index anyway.
Fixes nil value after dying
 2021-06-07 11:14:54 +10:00
ESXCrackhead 6aed226671 Merge pull request #58 from thelindat/patch-1 
fix(client/main): Ensure the hud displays initially; get the visibility of statusbars correctly
 2021-06-06 17:14:18 -05:00
Linden 97d7e5186b fix(client/main): Ensure the hud displays initially; get the visibility of statusbars correctly 2021-06-07 08:07:10 +10:00
Taso d752235eb4 Merge pull request #57 from thelindat/master 
refactor+fix(server/main): Check if using Legacy; use ternary to define xPlayers; fixed incorrect values when defining xPlayer
 2021-06-05 18:23:41 -04:00
Linden b3c20e174b fix(server/main): Fix incorrect values (if v is table, xPlayer equals v; else GetPlayerFromId(v)) 2021-06-06 05:57:46 +10:00
Linden 16b1fc3316 refactor(server/main): Cache if ESX.GetExtendedPlayers() exists; use short-circuit evaluation to define xPlayers 2021-06-05 12:35:16 +10:00
Taso bbc848e699 Merge pull request #56 from thelindat/master 
(legacy): Resolve server hitches; add support for relogging; (general): improved clientside performance
 2021-06-04 21:41:32 -04:00
Linden 16d97ec1e3 chore(config): Define the default value for Display 2021-06-04 13:15:44 +10:00
Linden 20b2319e97 refactor(client/main): Remove unused variable; optimisations 
- Status.max was never defined anywhere (always nil) and was not referenced anywhere
- Add a toggle for status bars (Config.Display); setting to false reduces CPU usage
- onTick thread no longer retrieves StatusData twice; receives the minimal data then adds the other variables if Display is enabled
 2021-06-04 13:14:56 +10:00
Linden 98687c3b38 fix(nui/js): Use the percent value already being sent by Lua 2021-06-04 12:59:15 +10:00
Linden 5a8e750287 fix(client/main): Disable status bars after relogging 2021-06-04 11:45:22 +10:00
Linden 97289e615b fix(client/main): Prevent multiple onTick threads from running at once after relogging 2021-06-04 11:41:57 +10:00
Linden 0cc776dfc3 refactor(server/main): Removed duplicate code and use type when defining xPlayer 2021-06-03 07:12:09 +10:00
Linden ee3d1d024f improvement(server/main): Use the new xPlayer loop when restarting the resource 2021-05-28 10:29:02 +10:00
Linden d876399bab chore(server/main): Removed leftover debug code 2021-05-28 10:08:26 +10:00
Linden b823e7d557 fix(legacy/multichar): Clear player status when logging out 2021-05-28 09:58:24 +10:00
Linden ae9cde16e8 improvement(server/main): Use the new xPlayer loop when using ESX Legacy 2021-05-28 09:55:32 +10:00
FuraXx f9b73b8c31 Initial commit 2021-05-16 13:53:20 +02:00
LazarusOfTheFallen 3d526522fa Merge pull request #50 from Tinky124/patch-1 
Fix server hitch warning
 2021-02-02 16:59:02 -06:00
Tinky 74335672ea Fixed losing functionality when restarting script 2021-02-02 19:28:48 -01:00
LazarusOfTheFallen e7b778f0c7 Merge pull request #9 from Yarpii/patch-1 
Update
 2021-02-01 16:57:22 -06:00
LazarusOfTheFallen 3f09616dfc Merge pull request #44 from PainedPsyche/master 
fix for status values reset on login bug (issue #39)
 2021-02-01 14:51:54 -06:00
Tinky ea844e81da Better just to remove this... Too many hitch 2021-01-24 21:17:01 +01:00
Tinky 49f1668b0a Fix server hitch warning 2021-01-23 21:19:32 +01:00
ArkSeyonet ce3fe5465c Merge pull request #49 from steveski/master 
Update main.lua
 2021-01-11 17:07:46 -06:00
Stephen York a12046120c Update main.lua 
Added player count to avoid running script when no players are on
 2021-01-07 10:29:05 +11:00
Stephen York 925bd4559e Update main.lua 
Replace recursive call to saveData with CreateThread and a timer.
Loop now builds when and where clauses for a set operation update against multiple records with a single mysql execute rather than a single update PER player.
 2021-01-04 12:53:56 +11:00
Christopher Gjelten e812dde63b Merge pull request #36 from HypeLevels/patch-1 
Update config.lua
 2020-12-08 20:53:21 +01:00
HypeLevels 59bb6e93e3 Update config.lua 
Changed default language to english as its the universal language
 2020-12-01 21:40:00 +00:00
Jeffrey Stendert bad3c6770a Update 
keep it clean as ```async.lua``` is been shared so it should be a shared script and not server/client
 2020-11-30 14:13:21 +01:00
PainedPsyche a101f4d3dd fix for a bug where satus values were not properly loading database data client side resulting in the values resetting to default on login 2020-11-04 20:03:50 +01:00
Yulian Ivanov 12dd585b0b Update README.md 2020-07-20 15:27:50 +01:00
userMacieG 4a758806d4 Update README.md (#4) 2020-07-20 15:27:30 +01:00
userMacieG 8c9300cb11 Update async.lua (#3) 2020-07-20 15:27:01 +01:00
Yagiz ALP 89914888d7 Code cleanup (#2) 2020-07-20 15:21:46 +01:00
BrakingESX247 86877a5dd1 Merge pull request #34 from Jougito/master 
Spanish translation implemented
 2020-07-18 13:35:40 +01:00
Jougito - Kheros ef3a1990fd Spanish translation implemented 2020-07-17 18:43:08 +02:00
Jougito - Kheros ecebbc74e5 Create es_esx_accessories.sql 2020-07-17 18:36:00 +02:00
Jérémie N'gadi bce4abf4b5 Merge pull request #34 from ArkSeyonet/master 
Update esx_status
 2020-05-16 10:22:11 +02:00
ArkSeyonet 6e072d6f83 Update esx_status 
Edited to not show UI until loading screen is off
 2020-05-15 17:21:49 -05:00
ElPumpo 59c51e6daf Update esx_status.sql 2020-04-14 16:53:17 +02:00
ElPumpo 1049049579 Latest ESX code 2020-04-14 16:46:56 +02:00