Commit Graph

626 Commits

Author SHA1 Message Date
Jérémie N'gadi 24d2cc894f Merge pull request #760 from ArkSeyonet/master
Update es_extended
2020-05-17 11:35:33 +02:00
ArkSeyonet eacf7c0b94 Update es_extended
- Finish removing code for forcing stop resources
2020-05-17 04:16:00 -05:00
Jérémie N'gadi af87fc5319 Merge pull request #758 from shortybsd/patch-2
Update es_extended.sql
2020-05-16 23:54:31 +02:00
shortybsd c302098aa5 Update es_extended.sql
INT & TINYINT - Integer display width is deprecated and will be removed in a future release.
2020-05-16 16:26:28 -05:00
FuraXx 493b5c1fd0 Update README.md
- Add forum link
2020-05-16 10:34:33 +02:00
Jérémie N'gadi efdc1f580d Merge pull request #749 from ArkSeyonet/master
Finalize Update To Support Custom Loading Screens and ESX Identity Changes
2020-05-16 10:21:22 +02:00
ArkSeyonet 241b7f1346 Remove config option that wasn't used anymore 2020-05-15 17:16:31 -05:00
ArkSeyonet 7e53b8a93d Merge branch 'master' of https://github.com/ArkSeyonet/es_extended 2020-05-15 17:15:11 -05:00
ArkSeyonet ce48aa26c9 Update for es_extended
Merged Config option into normal code due to it not affecting any compatibility anywhere
2020-05-15 17:14:08 -05:00
Jérémie N'gadi 9efbb791ac Merge pull request #748 from ArkSeyonet/master
Update es_extended for newer features
2020-05-15 22:44:34 +02:00
ArkSeyonet d23dfc291d Update es_extended for newer features
1) Increase Citizen.Wait(3000) to Citizen.Wait(4000) so that the loading screen will shut down at a unified time between local and remote hosted servers
2) Include ShutdownLoadingScreenNui() for custom loading screens
3) Add additional event for Config.UseESXIdentity called esx:loadingScreenOff for future requests that will prevent UI objects from showing before the loading screen is shut down
4) Added default opacity of 0.0 to UI so that the script can determine when to show the UI based on whether loading screen is open still or not
5) Removed list of resources to force stop as FiveM is against shutting these scripts down, and most don't agree with forcing scripts to stop
2020-05-15 15:39:52 -05:00
Jérémie N'gadi 1d8a396706 Merge pull request #745 from ESX-Org/revert-737-develop
Revert "pt-PT Translation pt.lua"
2020-05-15 18:22:47 +02:00
Jérémie N'gadi 947f2184ff Revert "pt-PT Translation pt.lua" 2020-05-15 18:21:28 +02:00
Jérémie N'gadi 5a21e759a9 Merge pull request #737 from ESX-Org/develop
pt-PT Translation pt.lua
2020-05-15 18:16:58 +02:00
Jérémie N'gadi 8f863491ca Merge pull request #736 from Crapule421/develop
New neon design for menu_list + small fix in menu_default
2020-05-15 18:16:27 +02:00
Jérémie N'gadi b4fa39eba4 Merge pull request #744 from heyheyitsmeman/patch-1
Fix showNotification.
2020-05-15 18:15:52 +02:00
heyheyitsmeman eab23417a5 Update player.lua 2020-05-15 17:02:35 +03:00
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
Crapule 5fc674ec5e New neon design for menu_list + small fix in menu_default 2020-05-14 17:53:51 +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
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