Update 1.7.0 pre-changes

This commit is contained in:
Mycroft
2022-04-29 15:59:38 +01:00
parent 290505ac1d
commit e0e54f144d
51 changed files with 71 additions and 60 deletions
+2 -2
View File
@@ -77,8 +77,8 @@ function ESX.SetPlayerData(key, val)
end
end
function ESX.Progressbar(message,length, FreezePlayer,animation, onFinish)
exports["esx_progressbar"]:Progressbar(message,length, FreezePlayer,animation, onFinish)
function ESX.Progressbar(message,length, Options)
exports["esx_progressbar"]:Progressbar(message,length, Options)
end
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ES Extended'
version '1.6.5'
version '1.7.0'
shared_scripts {
'locale.lua',
+1 -1
View File
@@ -1,5 +1,5 @@
{
"version": "legacy",
"commit" : "1.6.5",
"commit" : "1.7.0",
"changelog": "\n- Add ESX Mulitcharacter"
}
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Identity'
version '1.6.5'
version '1.7.0'
shared_script '@es_extended/imports.lua'
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Menu Default'
version '1.6.5'
version '1.7.0'
client_scripts {
'@es_extended/imports.lua',
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Menu Dialog'
version '1.6.5'
version '1.7.0'
client_scripts {
'@es_extended/imports.lua',
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Menu List'
version '1.6.5'
version '1.7.0'
client_scripts {
'@es_extended/imports.lua',
+1 -1
View File
@@ -1,7 +1,7 @@
fx_version 'cerulean'
game 'gta5'
description 'Official Multicharacter System For ESX Legacy'
version '1.6.5'
version '1.7.0'
lua54 'yes'
dependencies {
+8 -8
View File
@@ -1,8 +1,8 @@
local function Progressbar(message,length, FreezePlayer,animation, onFinish)
if animation then
if animation.type == "anim" then
ESX.Streaming.RequestAnimDict(animation.dict, function()
TaskPlayAnim(ESX.PlayerData.ped, animation.dict, animation.lib, 1.0, 1.0, length, 1, 1.0, false,false,false)
local function Progressbar(message,length,Options)
if Options.animation then
if Options.animation.type == "anim" then
ESX.Streaming.RequestAnimDict(Options.animation.dict, function()
TaskPlayAnim(ESX.PlayerData.ped, Options.animation.dict, Options.animation.lib, 1.0, 1.0, length, 1, 1.0, false,false,false)
end)
end
end
@@ -14,14 +14,14 @@ local function Progressbar(message,length, FreezePlayer,animation, onFinish)
}))
Wait(length)
if FreezePlayer then FreezeEntityPosition(PlayerPedId(),not FreezePlayer) end
if onFinish then onFinish() end
if Options.onFinish then Options.onFinish() end
end
exports('Progressbar', Progressbar)
-- Example
--[[RegisterCommand("progress", function()
exports["esx_progressbar"]:Progressbar("test", 25000, false,{type = "anim",dict = "mini@prostitutes@sexlow_veh", lib ="low_car_sex_to_prop_p2_player" }, function()
exports["esx_progressbar"]:Progressbar("test", 25000, false,{animation ={type = "anim",dict = "mini@prostitutes@sexlow_veh", lib ="low_car_sex_to_prop_p2_player" }, onFinish = function()
print("finish")
end)
end})
end)]]
+13 -2
View File
@@ -1,4 +1,15 @@
## Use
* true = freeze player, turn it to false if u dont want it to freeze player
* Without Animation ESX.Progressbar("Text Here", 3000, true, {}, function()
* With Animation ESX.Progressbar("Text Here", 3000, true ,{type = "anim" ,dict = animdicthere , lib = animnamehere }, function()
* Without Animation
```lua
ESX.Progressbar("Text Here", 3000, true ,{animation = {},onFinish = function() print("Finish") end})
```
* With Animation
```lua
* ESX.Progressbar("Text Here", 3000, true ,{animation ={type = "anim" ,dict = animdicthere , lib = animnamehere },onFinish = function() print("Finish") end})
```
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Skin'
version '1.6.5'
version '1.7.0'
shared_script '@es_extended/imports.lua'
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Accessories'
version '1.6.5'
version '1.7.0'
shared_script '@es_extended/imports.lua'
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Addon Account'
version '1.6.5'
version '1.7.0'
server_scripts {
'@es_extended/imports.lua',
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Addon Inventory'
version '1.6.5'
version '1.7.0'
server_scripts {
'@es_extended/imports.lua',
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Ambulance Job'
version '1.6.5'
version '1.7.0'
shared_scripts {
'@es_extended/imports.lua',
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Animations'
version '1.6.5'
version '1.7.0'
client_scripts {
'@es_extended/imports.lua',
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Atm'
version '1.6.5'
version '1.7.0'
shared_scripts {
'@es_extended/imports.lua',
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Banker job'
version '1.6.5'
version '1.7.0'
shared_script '@es_extended/imports.lua'
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Barber Shop'
version '1.6.5'
version '1.7.0'
shared_script '@es_extended/imports.lua'
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Basic Needs'
version '1.6.5'
version '1.7.0'
shared_script '@es_extended/imports.lua'
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Billing'
version '1.6.5'
version '1.7.0'
shared_script '@es_extended/imports.lua'
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Boat'
version '1.6.5'
version '1.7.0'
shared_script '@es_extended/imports.lua'
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Clothes Shop'
version '1.6.5'
version '1.7.0'
shared_script '@es_extended/imports.lua'
@@ -4,7 +4,7 @@ game 'gta5'
description 'CruiseControl System for ESX'
version '1.6.5'
version '1.7.0'
dependencies {
'es_extended'
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Data Store'
version '1.6.5'
version '1.7.0'
server_scripts {
'@es_extended/imports.lua',
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX DMV School'
version '1.6.5'
version '1.7.0'
shared_script '@es_extended/imports.lua'
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Drugs'
version '1.6.5'
version '1.7.0'
shared_script '@es_extended/imports.lua'
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Garage'
version '1.6.5'
version '1.7.0'
shared_script '@es_extended/imports.lua'
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Holdup'
version '1.6.5'
version '1.7.0'
shared_script '@es_extended/imports.lua'
+1 -1
View File
@@ -3,7 +3,7 @@ game 'gta5'
description 'ESX Job Listing'
version '1.6.5'
version '1.7.0'
shared_scripts {
'@es_extended/imports.lua',
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Jobs'
version '1.6.5'
version '1.7.0'
shared_scripts {
'@es_extended/imports.lua',
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX License'
version '1.6.5'
version '1.7.0'
server_scripts {
'@async/async.lua',
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX LS Customs'
version '1.6.5'
version '1.7.0'
shared_script '@es_extended/imports.lua'
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Mechanic Job'
version '1.6.5'
version '1.7.0'
shared_script '@es_extended/imports.lua'
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Optional Needs'
version '1.6.5'
version '1.7.0'
shared_script '@es_extended/imports.lua'
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Phone'
version '1.6.5'
version '1.7.0'
shared_script '@es_extended/imports.lua'
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Police Job'
version '1.6.5'
version '1.7.0'
shared_script '@es_extended/imports.lua'
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Property'
version '1.6.5'
version '1.7.0'
shared_script '@es_extended/imports.lua'
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Real Estate Job'
version '1.6.5'
version '1.7.0'
shared_script '@es_extended/imports.lua'
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX RP Chat'
version '1.6.5'
version '1.7.0'
shared_script '@es_extended/imports.lua'
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Service'
version '1.6.5'
version '1.7.0'
shared_script '@es_extended/imports.lua'
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Shops'
version '1.6.5'
version '1.7.0'
shared_script '@es_extended/imports.lua'
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Sit'
version '1.6.5'
version '1.7.0'
shared_script '@es_extended/imports.lua'
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Society'
version '1.6.5'
version '1.7.0'
shared_script '@es_extended/imports.lua'
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Status'
version '1.6.5'
version '1.7.0'
lua54 'yes'
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Taxi Job'
version '1.6.5'
version '1.7.0'
shared_script '@es_extended/imports.lua'
+1 -1
View File
@@ -6,7 +6,7 @@ lua54 'yes'
description 'ESX Vehicle Shop'
version '1.6.5'
version '1.7.0'
shared_script '@es_extended/imports.lua'
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Voice Controller'
version '1.6.5'
version '1.7.0'
client_scripts {
'@es_extended/imports.lua',
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Weapon Shop'
version '1.6.5'
version '1.7.0'
shared_scripts {
'@es_extended/imports.lua',
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'ESX Whitelist'
version '1.6.5'
version '1.7.0'
server_only 'yes'
+1 -1
View File
@@ -4,7 +4,7 @@ game 'gta5'
description 'Instance'
version '1.6.5'
version '1.7.0'
shared_script '@es_extended/imports.lua'