27a1eaab6a
(fix): syntax error
2021-02-01 16:28:47 -06:00
2f9bcc8d4d
Merge pull request #20 from izio38/izio38-patch-1
...
Izio38 patch 1
2021-02-01 15:28:06 -06:00
7219faaae2
Merge branch 'master' into izio38-patch-1
2021-02-01 15:27:54 -06:00
204cfb59d9
Merge pull request #49 from BackrndSource/patch-1
...
Add Spanish Translation
2021-02-01 15:24:01 -06:00
a9d82a6c99
Merge pull request #40 from userMacieG/patch-1
...
Change menu align
2021-02-01 15:09:57 -06:00
ee9c916ebf
Merge pull request #25 from userMacieG/patch-1
...
Update pl.lua
2021-02-01 15:05:58 -06:00
1475b201c0
Merge pull request #128 from steveski/master
...
Escaped table name.
2021-02-01 15:05:06 -06:00
6902cc609f
Merge pull request #126 from redoper1/patch-1
...
Fix of typo in "NorthConkerAvenue2045" coords
2021-02-01 15:04:29 -06:00
013a370e0c
Merge pull request #124 from JoeSzymkowiczFiveM/master
...
Added Marker Text display to config
2021-02-01 15:04:02 -06:00
3f5afcaf6d
Merge pull request #44 from ItsLincon/patch-1
...
Updated private messages to ESX 1.2
2021-02-01 15:03:01 -06:00
4e86b014c0
Merge pull request #41 from JimmyBassy/master
...
Fix for the new ESX + extra feature
2021-02-01 15:02:01 -06:00
b98f29022a
Merge pull request #93 from trkyshorty/master
...
Turkish translation fixes
2021-02-01 14:57:30 -06:00
222e1e20b0
Merge pull request #85 from Ruqen/master
...
Fix of manifest
2021-02-01 14:56:37 -06:00
a74f91e7f9
Merge pull request #121 from protaknium/master
...
Adding Finnish language support
2021-02-01 14:55:17 -06:00
25103f725d
Merge pull request #18 from trkyshorty/master
...
Turkish translation implemented
2021-02-01 14:53:54 -06:00
dcde286747
Merge pull request #50 from trkyshorty/master
...
Turkish translation implemented
2021-02-01 14:53:28 -06:00
18df79337a
Merge pull request #48 from trkyshorty/master
...
Turkish translation implemented
2021-02-01 14:53:00 -06:00
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
96e938fc9c
Merge pull request #93 from trkyshorty/master
...
Turkish translation implemented
2021-02-01 14:28:55 -06:00
fb6bd5ef72
Merge pull request #75 from izio38/master
...
(Optional) iZone integration without breakchanges
2021-02-01 14:26:49 -06:00
0fc32cebdd
Merge branch 'master' into master
2021-02-01 14:26:41 -06:00
22cdd4ef2d
Merge pull request #523 from trkyshorty/master
...
Turkish translation implemented
2021-02-01 14:16:55 -06:00
c2f82ecace
Merge pull request #504 from Slypher/patch-2
...
Null values in notifications
2021-02-01 14:13:39 -06:00
ba0961095c
Merge pull request #240 from Leon485/master
...
Edited the combat log system (Will revert if deemed disadvantageous)
2021-02-01 14:12:45 -06:00
2b92731678
Merge pull request #301 from pkcwong/dev/bugfix-blip
...
Fix patient blip not removed after revival
2021-02-01 14:10:43 -06:00
e5d492ac48
Merge pull request #296 from trkyshorty/master
...
Turkish translation implemented
2021-02-01 14:10:12 -06:00
76aef60919
Merge pull request #282 from FunnyBuddys/master
...
Added german language file
2021-02-01 14:09:03 -06:00
d2a55d34e4
Update README.md
2021-02-01 14:07:57 -06:00
4baea5dca3
Merge pull request #191 from RedAlex/master
...
Added ability to find an invisible dead player
2021-02-01 14:06:34 -06:00
122c6f6aae
Merge branch 'master' into master
2021-02-01 14:06:01 -06:00
7a7950cad6
Merge pull request #329 from Ruqen/master
...
Fixes resource not being able to get datas on restart
2021-02-01 14:02:06 -06:00
846b3af984
Merge pull request #323 from joaopedroo5/patch-1
...
Nill value when vehicle is missing on vehicle list
2021-02-01 14:01:51 -06:00
b217442114
Merge pull request #9 from RedAlex/master
...
Add min player before activate option
2021-02-01 13:58:53 -06:00
7d84c48929
Merge branch 'master' into master
2021-02-01 13:58:36 -06:00
bcb48d9c30
Merge pull request #19 from userMacieG/patch-1
...
Update database name
2021-01-27 11:54:25 -06:00
ea844e81da
Better just to remove this... Too many hitch
2021-01-24 21:17:01 +01:00
49f1668b0a
Fix server hitch warning
2021-01-23 21:19:32 +01:00
7a6e62cf14
Fixes resource acting stupid on restart
2021-01-23 21:20:32 +03:00
bfeae29309
Fixes resource acting stupid on rest
2021-01-23 21:20:21 +03:00
2931d8d98f
Fix patient blip not removed after revival
2021-01-17 01:17:21 +08:00
0c85c4e4b2
Update main.lua
2021-01-12 14:14:26 -06:00
d24238c4ba
Merge pull request #519 from P0Xyio/master
...
even better way to fix bug with duplicating money and weapons
2021-01-12 14:07:21 -06:00
ce3fe5465c
Merge pull request #49 from steveski/master
...
Update main.lua
2021-01-11 17:07:46 -06:00
a12046120c
Update main.lua
...
Added player count to avoid running script when no players are on
2021-01-07 10:29:05 +11:00
e2d7eead18
Merge pull request #33 from tabarra/master
...
changed default interface from french to english
2021-01-04 17:28:21 +01:00
b624809d95
changed default interface from french to english
2021-01-04 12:59:14 -03:00
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
dee1238459
better sql performance
...
no longer selecting every column
2020-12-22 14:34:06 +01:00
ebe0f66d81
fix getEmployees
...
Fixes an issue with the "getEmployees" callback where it wouldn't return people who were recently hired (since ESX doesn't update the database straight away).
2020-12-22 02:01:19 +01:00
760e5a14be
update tr.lua
2020-12-20 07:04:55 +03:00
Ark