Commit Graph

4619 Commits

Author SHA1 Message Date
FuraXx 789ecd7660 Merge pull request #21 from TunaSayin/patch-1
Create tr.lua
2021-04-10 15:22:30 +02:00
FuraXx 34324bb83a Merge pull request #339 from Mycroft-Studios/master
Fixes
2021-04-10 14:22:33 +02: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 bd78870f60 Update main.lua 2021-04-06 21:10:46 +01:00
Mycroft eb8152fc4f refactor(sql) 2021-04-06 19:58:41 +01:00
Mycroft 372774b8e4 kashacters changes 2021-04-06 19:31:26 +01:00
Mycroft fc3559073c Update main.lua 2021-04-06 01:02:44 +01:00
Mycroft ec343d99d0 Update main.lua 2021-04-05 23:00:09 +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
Mycroft 33cafef736 Fixes 2021-04-05 21:36:39 +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
Tuna 98341ef8e7 Create tr.lua
Added Turkish language support.
2021-03-24 23:08:02 +03:00
FuraXx a085b5ba13 Merge pull request #103 from LedAndris/patch-1
changed fr to en
2021-03-21 17:20:09 +01:00
FuraXx 21cea1fee9 Merge pull request #25 from Hamy-os/patch-1
Update config.lua
2021-03-21 17:19:34 +01:00
Léderer András e1394f629f changed fr to en 2021-03-20 21:00:09 +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
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