Commit Graph

4297 Commits

Author SHA1 Message Date
Jérémie N'gadi 36ce404235 Merge pull request #741 from heyheyitsmeman/master
Hotfix for ESX.ShowNotification
2020-05-15 12:42:54 +02:00
heyheyitsmeman 30fc31bbb7 Update functions.lua 2020-05-15 13:36:45 +03:00
Henric Backman 0bcc8194e5 Update readme.md 2020-05-14 23:28:15 +02:00
LeonAnderson48 1a501c27f2 Update README.md 2020-05-14 17:18:22 +01:00
LeonAnderson48 27b9b8e9ac Changed the client/main.lua
By changing the main.lua i have made it so that if a player is to combat log and then join back, this will kill them and reset the timer so that they cannot force respawn
2020-05-14 17:16:04 +01:00
LeonAnderson48 cacb1baba7 Delete main.lua 2020-05-14 17:14:09 +01:00
LeonAnderson48 ac66b60938 Delete main.lua 2020-05-14 17:13:52 +01:00
LeonAnderson48 fa22df84ac Add files via upload 2020-05-14 17:07:29 +01:00
Crapule 5fc674ec5e New neon design for menu_list + small fix in menu_default 2020-05-14 17:53:51 +02:00
Henric Backman bdcad75173 Update readme.md 2020-05-14 17:51:06 +02:00
Henric Backman a4d913c3da Update readme.md 2020-05-14 17:39:11 +02:00
Jérémie N'gadi b8731080d4 fix es_extended.sql 2020-05-14 12:43:37 +02:00
Jérémie N'gadi 05498a4496 Merge pull request #735 from Crapule421/develop
Fix border item + shadow neon head
2020-05-13 23:32:57 +02:00
Crapule cbb5027834 Fix border item + shadow neon head 2020-05-13 23:31:01 +02:00
Jérémie N'gadi 65bdeac65c fix locale not using namespace 2020-05-13 21:26:03 +02:00
Jérémie N'gadi 9038022f1d Merge pull request #734 from Crapule421/develop
Remove old app.css from menu_default
2020-05-13 21:24:10 +02:00
Crapule 7817a1c6fd Remove old app.css from menu_default
Signed-off-by: Crapule
2020-05-13 21:21:14 +02:00
Jérémie N'gadi 3833564934 Merge pull request #733 from Biromain/feature/utils
Some utils function
2020-05-13 21:09:01 +02:00
Jérémie N'gadi 488b5106da fix skin / add accesories 2020-05-13 21:05:49 +02:00
Jérémie N'gadi ff8625cb32 Now we can extend xPlayer without touching core files 2020-05-13 21:04:06 +02:00
Biromain ed3ca145a2 Some utils function 2020-05-13 20:56:58 +02:00
Jérémie N'gadi c6ba934d06 Merge pull request #732 from Dev-OMG/develop
Update index.html
2020-05-13 17:18:39 +02:00
Github aaa1c54e60 Update index.html 2020-05-13 15:59:16 +01:00
Jérémie N'gadi 9e89451503 Merge pull request #731 from Dev-OMG/develop
Added progressbar
2020-05-13 16:51:38 +02:00
Github d5cad4a911 Added progressbar 2020-05-13 15:44:38 +01:00
Jérémie N'gadi 0d80662880 Fix frame messages 2020-05-13 06:15:08 +02:00
Jérémie N'gadi 1c1836d92c Merge pull request #727 from Crapule421/develop
Update menu_default with light and dark theme neon style
2020-05-13 03:00:49 +02:00
Crapule 6d363db5a9 Update menu_default with light and dark theme neon style 2020-05-12 23:21:46 +02:00
Jérémie N'gadi c73dfe60ce Merge pull request #726 from Decodaz/develop
added german translation
2020-05-12 12:17:34 +02:00
RavenState c7250a7931 Update de.lua 2020-05-12 12:14:23 +02:00
RavenState b99d50a175 Update de.lua 2020-05-12 12:13:36 +02:00
RavenState 35ff520ae2 Update de.lua 2020-05-12 12:13:09 +02:00
RavenState b50f49c545 changed a changed value 2020-05-12 12:10:32 +02:00
RavenState 2cfa7df26a added german translation
for society and corrected job_police de translation
2020-05-12 12:08:34 +02:00
Henric Backman 11356de23e Update readme.md 2020-05-12 09:57:59 +02:00
Henric Backman f2e9c55e8a Update readme.md 2020-05-12 05:26:17 +02:00
Henric Backman 79d0501458 cleanup
added missing trigger
updated readme
2020-05-12 05:06:30 +02:00
Henric Backman d3d07596d6 Update readme.md 2020-05-12 04:36:04 +02:00
Henric Backman 9da494dca8 Update readme.md 2020-05-12 02:43:12 +02:00
Henric Backman 9360e35461 Update readme.md 2020-05-12 02:33:45 +02:00
Henric Backman 4d208ddad7 Update readme.md 2020-05-12 01:10:21 +02:00
Henric Backman cb02430397 spelling error 2020-05-12 01:08:43 +02:00
Jérémie N'gadi dea2af3c7a Merge pull request #724 from p-josue/patch-2
Add maxCarryItem function
2020-05-11 22:53:30 +02:00
Jérémie N'gadi a33e5982d3 fixing the fix 2020-05-11 22:50:25 +02:00
Jérémie N'gadi 9ad9c31b8c Add missing default job / job_grades 2020-05-11 22:48:25 +02:00
Jérémie N'gadi 515c286e01 Remove skin from base sql 2020-05-11 22:45:21 +02:00
Jérémie N'gadi f8c3dd3b2f ensure base as first migration 2020-05-11 22:43:15 +02:00
Jérémie N'gadi 3ef71f7d35 ensure migration order 2020-05-11 22:41:56 +02:00
Jérémie N'gadi 1d9f33c70a bring back missing folders 2020-05-11 21:54:33 +02:00
Jérémie N'gadi 85a8e5d8a1 fixes for society and police 2020-05-11 21:46:04 +02:00