Commit Graph

4619 Commits

Author SHA1 Message Date
ArkSeyonet eff4bc9384 Fix delete character for deferral method 2020-05-16 03:32:21 -05:00
Jérémie N'gadi c677414705 Merge pull request #36 from ArkSeyonet/master
Update esx_voice
2020-05-16 10:22:18 +02:00
Jérémie N'gadi bce4abf4b5 Merge pull request #34 from ArkSeyonet/master
Update esx_status
2020-05-16 10:22:11 +02:00
Jérémie N'gadi fc30a3b89b Merge pull request #53 from ArkSeyonet/master
Update ESX Skin
2020-05-16 10:21:57 +02:00
Jérémie N'gadi 77e14e3319 Merge pull request #93 from ArkSeyonet/master
Update ESX Identity
2020-05-16 10:21:43 +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 363aeb3416 Update ESX Identity
- Finalized Update For ESX Identity That Gives Access To The Deferrals Update + The two optional UI based updates.
2020-05-15 19:27:31 -05:00
ArkSeyonet 0319cf7ec4 Fix default locale 2020-05-15 19:13:10 -05:00
ArkSeyonet eee001a86a Update ESX Skin
Added code for the new esx code to put an end to the skin menu showing at the same time as the registration menu.

Also made skin receive input from esx_identity as to when it should open that skin menu, to stop all of this.
2020-05-15 19:12:36 -05:00
ArkSeyonet 6e072d6f83 Update esx_status
Edited to not show UI until loading screen is off
2020-05-15 17:21:49 -05: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
ArkSeyonet 5fdcc34c52 Update esx_voice
Add feature for voice UI element to not show until loading screen is off
2020-05-15 17:10:51 -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
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