starred/esx_core-esx-framework
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-08-31 13:01:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,297 Commits 15 Branches 42 Tags
6595fd2cc45c7e97f07e9cf9919b052d90ff86d2
Commit Graph

4297 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ark 48d1d8fbeb (fix): attempted fix for timeout on mysql query 2021-02-02 04:37:58 -06:00
LazarusOfTheFallen 4ae39e1eac Merge pull request #17 from Minikeys/patch-1 
Update fr.lua
 2021-02-01 17:16:32 -06:00
LazarusOfTheFallen b033466e14 Merge pull request #95 from Loffes/patch-2 
fix getEmployees
 2021-02-01 17:14:49 -06:00
LazarusOfTheFallen 1b362bd7c1 Merge pull request #43 from azgar44/patch-2 
Add fr-FR translation database
 2021-02-01 17:11:40 -06:00
LazarusOfTheFallen 8d48036060 Merge pull request #48 from Djamuras/master 
Close menu before starting the test
 2021-02-01 17:10:24 -06:00
LazarusOfTheFallen 8655d7a985 Merge pull request #27 from FedericoDeBona/master 
Some changes to esx_sit
 2021-02-01 17:06:00 -06:00
LazarusOfTheFallen 0487b78b81 Merge pull request #92 from btwlouis/patch-2 
Update de.lua
 2021-02-01 17:05:17 -06:00
Ark c037507af0 Revert "Merge pull request #85 from Naifen-Phoxidas/master" 
This reverts commit c4460aa6b3, reversing
changes made to 474cb85691.
 2021-02-01 17:04:59 -06:00
LazarusOfTheFallen c4460aa6b3 Merge pull request #85 from Naifen-Phoxidas/master 
Updated de.lua
 2021-02-01 17:02:50 -06:00
LazarusOfTheFallen 474cb85691 Merge pull request #82 from rex2630/patch-2 
Moved all coords to vector3 types
 2021-02-01 17:02:32 -06:00
LazarusOfTheFallen 0a6dc54564 Merge pull request #53 from surdaft/master 
fix empty shop bug
 2021-02-01 17:01:53 -06:00
LazarusOfTheFallen b6f2f129ab Merge pull request #101 from CCasusensa/master 
fixed Free Tuning Bug after being shot by a stun gun
 2021-02-01 17:00:43 -06:00
LazarusOfTheFallen bdfd933592 Update main.lua 2021-02-01 17:00:30 -06:00
LazarusOfTheFallen 18f25251cd Merge pull request #100 from gdanbo3/patch-1 
Update main.lua
 2021-02-01 16:59:10 -06:00
LazarusOfTheFallen 0f69bfce0a Merge pull request #63 from ItsManueh/master 
Add locale/es.lua fully translated
 2021-02-01 16:58:29 -06:00
LazarusOfTheFallen d716177f22 Merge pull request #58 from PainedPsyche/master 
added support for face blending and facial features
 2021-02-01 16:57:53 -06:00
LazarusOfTheFallen e7b778f0c7 Merge pull request #9 from Yarpii/patch-1 
Update
 2021-02-01 16:57:22 -06:00
LazarusOfTheFallen d0e414fc96 Merge pull request #90 from ItsManueh/master 
Add es.lua fully translated
 2021-02-01 16:51:53 -06:00
LazarusOfTheFallen 5d80d30de3 Merge pull request #132 from GabrielJulio/patch-3 
Update fxmanifest.lua
 2021-02-01 16:51:10 -06:00
LazarusOfTheFallen a11bb9ba9d Merge pull request #131 from GabrielJulio/patch-2 
Update README.md
 2021-02-01 16:50:59 -06:00
LazarusOfTheFallen 7de817f6c6 Merge pull request #130 from GabrielJulio/patch-1 
Created translation 'br'
 2021-02-01 16:50:32 -06:00
LazarusOfTheFallen 20673f5b14 Merge pull request #12 from Luis26x/patch-1 
es.lua
 2021-02-01 16:44:19 -06:00
LazarusOfTheFallen fb5c3d4c41 Merge pull request #14 from Luis26x/patch-3 
locales/es.lua
 2021-02-01 16:43:59 -06:00
