Commit Graph

4297 Commits

Author SHA1 Message Date
ArkSeyonet c2f82ecace Merge pull request #504 from Slypher/patch-2
Null values in notifications
2021-02-01 14:13:39 -06:00
ArkSeyonet 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
ArkSeyonet 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
ArkSeyonet e5d492ac48 Merge pull request #296 from trkyshorty/master
Turkish translation implemented
2021-02-01 14:10:12 -06:00
ArkSeyonet 76aef60919 Merge pull request #282 from FunnyBuddys/master
Added german language file
2021-02-01 14:09:03 -06:00
ArkSeyonet d2a55d34e4 Update README.md 2021-02-01 14:07:57 -06:00
ArkSeyonet 4baea5dca3 Merge pull request #191 from RedAlex/master
Added ability to find an invisible dead player
2021-02-01 14:06:34 -06:00
ArkSeyonet 122c6f6aae Merge branch 'master' into master 2021-02-01 14:06:01 -06:00
ArkSeyonet 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
ArkSeyonet 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
ArkSeyonet b217442114 Merge pull request #9 from RedAlex/master
Add min player before activate option
2021-02-01 13:58:53 -06:00
ArkSeyonet 7d84c48929 Merge branch 'master' into master 2021-02-01 13:58:36 -06:00
ArkSeyonet bcb48d9c30 Merge pull request #19 from userMacieG/patch-1
Update database name
2021-01-27 11:54:25 -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
Ruqen 7a6e62cf14 Fixes resource acting stupid on restart 2021-01-23 21:20:32 +03:00
Ruqen bfeae29309 Fixes resource acting stupid on rest 2021-01-23 21:20:21 +03:00
Christopher Wong 2931d8d98f Fix patient blip not removed after revival 2021-01-17 01:17:21 +08:00
Ark 0c85c4e4b2 Update main.lua 2021-01-12 14:14:26 -06:00
ArkSeyonet 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
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
Christopher Gjelten e2d7eead18 Merge pull request #33 from tabarra/master
changed default interface from french to english
2021-01-04 17:28:21 +01:00
Andre Tabarra b624809d95 changed default interface from french to english 2021-01-04 12:59:14 -03: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
Loffes dee1238459 better sql performance
no longer selecting every column
2020-12-22 14:34:06 +01:00
Loffes 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
Türkay Tanrıkulu 760e5a14be update tr.lua 2020-12-20 07:04:55 +03:00
Türkay Tanrıkulu 6aa63aac6d Turkish translation implemented 2020-12-20 07:04:01 +03:00
Türkay Tanrıkulu 863976852b Turkish translation implemented 2020-12-20 06:52:50 +03: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 f3ff276594 Turkish translation implemented 2020-12-20 06:27:56 +03:00
Türkay Tanrıkulu 2e40280893 Turkish translation implemented 2020-12-19 23:27:29 +03:00
Türkay Tanrıkulu 4d0c045665 Turkish translation implemented 2020-12-19 23:10:17 +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 da216918d4 Merge pull request #131 from HypeLevels/patch-1
Update config.lua
2020-12-08 20:53:03 +01:00
Christopher Gjelten ac9fefe27a Merge pull request #45 from HypeLevels/patch-1
Update config.lua
2020-12-08 20:52:45 +01:00
Christopher Gjelten 1f3779c265 Merge pull request #29 from HypeLevels/patch-1
Update config.lua
2020-12-08 20:52:07 +01:00
Christopher Gjelten 79f463eced Merge pull request #53 from HypeLevels/patch-1
Update config.lua
2020-12-08 20:51:39 +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 19a9d71fd7 Merge pull request #31 from HypeLevels/patch-1
Update config.lua
2020-12-08 20:51:20 +01:00
Christopher Gjelten 6670d5dd6c Merge pull request #59 from HypeLevels/patch-1
Update config.lua
2020-12-08 20:50:51 +01:00
Christopher Gjelten 24cdf390b9 Merge pull request #40 from HypeLevels/patch-1
Update config.lua
2020-12-08 20:50:40 +01:00
Christopher Gjelten 258ee1aca5 Merge pull request #20 from HypeLevels/patch-1
Update config.lua
2020-12-08 20:50:31 +01:00
Christopher Gjelten 99ad6c640a Merge pull request #17 from HypeLevels/patch-1
Update config.lua
2020-12-08 20:50:00 +01:00