starred/esx_core-esx-framework
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-09-04 16:23:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,443 Commits 17 Branches 43 Tags
7f6b0c861dc539ef2a6a1c200038c930d3e03d52
Commit Graph
1443 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Mycroft 4e55c52779 Update app.css 2021-04-20 19:40:42 +01:00
FuraXx 1619a26607 Merge pull request #144 from Mycroft-Studios/master 
Fixes
 2021-04-17 20:28:32 +02:00
FuraXx 1ecb8c7718 Merge pull request #1110 from Mycroft-Studios/legacy 
(update) Legacy Readme fixes
 2021-04-11 20:27:17 +02:00
Mycroft 2877cd2520 Update README.md 2021-04-11 16:02:51 +01:00
Mycroft cf5dd2b45d Update README.md 2021-04-11 16:00:23 +01:00
Mycroft 4546c3d04c Revert "kashacters changes" 
This reverts commit 372774b8e4.
 2021-04-06 22:57:06 +01:00
Mycroft c31f1c62b1 Revert "d" 
This reverts commit 1036043629.
 2021-04-06 22:57:03 +01:00
Mycroft 1036043629 d 2021-04-06 22:56:56 +01:00
Mycroft 372774b8e4 kashacters changes 2021-04-06 19:31:26 +01:00
Mycroft 1483f3363c Fixes for fixes 2021-04-05 22:26:15 +01:00
Mycroft c48b75d928 Fixes(maybe 2021-04-05 22:10:22 +01:00
ESXCrackhead 694cd67578 Merge pull request #1105 from tabarra/patch-1 
default group for ace admins
 2021-04-04 19:25:05 -05:00
tabarra e265976561 default group for ace admins 
This allows server owners to become ESX admins on their first joins, based on if they have the `command` ace permission or not.  
If they do have that ace, they can `setgroup <id> admin`, so access-wise that's ok.  
I would commit this to master, but since v2 is not yet ready, PlumeESX uses "v1-final".
 2021-04-04 16:30:04 -03:00
FuraXx 21cea1fee9 Merge pull request #25 from Hamy-os/patch-1 
Update config.lua
 2021-03-21 17:19:34 +01:00
Hamy 07b9861ee0 Update config.lua 2021-03-20 22:13:40 +03:00
ESXCrackhead 5629564563 Merge pull request #24 from goncalobsccosta/master 
Fixed other players blinking when instanced and fixed the collision problem
 2021-03-01 01:33:10 -06:00
goncalobsccosta 79e4abc832 Remove nested thread 2021-02-06 04:49:33 +00: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 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 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 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
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 dcde286747 Merge pull request #50 from trkyshorty/master 
Turkish translation implemented
 2021-02-01 14:53:28 -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
Türkay Tanrıkulu cdf74f0347 Update tr.lua 2020-12-20 06:37:00 +03:00
Türkay Tanrıkulu b12ca873e1 Turkish translation implemented 2020-12-20 06:35:59 +03:00
Türkay Tanrıkulu ac32c3fb55 Turkish translation fixes 2020-12-19 10:04:55 +03:00
goncalobsccosta 6f485d1e08 general client optimization 2020-12-12 20:32:25 +00:00
goncalobsccosta 6514da2f0c Fixed other players blinking when instanced and fixed the collision problem 
Since now the invisibility is updated every frame, the collision is only removed in the same frame. I also noticed that the ped order was wrong, because players were colliding when they were in diferent instances.
 2020-12-08 21:00:59 +00:00
Christopher Gjelten fd64bebb47 Merge pull request #90 from HypeLevels/patch-2 
Update config.lua
 2020-12-08 20:55:01 +01:00
Christopher Gjelten e812dde63b Merge pull request #36 from HypeLevels/patch-1 
Update config.lua
 2020-12-08 20:53:21 +01:00
Christopher Gjelten a804195630 Merge pull request #10 from HypeLevels/patch-1 
Update config.lua
 2020-12-08 20:51:29 +01:00
Christopher Gjelten 99ad6c640a Merge pull request #17 from HypeLevels/patch-1 
Update config.lua
 2020-12-08 20:50:00 +01:00
HypeLevels 2e1b14ac3e Update config.lua 
Changed default language to english as its the universal language
 2020-12-01 21:45:21 +00:00
HypeLevels 71ae1225e7 Update config.lua 
Changed default language to english as its the universal language
 2020-12-01 21:42:54 +00:00
HypeLevels 59bb6e93e3 Update config.lua 
Changed default language to english as its the universal language
 2020-12-01 21:40:00 +00:00
HypeLevels 9580e319b3 Update config.lua 
Changed default language to english as its the universal language
 2020-12-01 21:39:27 +00:00