LazarusOfTheFallen bf70f4f4f7 Merge pull request #13 from Luis26x/patch-2 
esx_es_esx_bankerjob.sql
 2021-02-01 16:43:41 -06:00
Ark 0ce2055a4d (fix): setup vehicles to load on resource start, with proper startup moment for no lengthy query 2021-02-01 16:34:40 -06:00
LazarusOfTheFallen dbf43bf980 Merge pull request #47 from LazarusOfTheFallen/master 
(fix): syntax error
 2021-02-01 16:30:04 -06:00
Ark 27a1eaab6a (fix): syntax error 2021-02-01 16:28:47 -06:00
LazarusOfTheFallen 2f9bcc8d4d Merge pull request #20 from izio38/izio38-patch-1 
Izio38 patch 1
 2021-02-01 15:28:06 -06:00
LazarusOfTheFallen 7219faaae2 Merge branch 'master' into izio38-patch-1 2021-02-01 15:27:54 -06:00
LazarusOfTheFallen 204cfb59d9 Merge pull request #49 from BackrndSource/patch-1 
Add Spanish Translation
 2021-02-01 15:24:01 -06:00
LazarusOfTheFallen a9d82a6c99 Merge pull request #40 from userMacieG/patch-1 
Change menu align
 2021-02-01 15:09:57 -06:00
LazarusOfTheFallen ee9c916ebf Merge pull request #25 from userMacieG/patch-1 
Update pl.lua
 2021-02-01 15:05:58 -06:00
LazarusOfTheFallen 1475b201c0 Merge pull request #128 from steveski/master 
Escaped table name.
 2021-02-01 15:05:06 -06:00
LazarusOfTheFallen 6902cc609f Merge pull request #126 from redoper1/patch-1 
Fix of typo in "NorthConkerAvenue2045" coords
 2021-02-01 15:04:29 -06:00
LazarusOfTheFallen 013a370e0c Merge pull request #124 from JoeSzymkowiczFiveM/master 
Added Marker Text display to config
 2021-02-01 15:04:02 -06:00
LazarusOfTheFallen 3f5afcaf6d Merge pull request #44 from ItsLincon/patch-1 
Updated private messages to ESX 1.2
 2021-02-01 15:03:01 -06:00
LazarusOfTheFallen 4e86b014c0 Merge pull request #41 from JimmyBassy/master 
Fix for the new ESX + extra feature
 2021-02-01 15:02:01 -06:00
LazarusOfTheFallen b98f29022a Merge pull request #93 from trkyshorty/master 
Turkish translation fixes
 2021-02-01 14:57:30 -06:00
LazarusOfTheFallen 222e1e20b0 Merge pull request #85 from Ruqen/master 
Fix of manifest
 2021-02-01 14:56:37 -06:00
LazarusOfTheFallen a74f91e7f9 Merge pull request #121 from protaknium/master 
Adding Finnish language support
 2021-02-01 14:55:17 -06:00
LazarusOfTheFallen 25103f725d Merge pull request #18 from trkyshorty/master 
Turkish translation implemented
 2021-02-01 14:53:54 -06:00
LazarusOfTheFallen dcde286747 Merge pull request #50 from trkyshorty/master 
Turkish translation implemented
 2021-02-01 14:53:28 -06:00
LazarusOfTheFallen 18df79337a Merge pull request #48 from trkyshorty/master 
Turkish translation implemented
 2021-02-01 14:53:00 -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
LazarusOfTheFallen 96e938fc9c Merge pull request #93 from trkyshorty/master 
Turkish translation implemented
 2021-02-01 14:28:55 -06:00
LazarusOfTheFallen fb6bd5ef72 Merge pull request #75 from izio38/master 
(Optional) iZone integration without breakchanges
 2021-02-01 14:26:49 -06:00
LazarusOfTheFallen 0fc32cebdd Merge branch 'master' into master 2021-02-01 14:26:41 -06:00
ArkSeyonet 22cdd4ef2d Merge pull request #523 from trkyshorty/master 
Turkish translation implemented
 2021-02-01 14:16:55 -06:00