starred/esx_core
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-08-29 09:18:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
742 Commits 15 Branches 42 Tags
8669d816ddfda279d5f1fe4acc6784fcd58eaa4f
Commit Graph

742 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Linden 8669d816dd Merge branch 'multichar' of https://github.com/thelindat/es_extended into multichar 2021-05-28 08:10:41 +10:00
Linden ebafc8bcb4 chore(legacy/version): Update commit version to 1.3.0 2021-05-28 08:09:56 +10:00
Linden 64510560cc Merge branch 'legacy' into multichar 2021-05-28 08:06:05 +10:00
Linden bccca2b8e0 improvement(server/main): Create a stored query for creating new users 2021-05-28 07:45:43 +10:00
Linden 0bfe39d527 refactor(server/commands): Remove sv_restart 2021-05-28 06:05:53 +10:00
Linden 2cc58b6e09 improvement(client/hud): Setup a proper function for clearing the hud, instead of sending multiple NUI messages 2021-05-28 05:54:28 +10:00
Linden 20fa7ae52f fix(client/functions): Fix DrawText3D scaling 
This was how the function previously worked, minus the rectangle and vector setting.
 2021-05-28 05:51:05 +10:00
Linden 67965129f4 fix(client/main): Move events after spawning into the spawnmanager callback; do not skip spawnmanager fade 2021-05-28 05:18:19 +10:00
Linden 7d84e80539 chore(legacy/fxmanifest): List spawnmanager as a dependency 2021-05-23 23:18:16 +10:00
Linden bc13c9d34b feat(server/functions): Add a function to retrieve all xPlayer data 
If people need to loop through xPlayers, they should use this
 2021-05-23 22:18:27 +10:00
Linden b88930674c chore(config): Set multichar to false by default 2021-05-23 00:05:11 +10:00
Linden e4954e6693 improvement(server/main): Allow setting identity without using multicharacter 2021-05-22 18:04:01 +10:00
Linden aecc6e552c fix(server/common): Fixed check for jobs without grades 2021-05-22 17:13:31 +10:00
Linden 819f5b4372 fix(legacy/server): Store job data in a temporary table until grades have been applied 2021-05-21 21:33:11 +10:00
Linden 827f2453b5 refactor(command): Remove unneeded variable 2021-05-21 07:14:12 +10:00
ESXCrackhead 686c7611f7 Merge pull request #1155 from thelindat/legacy 
fix(legacy): Resolve version conflict (#1148); tweak event handler in imports; general tweaks
 2021-05-19 14:08:37 -05:00
ESXCrackhead 10833a9f27 Merge pull request #1166 from DokaDoka/legacy 
fix(legacy/Text3D): Remove formatting characters from length calc
 2021-05-18 11:03:13 -05:00
DokaDoka 76502fb16c fix(legacy/Text3D): Remove formatting characters from length calc 2021-05-19 00:58:51 +10:00
ESXCrackhead 1a8f714a74 Merge pull request #1163 from SMVampire/patch-3 
fix(3DText): Force Scale Float
 2021-05-17 14:38:46 -05:00
Linden 4bb90c2848 fix(legacy/server): Resolve an issue when setting default skin 2021-05-18 03:39:05 +10:00
SMVampire d8bd36b2ed fix(3DText): Force Scale Float 
Some older resources used scale as a number. Scale _must_ be a float.
This forces scale to be a float if it exists.
 2021-05-17 12:46:26 -04:00
Linden 46f2b2c28b fix(legacy/multichar): Remove HUD components if player logs out 2021-05-18 01:00:30 +10:00
Linden 2555ea7345 improvement(legacy/multichar): Fade screen to black instantly 2021-05-17 20:50:44 +10:00
Linden a4f4da621f feat(legacy/multichar): Added support for esx_multicharacter; applied minor changes to spawning 2021-05-17 20:33:25 +10:00
Linden 6dbad4e6da Merge branch 'esx-framework:legacy' into legacy 2021-05-17 19:18:26 +10:00
ESXCrackhead bc95e024cd Merge pull request #1160 from DokaDoka/legacy 
fix(legacy/functions) 3Dtext rectangle scale
 2021-05-17 01:11:07 -05:00
ESXCrackhead 4e23fba428 Merge pull request #1161 from SMVampire/patch-3 
fix(config.weapons.lua): Jenkins Hashed Labels
 2021-05-17 01:10:30 -05:00
Linden e4601de9bd Merge branch 'esx-framework:legacy' into legacy 2021-05-17 15:36:07 +10:00
SMVampire d6f5a7a5e6 fix(config.weapons.lua): Jenkins Hashed Labels 
Fix mistakenly hashed weapon names for
- WEAPON_DAGGER
- WEAPON_BAT
- WEAPON_BATTLEAXE
 2021-05-17 01:10:35 -04:00
DokaDoka 06527c0692 fix(legacy/functions) 3Dtext rectangle scale 2021-05-17 15:00:53 +10:00
FuraXx df59b3ac18 Merge pull request #1159 from SMVampire/patch-2 
fix(config.weapons.lua): Missing WEAPON_SMG
 2021-05-16 20:49:31 +00:00
SMVampire 53bd75a8de fix(config.weapons.lua): Missing WEAPON_SMG 2021-05-16 16:46:06 -04:00
Linden 02a2614cff fix(legacy/client): Remove redundant callback and unused code 
This is already handled by esx_skin and results in sending two callbacks.
 2021-05-16 23:41:58 +10:00
Linden b021d28cda refactor(legacy/server): Start DBSync and PayCheck after initializing 2021-05-16 20:01:06 +10:00
Linden c4bc02ff8e improvement(legacy/client): Store ped & dead in ESX.PlayerData 2021-05-16 19:45:58 +10:00
Linden c41cd943b1 chore(legacy): Remove resource name print; fix typos 2021-05-16 19:36:17 +10:00
Linden c2a2eec71d fix(legacy/import): Only register event on the client 2021-05-16 19:32:42 +10:00
Linden 08088cc82a Merge branch 'pr/1148' into legacy 2021-05-16 19:31:19 +10:00
MiddleSkillz 0a70609741 fix(version): Forgot to Update Version 2021-05-12 11:32:31 -06:00
MiddleSkillz 7e00e1212c tweak(client/functions): Updates to Events & Functions 
Updated some events and functions to preserve some backwards compatibility with 4head scripts.
 2021-05-12 09:51:10 -06:00
FuraXx a3d9e83988 Merge pull request #1128 from thelindat/legacy 
fix+feat(legacy) Server event 'esx:playerLoaded' | Call function in import | Added function to get identifier
 2021-05-09 21:53:37 +02:00
Linden 0a64892ad2 Update version.json 2021-05-10 01:21:13 +10:00
Linden 1afe919711 Remove Config.PrimaryIdentifier 2021-05-09 15:11:02 +10:00
Linden b6b48319f0 Use the new ESX.GetIdentifier function 2021-05-09 14:49:27 +10:00
Linden b705d75404 Create a function for retrieving a players identifier 2021-05-09 14:44:44 +10:00
Linden eff2c7cbd9 Remove config for PrimaryIdentifier 2021-05-09 14:43:13 +10:00
Linden 787daaf8d3 Use PrimaryIdentifier 2021-05-09 04:54:51 +10:00
Linden 6232541cfb Use PrimaryIdentifier 2021-05-09 04:53:57 +10:00
Linden 5df4e3e76d Config.PrimaryIdentifier 2021-05-09 04:07:10 +10:00
Linden 9cca834880 Update main.lua 2021-05-09 03:41:28 +10:00