From d17270a0fca79f677fc6e290891183133601ce88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Tue, 1 Aug 2017 11:37:56 +0200 Subject: [PATCH 01/66] Initial commit --- README.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 00000000..ed3a9a04 --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# fxserver-esx_skin +FXServer ESX Skin From cb58dafe51b6e6b7d302bda6942b285882f02fee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Tue, 1 Aug 2017 11:40:07 +0200 Subject: [PATCH 02/66] Add files --- README.md | 13 +++ __resource.lua | 12 +++ client/main.lua | 206 ++++++++++++++++++++++++++++++++++++++++++++++++ server/main.lua | 55 +++++++++++++ 4 files changed, 286 insertions(+) create mode 100644 __resource.lua create mode 100644 client/main.lua create mode 100644 server/main.lua diff --git a/README.md b/README.md index ed3a9a04..4fd1f966 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,15 @@ # fxserver-esx_skin FXServer ESX Skin + +[INSTALLATION] + +1) CD in your resources folder +2) Clone the repository +``` +git clone https://github.com/FXServer-ESX/fxserver-esx_skin esx_skin +``` +3) Add this in your server.cfg : + +``` +start esx_skin +``` diff --git a/__resource.lua b/__resource.lua new file mode 100644 index 00000000..ae7fbeac --- /dev/null +++ b/__resource.lua @@ -0,0 +1,12 @@ +resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' + +description 'ESX Skin' + +server_scripts { + '@mysql-async/lib/MySQL.lua', + 'server/main.lua' +} + +client_scripts { + 'client/main.lua' +} diff --git a/client/main.lua b/client/main.lua new file mode 100644 index 00000000..8f65df36 --- /dev/null +++ b/client/main.lua @@ -0,0 +1,206 @@ +ESX = nil +local HasLoadedModel = false +local LastSkin = nil + +Citizen.CreateThread(function() + while ESX == nil do + TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + Citizen.Wait(0) + end +end) + +function OpenMenu(submitCb, cancelCb, restrict) + + TriggerEvent('skinchanger:getSkin', function(skin) + LastSkin = skin + end) + + TriggerEvent('skinchanger:getData', function(components, maxVals) + + local elements = {} + local _components = {} + + -- Restrict menu + if restrict == nil then + for i=1, #components, 1 do + _components[i] = components[i] + end + else + for i=1, #components, 1 do + + local found = false + + for j=1, #restrict, 1 do + if components[i].name == restrict[j] then + found = true + end + end + + if found then + table.insert(_components, components[i]) + end + + end + end + + -- Insert elements + for i=1, #_components, 1 do + + local data = { + label = _components[i].label, + name = _components[i].name, + value = _components[i].value, + textureof = _components[i].textureof, + type = 'slider' + } + + for k,v in pairs(maxVals) do + if k == _components[i].name then + data.max = v + end + end + + table.insert(elements, data) + + end + + ESX.UI.Menu.Open( + 'default', GetCurrentResourceName(), 'skin', + { + title = 'Skin Menu', + align = 'top-left', + elements = elements + }, + submitCb, + function(data, menu) + + menu.close() + + TriggerEvent('skinchanger:loadSkin', LastSkin) + + if cancelCb ~= nil then + cancelCb(data, menu) + end + + end, + function(data, menu) + + TriggerEvent('skinchanger:getSkin', function(skin) + + if skin[data.current.name] ~= data.current.value then + + -- Change skin element + TriggerEvent('skinchanger:change', data.current.name, data.current.value) + + -- Update max values + TriggerEvent('skinchanger:getData', function(components, maxVals) + for i=1, #elements, 1 do + if elements[i].textureof ~= nil then + + local newData = {max = maxVals[elements[i].name]} + + if data.current.name == elements[i].textureof then + newData.value = 0 + end + + menu.update({name = elements[i].name}, newData) + + end + end + end) + + end + + end) + + end + ) + + end) + +end + +function OpenSaveableMenu(submitCb, cancelCb, restrict) + + TriggerEvent('skinchanger:getSkin', function(skin) + LastSkin = skin + end) + + OpenMenu(function(data, menu) + + menu.close() + + TriggerEvent('skinchanger:getSkin', function(skin) + + TriggerServerEvent('esx_skin:save', skin) + + if submitCb ~= nil then + submitCb(data, menu) + end + + end) + + end, cancelCb, restrict) + +end + +AddEventHandler('playerSpawned', function() + TriggerEvent('skinchanger:LoadDefaultModel', true) +end) + +AddEventHandler('esx_skin:getLastSkin', function(cb) + cb(LastSkin) +end) + +RegisterNetEvent('esx_skin:openMenu') +AddEventHandler('esx_skin:openMenu', function(submitCb, cancelCb) + OpenMenu(submitCb, cancelCb, nil) +end) + +RegisterNetEvent('esx_skin:openRestrictedMenu') +AddEventHandler('esx_skin:openRestrictedMenu', function(submitCb, cancelCb, restrict) + OpenMenu(submitCb, cancelCb, restrict) +end) + +RegisterNetEvent('esx_skin:openSaveableMenu') +AddEventHandler('esx_skin:openSaveableMenu', function(submitCb, cancelCb) + OpenSaveableMenu(submitCb, cancelCb, nil) +end) + +RegisterNetEvent('esx_skin:openSaveableRestrictedMenu') +AddEventHandler('esx_skin:openSaveableRestrictedMenu', function(submitCb, cancelCb, restrict) + OpenSaveableMenu(submitCb, cancelCb, restrict) +end) + +AddEventHandler('skinchanger:modelLoaded', function() + + if not HasLoadedModel then + + ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin, jobSkin) + + HasLoadedModel = true + + if skin == nil then + OpenSaveableMenu(nil, nil, nil) + else + TriggerEvent('skinchanger:loadSkin', skin) + end + + end) + + end +end) + +Citizen.CreateThread(function() + while true do + + Citizen.Wait(0) + + local playerPed = GetPlayerPed(-1) + + if IsEntityDead(playerPed) then + HasLoadedModel = false + end + + end +end) \ No newline at end of file diff --git a/server/main.lua b/server/main.lua new file mode 100644 index 00000000..708f9fbb --- /dev/null +++ b/server/main.lua @@ -0,0 +1,55 @@ +ESX = nil + +TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + +RegisterServerEvent('esx_skin:save') +AddEventHandler('esx_skin:save', function(skin) + + local xPlayer = ESX.GetPlayerFromId(source) + + MySQL.Async.execute( + 'UPDATE users SET `skin` = @skin WHERE identifier = @identifier', + { + ['@skin'] = json.encode(skin), + ['@identifier'] = xPlayer.identifier + } + ) + +end) + +ESX.RegisterServerCallback('esx_skin:getPlayerSkin', function(source, cb) + + local xPlayer = ESX.GetPlayerFromId(source) + + MySQL.Async.fetchAll( + 'SELECT * FROM users WHERE identifier = @identifier', + { + ['@identifier'] = xPlayer.identifier + }, + function(users) + + local user = users[1] + local skin = nil + + local jobSkin = { + skin_male = xPlayer.job.skin_male, + skin_female = xPlayer.job.skin_female + } + + if user.skin ~= nil then + skin = json.decode(user.skin) + end + + cb(skin, jobSkin) + + end + ) + +end) + +-- Commands +TriggerEvent('es:addGroupCommand', 'skin', "admin", function(source, args, user) + TriggerClientEvent('esx_skin:openSaveableMenu', source) +end, function(source, args, user) + TriggerClientEvent('chatMessage', source, "SYSTEM", {255, 0, 0}, 'Insufficienct permissions!') +end) \ No newline at end of file From 08b64603b581abac8c1a4bbedd29ad7c62c57115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Tue, 1 Aug 2017 14:08:07 +0200 Subject: [PATCH 03/66] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4fd1f966..9603612e 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ FXServer ESX Skin [INSTALLATION] -1) CD in your resources folder +1) CD in your resources/[esx] folder 2) Clone the repository ``` git clone https://github.com/FXServer-ESX/fxserver-esx_skin esx_skin From 4d54c8f83e7b01b75e3d74f088a9bd504b07eb69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Sat, 5 Aug 2017 17:52:41 +0200 Subject: [PATCH 04/66] change LoadDefaultModel to loadDefaultModel --- client/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/main.lua b/client/main.lua index 8f65df36..30d4452e 100644 --- a/client/main.lua +++ b/client/main.lua @@ -145,7 +145,7 @@ function OpenSaveableMenu(submitCb, cancelCb, restrict) end AddEventHandler('playerSpawned', function() - TriggerEvent('skinchanger:LoadDefaultModel', true) + TriggerEvent('skinchanger:loadDefaultModel', true) end) AddEventHandler('esx_skin:getLastSkin', function(cb) From 4c3b885c63a7d391bb1c644cb573ad3fccc89f31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Sat, 5 Aug 2017 19:02:47 +0200 Subject: [PATCH 05/66] Add playerloaded event and min value + get comonent value --- client/main.lua | 43 +++++++++++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/client/main.lua b/client/main.lua index 30d4452e..5016c327 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,6 +1,7 @@ ESX = nil local HasLoadedModel = false local LastSkin = nil +local PlayerLoaded = false Citizen.CreateThread(function() while ESX == nil do @@ -11,6 +12,8 @@ end) function OpenMenu(submitCb, cancelCb, restrict) + local playerPed = GetPlayerPed(-1) + TriggerEvent('skinchanger:getSkin', function(skin) LastSkin = skin end) @@ -45,11 +48,18 @@ function OpenMenu(submitCb, cancelCb, restrict) -- Insert elements for i=1, #_components, 1 do - + + local value = _components[i].value + + if _components[i].componentId ~= nil then + value = GetPedPropIndex(playerPed, _components[i].componentId) + end + local data = { label = _components[i].label, - name = _components[i].name, - value = _components[i].value, + name = _components[i].name, + value = value, + min = _components[i].min, textureof = _components[i].textureof, type = 'slider' } @@ -148,6 +158,11 @@ AddEventHandler('playerSpawned', function() TriggerEvent('skinchanger:loadDefaultModel', true) end) +RegisterNetEvent('esx:playerLoaded') +AddEventHandler('esx:playerLoaded', function(xPlayer) + PlayerLoaded = true +end) + AddEventHandler('esx_skin:getLastSkin', function(cb) cb(LastSkin) end) @@ -176,16 +191,24 @@ AddEventHandler('skinchanger:modelLoaded', function() if not HasLoadedModel then - ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin, jobSkin) + Citizen.CreateThread(function() - HasLoadedModel = true - - if skin == nil then - OpenSaveableMenu(nil, nil, nil) - else - TriggerEvent('skinchanger:loadSkin', skin) + while not PlayerLoaded do + Citizen.Wait(0) end + ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin, jobSkin) + + HasLoadedModel = true + + if skin == nil then + OpenSaveableMenu(nil, nil, nil) + else + TriggerEvent('skinchanger:loadSkin', skin) + end + + end) + end) end From 4b9cdd83b8acad0127b5599c7c75f47975667eb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Sat, 5 Aug 2017 19:03:51 +0200 Subject: [PATCH 06/66] Component id check --- client/main.lua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/client/main.lua b/client/main.lua index 5016c327..2f232bc3 100644 --- a/client/main.lua +++ b/client/main.lua @@ -49,9 +49,10 @@ function OpenMenu(submitCb, cancelCb, restrict) -- Insert elements for i=1, #_components, 1 do - local value = _components[i].value - - if _components[i].componentId ~= nil then + local value = _components[i].value + local componentId = _components[i].componentId + + if componentId == 0 then value = GetPedPropIndex(playerPed, _components[i].componentId) end From 5e4fdf51fade9f693cdf630a901c5536b8dca8b1 Mon Sep 17 00:00:00 2001 From: renaiku Date: Sun, 6 Aug 2017 12:34:43 +0200 Subject: [PATCH 07/66] Add camera movements, eyebrows, ageing, makeup, bags, lipstick --- client/main.lua | 109 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/client/main.lua b/client/main.lua index 2f232bc3..be153b0a 100644 --- a/client/main.lua +++ b/client/main.lua @@ -2,6 +2,11 @@ ESX = nil local HasLoadedModel = false local LastSkin = nil local PlayerLoaded = false +local cam = nil +local isCameraActive = false +local zoomOffset = 0.0 +local camOffset = 0.0 +local heading = 90.0 Citizen.CreateThread(function() while ESX == nil do @@ -62,6 +67,8 @@ function OpenMenu(submitCb, cancelCb, restrict) value = value, min = _components[i].min, textureof = _components[i].textureof, + zoomOffset= _components[i].zoomOffset, + camOffset = _components[i].camOffset, type = 'slider' } @@ -75,6 +82,10 @@ function OpenMenu(submitCb, cancelCb, restrict) end + CreateSkinCam() + zoomOffset = _components[1].zoomOffset + camOffset = _components[1].camOffset + ESX.UI.Menu.Open( 'default', GetCurrentResourceName(), 'skin', { @@ -87,6 +98,8 @@ function OpenMenu(submitCb, cancelCb, restrict) menu.close() + DeleteSkinCam() + TriggerEvent('skinchanger:loadSkin', LastSkin) if cancelCb ~= nil then @@ -97,6 +110,9 @@ function OpenMenu(submitCb, cancelCb, restrict) function(data, menu) TriggerEvent('skinchanger:getSkin', function(skin) + + zoomOffset = data.current.zoomOffset + camOffset = data.current.camOffset if skin[data.current.name] ~= data.current.value then @@ -131,6 +147,97 @@ function OpenMenu(submitCb, cancelCb, restrict) end +function CreateSkinCam() + if not DoesCamExist(cam) then + cam = CreateCam('DEFAULT_SCRIPTED_CAMERA', true) + end + SetCamActive(cam, true) + RenderScriptCams(true, true, 500, true, true) + isCameraActive = true + SetCamRot(cam, 0.0, 0.0, 270.0, true) + SetEntityHeading(playerPed, 90.0) +end + +function DeleteSkinCam() + isCameraActive = false + SetCamActive(cam, false) + RenderScriptCams(false, true, 500, true, true) + cam = nil +end + +Citizen.CreateThread(function() + while true do + Citizen.Wait(0) + if isCameraActive then + DisableControlAction(2, 30, true) + DisableControlAction(2, 31, true) + DisableControlAction(2, 32, true) + DisableControlAction(2, 33, true) + DisableControlAction(2, 34, true) + DisableControlAction(2, 35, true) + + DisableControlAction(0, 25, true) -- Input Aim + DisableControlAction(0, 24, true) -- Input Attack + + local playerPed = GetPlayerPed(-1) + local coords = GetEntityCoords(playerPed) + + local angle = heading * math.pi / 180.0 + local theta = { + x = math.cos(angle), + y = math.sin(angle) + } + local pos = { + x = coords.x + (zoomOffset * theta.x), + y = coords.y + (zoomOffset * theta.y), + } + + local angleToLook = heading - 140.0 + if angleToLook > 360 then + angleToLook = angleToLook - 360 + elseif angleToLook < 0 then + angleToLook = angleToLook + 360 + end + angleToLook = angleToLook * math.pi / 180.0 + local thetaToLook = { + x = math.cos(angleToLook), + y = math.sin(angleToLook) + } + local posToLook = { + x = coords.x + (zoomOffset * thetaToLook.x), + y = coords.y + (zoomOffset * thetaToLook.y), + } + + SetCamCoord(cam, pos.x, pos.y, coords.z + camOffset) + PointCamAtCoord(cam, posToLook.x, posToLook.y, coords.z + camOffset) + + SetTextComponentFormat("STRING") + AddTextComponentString("Utilisez ~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ et ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ pour tourner la vue.") + DisplayHelpTextFromStringLabel(0, 0, 0, -1) + end + end +end) + +Citizen.CreateThread(function() + local angle = 90 + while true do + Citizen.Wait(0) + if isCameraActive then + if IsControlPressed(0, 108) then + angle = angle - 1 + elseif IsControlPressed(0, 109) then + angle = angle + 1 + end + if angle > 360 then + angle = angle - 360 + elseif angle < 0 then + angle = angle + 360 + end + heading = angle + 0.0 + end + end +end) + function OpenSaveableMenu(submitCb, cancelCb, restrict) TriggerEvent('skinchanger:getSkin', function(skin) @@ -141,6 +248,8 @@ function OpenSaveableMenu(submitCb, cancelCb, restrict) menu.close() + DeleteSkinCam() + TriggerEvent('skinchanger:getSkin', function(skin) TriggerServerEvent('esx_skin:save', skin) From 16209570a2c1763f04a88791581ae04164228e8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Mon, 7 Aug 2017 12:08:57 +0200 Subject: [PATCH 08/66] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 9603612e..7b3b678d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,10 @@ # fxserver-esx_skin FXServer ESX Skin +[REQUIREMENTS] + +- skinchanger => https://github.com/FXServer-ESX/fxserver-skinchanger + [INSTALLATION] 1) CD in your resources/[esx] folder From 33bad99d799881fecdebf6f8f02f20344173193b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Wed, 9 Aug 2017 14:15:16 +0200 Subject: [PATCH 09/66] Add LICENSE.txt --- LICENSE.txt | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 00000000..30ace6a8 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + {one line to give the program's name and a brief idea of what it does.} + Copyright (C) {year} {name of author} + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + {project} Copyright (C) {year} {fullname} + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. \ No newline at end of file From 430821d39c89189183e5dc8efa3ef73865b0094f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Fri, 11 Aug 2017 17:22:06 +0200 Subject: [PATCH 10/66] Fix refresh lag - works with newest esx version --- client/main.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/client/main.lua b/client/main.lua index be153b0a..718135a9 100644 --- a/client/main.lua +++ b/client/main.lua @@ -121,6 +121,7 @@ function OpenMenu(submitCb, cancelCb, restrict) -- Update max values TriggerEvent('skinchanger:getData', function(components, maxVals) + for i=1, #elements, 1 do if elements[i].textureof ~= nil then @@ -134,6 +135,9 @@ function OpenMenu(submitCb, cancelCb, restrict) end end + + menu.refresh() + end) end From 3569191dc02bb14b8808f3fa0aa498f0b9631da1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Tue, 15 Aug 2017 09:34:13 +0200 Subject: [PATCH 11/66] Fix camera not closing --- client/main.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/client/main.lua b/client/main.lua index 718135a9..94e89424 100644 --- a/client/main.lua +++ b/client/main.lua @@ -93,7 +93,10 @@ function OpenMenu(submitCb, cancelCb, restrict) align = 'top-left', elements = elements }, - submitCb, + function(data, menu) + submitCb(data, menu) + DeleteSkinCam() + end, function(data, menu) menu.close() From 6b1014063c5a422b274e61826764ace8fd6a7103 Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Tue, 15 Aug 2017 23:00:02 -0400 Subject: [PATCH 12/66] Multi-language support --- __resource.lua | 6 ++++++ client/main.lua | 28 ++++++++++++++-------------- config.lua | 2 ++ locales/en.lua | 7 +++++++ locales/fr.lua | 7 +++++++ server/main.lua | 6 +++--- 6 files changed, 39 insertions(+), 17 deletions(-) create mode 100644 config.lua create mode 100644 locales/en.lua create mode 100644 locales/fr.lua diff --git a/__resource.lua b/__resource.lua index ae7fbeac..68e653d5 100644 --- a/__resource.lua +++ b/__resource.lua @@ -3,10 +3,16 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ESX Skin' server_scripts { + '@es_extended/locale.lua', + 'locales/en.lua', + 'locales/fr.lua', '@mysql-async/lib/MySQL.lua', 'server/main.lua' } client_scripts { + '@es_extended/locale.lua', + 'locales/en.lua', + 'locales/fr.lua', 'client/main.lua' } diff --git a/client/main.lua b/client/main.lua index 94e89424..70fd3420 100644 --- a/client/main.lua +++ b/client/main.lua @@ -53,10 +53,10 @@ function OpenMenu(submitCb, cancelCb, restrict) -- Insert elements for i=1, #_components, 1 do - + local value = _components[i].value local componentId = _components[i].componentId - + if componentId == 0 then value = GetPedPropIndex(playerPed, _components[i].componentId) end @@ -89,7 +89,7 @@ function OpenMenu(submitCb, cancelCb, restrict) ESX.UI.Menu.Open( 'default', GetCurrentResourceName(), 'skin', { - title = 'Skin Menu', + title = _U('skin_menu'), align = 'top-left', elements = elements }, @@ -98,7 +98,7 @@ function OpenMenu(submitCb, cancelCb, restrict) DeleteSkinCam() end, function(data, menu) - + menu.close() DeleteSkinCam() @@ -116,7 +116,7 @@ function OpenMenu(submitCb, cancelCb, restrict) zoomOffset = data.current.zoomOffset camOffset = data.current.camOffset - + if skin[data.current.name] ~= data.current.value then -- Change skin element @@ -124,10 +124,10 @@ function OpenMenu(submitCb, cancelCb, restrict) -- Update max values TriggerEvent('skinchanger:getData', function(components, maxVals) - + for i=1, #elements, 1 do if elements[i].textureof ~= nil then - + local newData = {max = maxVals[elements[i].name]} if data.current.name == elements[i].textureof then @@ -135,7 +135,7 @@ function OpenMenu(submitCb, cancelCb, restrict) end menu.update({name = elements[i].name}, newData) - + end end @@ -219,7 +219,7 @@ Citizen.CreateThread(function() PointCamAtCoord(cam, posToLook.x, posToLook.y, coords.z + camOffset) SetTextComponentFormat("STRING") - AddTextComponentString("Utilisez ~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ et ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ pour tourner la vue.") + AddTextComponentString(_U('use_rotate_view')) DisplayHelpTextFromStringLabel(0, 0, 0, -1) end end @@ -305,9 +305,9 @@ AddEventHandler('esx_skin:openSaveableRestrictedMenu', function(submitCb, cancel end) AddEventHandler('skinchanger:modelLoaded', function() - + if not HasLoadedModel then - + Citizen.CreateThread(function() while not PlayerLoaded do @@ -333,9 +333,9 @@ end) Citizen.CreateThread(function() while true do - + Citizen.Wait(0) - + local playerPed = GetPlayerPed(-1) if IsEntityDead(playerPed) then @@ -343,4 +343,4 @@ Citizen.CreateThread(function() end end -end) \ No newline at end of file +end) diff --git a/config.lua b/config.lua new file mode 100644 index 00000000..56a8b5e9 --- /dev/null +++ b/config.lua @@ -0,0 +1,2 @@ +Config = {} +Config.Locale = 'fr' diff --git a/locales/en.lua b/locales/en.lua new file mode 100644 index 00000000..5ea05c28 --- /dev/null +++ b/locales/en.lua @@ -0,0 +1,7 @@ +Locales['en'] = { + + ['skin_menu'] = 'Skin Menu', + ['use_rotate_view'] = 'use ~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ and ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ to rotate the view.', + + +} diff --git a/locales/fr.lua b/locales/fr.lua new file mode 100644 index 00000000..450e67b0 --- /dev/null +++ b/locales/fr.lua @@ -0,0 +1,7 @@ +Locales['fr'] = { + + ['skin_menu'] = 'Skin Menu', + ['use_rotate_view'] = 'utilisez ~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ et ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ pour tourner la vue.', + + +} diff --git a/server/main.lua b/server/main.lua index 708f9fbb..2e6c464d 100644 --- a/server/main.lua +++ b/server/main.lua @@ -30,7 +30,7 @@ ESX.RegisterServerCallback('esx_skin:getPlayerSkin', function(source, cb) local user = users[1] local skin = nil - + local jobSkin = { skin_male = xPlayer.job.skin_male, skin_female = xPlayer.job.skin_female @@ -51,5 +51,5 @@ end) TriggerEvent('es:addGroupCommand', 'skin', "admin", function(source, args, user) TriggerClientEvent('esx_skin:openSaveableMenu', source) end, function(source, args, user) - TriggerClientEvent('chatMessage', source, "SYSTEM", {255, 0, 0}, 'Insufficienct permissions!') -end) \ No newline at end of file + TriggerClientEvent('chatMessage', source, "SYSTEM", {255, 0, 0}, 'Insufficient permissions!') +end) From 7e7136498d141e6b1e162067cee25531ea92389b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Wed, 16 Aug 2017 11:15:22 +0200 Subject: [PATCH 13/66] Fix config + add saveskin command --- __resource.lua | 4 +++- client/main.lua | 7 +++++++ locales/en.lua | 3 ++- locales/fr.lua | 3 ++- server/main.lua | 21 +++++++++++++++++++-- 5 files changed, 33 insertions(+), 5 deletions(-) diff --git a/__resource.lua b/__resource.lua index 68e653d5..3dd25881 100644 --- a/__resource.lua +++ b/__resource.lua @@ -3,10 +3,11 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ESX Skin' server_scripts { + '@mysql-async/lib/MySQL.lua', '@es_extended/locale.lua', 'locales/en.lua', 'locales/fr.lua', - '@mysql-async/lib/MySQL.lua', + 'config.lua', 'server/main.lua' } @@ -14,5 +15,6 @@ client_scripts { '@es_extended/locale.lua', 'locales/en.lua', 'locales/fr.lua', + 'config.lua', 'client/main.lua' } diff --git a/client/main.lua b/client/main.lua index 70fd3420..f3860f18 100644 --- a/client/main.lua +++ b/client/main.lua @@ -304,6 +304,13 @@ AddEventHandler('esx_skin:openSaveableRestrictedMenu', function(submitCb, cancel OpenSaveableMenu(submitCb, cancelCb, restrict) end) +RegisterNetEvent('esx_skin:requestSaveSkin') +AddEventHandler('esx_skin:requestSaveSkin', function() + TriggerEvent('skinchanger:getSkin', function(skin) + TriggerServerEvent('esx_skin:responseSaveSkin', skin) + end) +end) + AddEventHandler('skinchanger:modelLoaded', function() if not HasLoadedModel then diff --git a/locales/en.lua b/locales/en.lua index 5ea05c28..7609234d 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -2,6 +2,7 @@ Locales['en'] = { ['skin_menu'] = 'Skin Menu', ['use_rotate_view'] = 'use ~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ and ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ to rotate the view.', - + ['skin'] = 'change skin', + ['saveskin'] = 'save skin to a file', } diff --git a/locales/fr.lua b/locales/fr.lua index 450e67b0..e20a772e 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -2,6 +2,7 @@ Locales['fr'] = { ['skin_menu'] = 'Skin Menu', ['use_rotate_view'] = 'utilisez ~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ et ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ pour tourner la vue.', - + ['skin'] = 'changer de skin', + ['saveskin'] = 'sauvegarder skin dans un fichier', } diff --git a/server/main.lua b/server/main.lua index 2e6c464d..1c259e71 100644 --- a/server/main.lua +++ b/server/main.lua @@ -17,6 +17,17 @@ AddEventHandler('esx_skin:save', function(skin) end) +RegisterServerEvent('esx_skin:responseSaveSkin') +AddEventHandler('esx_skin:responseSaveSkin', function(skin) + + local file = io.open('resources/[esx]/esx_skin/skins.txt', "a") + + file:write(json.encode(skin) .. "\n\n") + file:flush() + file:close() + +end) + ESX.RegisterServerCallback('esx_skin:getPlayerSkin', function(source, cb) local xPlayer = ESX.GetPlayerFromId(source) @@ -48,8 +59,14 @@ ESX.RegisterServerCallback('esx_skin:getPlayerSkin', function(source, cb) end) -- Commands -TriggerEvent('es:addGroupCommand', 'skin', "admin", function(source, args, user) +TriggerEvent('es:addGroupCommand', 'skin', 'admin', function(source, args, user) TriggerClientEvent('esx_skin:openSaveableMenu', source) end, function(source, args, user) TriggerClientEvent('chatMessage', source, "SYSTEM", {255, 0, 0}, 'Insufficient permissions!') -end) +end, {help = _U('skin')}) + +TriggerEvent('es:addGroupCommand', 'saveskin', 'admin', function(source, args, user) + TriggerClientEvent('esx_skin:requestSaveSkin', source) +end, function(source, args, user) + TriggerClientEvent('chatMessage', source, "SYSTEM", {255, 0, 0}, "Insufficient Permissions.") +end, {help = _U('saveskin')}) \ No newline at end of file From fa4909f580d01faf500d4b125913f6ffb5ca0926 Mon Sep 17 00:00:00 2001 From: TakumiBR <31086346+TakumiBR@users.noreply.github.com> Date: Thu, 17 Aug 2017 08:21:18 -0700 Subject: [PATCH 14/66] Add files via upload --- locales/br.lua | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 locales/br.lua diff --git a/locales/br.lua b/locales/br.lua new file mode 100644 index 00000000..6baa2746 --- /dev/null +++ b/locales/br.lua @@ -0,0 +1,7 @@ +Locales['br'] = { + + ['skin_menu'] = 'Skin Menu', + ['use_rotate_view'] = 'Use ~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ e ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ para girar a visão.', + + +} From 89832c68a815688b65535e2a0668416251356744 Mon Sep 17 00:00:00 2001 From: TakumiBR <31086346+TakumiBR@users.noreply.github.com> Date: Thu, 17 Aug 2017 08:22:15 -0700 Subject: [PATCH 15/66] Add files via upload --- __resource.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/__resource.lua b/__resource.lua index 3dd25881..91ad7337 100644 --- a/__resource.lua +++ b/__resource.lua @@ -3,18 +3,18 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ESX Skin' server_scripts { - '@mysql-async/lib/MySQL.lua', '@es_extended/locale.lua', + 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', - 'config.lua', + '@mysql-async/lib/MySQL.lua', 'server/main.lua' } client_scripts { '@es_extended/locale.lua', + 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', - 'config.lua', 'client/main.lua' } From 4466e0ec204bb9446ea72ad7c9ccc0e4d30f62b4 Mon Sep 17 00:00:00 2001 From: Don <30905704+ddh3@users.noreply.github.com> Date: Thu, 17 Aug 2017 09:33:20 -0700 Subject: [PATCH 16/66] Update __resource.lua Missing config.lua in resource.lua file --- __resource.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/__resource.lua b/__resource.lua index 91ad7337..eff9b223 100644 --- a/__resource.lua +++ b/__resource.lua @@ -4,6 +4,7 @@ description 'ESX Skin' server_scripts { '@es_extended/locale.lua', + 'config.lua', 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', @@ -13,6 +14,7 @@ server_scripts { client_scripts { '@es_extended/locale.lua', + 'config.lua', 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', From b28e5324dcd131fac744733dbf5c2cc49ba69f3a Mon Sep 17 00:00:00 2001 From: Allan <31086346+TakumiBR@users.noreply.github.com> Date: Thu, 17 Aug 2017 12:07:45 -0700 Subject: [PATCH 17/66] Multi-language support Brazilian Portuguese translation. --- locales/br.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/locales/br.lua b/locales/br.lua index 6baa2746..554f392c 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -1,7 +1,8 @@ Locales['br'] = { ['skin_menu'] = 'Skin Menu', - ['use_rotate_view'] = 'Use ~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ e ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ para girar a visão.', - + ['use_rotate_view'] = 'Use as setas ~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ para girar a visão.', + ['skin'] = 'Trocar', + ['saveskin'] = 'Salvar', } From 668758fe422d9998c4c83030619ef4ff1eb20f8a Mon Sep 17 00:00:00 2001 From: Allan <31086346+TakumiBR@users.noreply.github.com> Date: Thu, 17 Aug 2017 12:09:33 -0700 Subject: [PATCH 18/66] Multi-language support Brazilian Portuguese translation. --- locales/br.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/br.lua b/locales/br.lua index 554f392c..f35e7998 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -1,7 +1,7 @@ Locales['br'] = { ['skin_menu'] = 'Skin Menu', - ['use_rotate_view'] = 'Use as setas ~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ para girar a visão.', + ['use_rotate_view'] = 'Use ~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ e ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ para girar a visão.', ['skin'] = 'Trocar', ['saveskin'] = 'Salvar', From 3f1438a12e533aaf37d83dcfd2de458f8ba1fc44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Sat, 19 Aug 2017 09:38:40 +0200 Subject: [PATCH 19/66] Fix outfit gone where dead --- client/main.lua | 63 +++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 33 deletions(-) diff --git a/client/main.lua b/client/main.lua index f3860f18..f6e1e557 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,12 +1,12 @@ ESX = nil -local HasLoadedModel = false +local FirstSpawn = true local LastSkin = nil local PlayerLoaded = false -local cam = nil +local cam = nil local isCameraActive = false -local zoomOffset = 0.0 -local camOffset = 0.0 -local heading = 90.0 +local zoomOffset = 0.0 +local camOffset = 0.0 +local heading = 90.0 Citizen.CreateThread(function() while ESX == nil do @@ -272,7 +272,31 @@ function OpenSaveableMenu(submitCb, cancelCb, restrict) end AddEventHandler('playerSpawned', function() - TriggerEvent('skinchanger:loadDefaultModel', true) + + Citizen.CreateThread(function() + + while not PlayerLoaded do + Citizen.Wait(0) + end + + if FirstSpawn then + + ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin, jobSkin) + + if skin == nil then + OpenSaveableMenu(nil, nil, nil) + else + TriggerEvent('skinchanger:loadSkin', skin) + end + + end) + + FirstSpawn = false + + end + + end) + end) RegisterNetEvent('esx:playerLoaded') @@ -311,33 +335,6 @@ AddEventHandler('esx_skin:requestSaveSkin', function() end) end) -AddEventHandler('skinchanger:modelLoaded', function() - - if not HasLoadedModel then - - Citizen.CreateThread(function() - - while not PlayerLoaded do - Citizen.Wait(0) - end - - ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin, jobSkin) - - HasLoadedModel = true - - if skin == nil then - OpenSaveableMenu(nil, nil, nil) - else - TriggerEvent('skinchanger:loadSkin', skin) - end - - end) - - end) - - end -end) - Citizen.CreateThread(function() while true do From d301d8d2b4617173a1a4dae067f478d9c870e95b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Sat, 19 Aug 2017 09:38:40 +0200 Subject: [PATCH 20/66] Fix outfit gone when dead --- client/main.lua | 63 +++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 33 deletions(-) diff --git a/client/main.lua b/client/main.lua index f3860f18..f6e1e557 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,12 +1,12 @@ ESX = nil -local HasLoadedModel = false +local FirstSpawn = true local LastSkin = nil local PlayerLoaded = false -local cam = nil +local cam = nil local isCameraActive = false -local zoomOffset = 0.0 -local camOffset = 0.0 -local heading = 90.0 +local zoomOffset = 0.0 +local camOffset = 0.0 +local heading = 90.0 Citizen.CreateThread(function() while ESX == nil do @@ -272,7 +272,31 @@ function OpenSaveableMenu(submitCb, cancelCb, restrict) end AddEventHandler('playerSpawned', function() - TriggerEvent('skinchanger:loadDefaultModel', true) + + Citizen.CreateThread(function() + + while not PlayerLoaded do + Citizen.Wait(0) + end + + if FirstSpawn then + + ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin, jobSkin) + + if skin == nil then + OpenSaveableMenu(nil, nil, nil) + else + TriggerEvent('skinchanger:loadSkin', skin) + end + + end) + + FirstSpawn = false + + end + + end) + end) RegisterNetEvent('esx:playerLoaded') @@ -311,33 +335,6 @@ AddEventHandler('esx_skin:requestSaveSkin', function() end) end) -AddEventHandler('skinchanger:modelLoaded', function() - - if not HasLoadedModel then - - Citizen.CreateThread(function() - - while not PlayerLoaded do - Citizen.Wait(0) - end - - ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin, jobSkin) - - HasLoadedModel = true - - if skin == nil then - OpenSaveableMenu(nil, nil, nil) - else - TriggerEvent('skinchanger:loadSkin', skin) - end - - end) - - end) - - end -end) - Citizen.CreateThread(function() while true do From e537204c33fbaaf2bda7294306b9eff7f9152ad1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Tue, 22 Aug 2017 03:43:21 +0200 Subject: [PATCH 21/66] Close skin cam when closing menu --- client/main.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/client/main.lua b/client/main.lua index f6e1e557..57d823cf 100644 --- a/client/main.lua +++ b/client/main.lua @@ -147,6 +147,9 @@ function OpenMenu(submitCb, cancelCb, restrict) end) + end, + function() + DeleteSkinCam() end ) From 74247e1238307f43322b4c1b8969290a1ca4151d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Fri, 25 Aug 2017 16:48:20 +0200 Subject: [PATCH 22/66] Set LastSkin when saving --- client/main.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/client/main.lua b/client/main.lua index 57d823cf..2086cc10 100644 --- a/client/main.lua +++ b/client/main.lua @@ -264,6 +264,8 @@ function OpenSaveableMenu(submitCb, cancelCb, restrict) TriggerServerEvent('esx_skin:save', skin) + LastSkin = skin + if submitCb ~= nil then submitCb(data, menu) end From 6c66b7a4e6d68a6581ca36eb8559f297d53d4d93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Fri, 25 Aug 2017 17:15:03 +0200 Subject: [PATCH 23/66] Set LastSkin when submiting --- client/main.lua | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/client/main.lua b/client/main.lua index 2086cc10..f7d44e38 100644 --- a/client/main.lua +++ b/client/main.lua @@ -94,6 +94,11 @@ function OpenMenu(submitCb, cancelCb, restrict) elements = elements }, function(data, menu) + + TriggerEvent('skinchanger:getSkin', function(skin) + LastSkin = skin + end) + submitCb(data, menu) DeleteSkinCam() end, @@ -264,8 +269,6 @@ function OpenSaveableMenu(submitCb, cancelCb, restrict) TriggerServerEvent('esx_skin:save', skin) - LastSkin = skin - if submitCb ~= nil then submitCb(data, menu) end From b415f2d59ddce213d428c3fcc15a40fcc22a43d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Sat, 26 Aug 2017 09:20:49 +0200 Subject: [PATCH 24/66] Add setLastSkin event --- client/main.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/client/main.lua b/client/main.lua index f7d44e38..8fef14cf 100644 --- a/client/main.lua +++ b/client/main.lua @@ -316,6 +316,10 @@ AddEventHandler('esx_skin:getLastSkin', function(cb) cb(LastSkin) end) +AddEventHandler('esx_skin:setLastSkin', function(skin) + LastSkin = skin +end) + RegisterNetEvent('esx_skin:openMenu') AddEventHandler('esx_skin:openMenu', function(submitCb, cancelCb) OpenMenu(submitCb, cancelCb, nil) From a08a1febf059dc1fd01335b9027a80cbb148ccff Mon Sep 17 00:00:00 2001 From: ultratm Date: Sat, 26 Aug 2017 10:43:41 +0200 Subject: [PATCH 25/66] Add German language --- __resource.lua | 2 ++ locales/de.lua | 8 ++++++++ 2 files changed, 10 insertions(+) create mode 100644 locales/de.lua diff --git a/__resource.lua b/__resource.lua index eff9b223..0ccde16f 100644 --- a/__resource.lua +++ b/__resource.lua @@ -5,6 +5,7 @@ description 'ESX Skin' server_scripts { '@es_extended/locale.lua', 'config.lua', + 'locales/de.lua', 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', @@ -15,6 +16,7 @@ server_scripts { client_scripts { '@es_extended/locale.lua', 'config.lua', + 'locales/de.lua', 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', diff --git a/locales/de.lua b/locales/de.lua new file mode 100644 index 00000000..ea5b6bb1 --- /dev/null +++ b/locales/de.lua @@ -0,0 +1,8 @@ +Locales['de'] = { + + ['skin_menu'] = 'Skin Menü', + ['use_rotate_view'] = 'benutze ~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ und ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ um die Sicht zu drehen.', + ['skin'] = 'Skin ändern', + ['saveskin'] = 'Skin speichern', + +} From 50e3117c41c8073410d89cd1fd9395968134780e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Thu, 14 Sep 2017 23:18:36 +0200 Subject: [PATCH 26/66] Update LICENSE.txt --- LICENSE.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 30ace6a8..ff506035 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - {one line to give the program's name and a brief idea of what it does.} - Copyright (C) {year} {name of author} + fxserver-esx_skin + Copyright (C) 2015 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - {project} Copyright (C) {year} {fullname} + fxserver-esx_skin Copyright (C) 2015 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. From 05f47e8c3393ed894fee16a7356ee4d463ecaa10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Fri, 15 Sep 2017 15:42:58 +0200 Subject: [PATCH 27/66] chore(resource): Add version --- __resource.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/__resource.lua b/__resource.lua index 0ccde16f..37dcb94b 100644 --- a/__resource.lua +++ b/__resource.lua @@ -2,6 +2,8 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ESX Skin' +version '1.0.0' + server_scripts { '@es_extended/locale.lua', 'config.lua', From 10943d3e988db5e8e6814c6fb3e8a500defe24d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Tue, 26 Sep 2017 21:49:26 +0200 Subject: [PATCH 28/66] fix(skin creation): Fix first skin creation issues --- client/main.lua | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/client/main.lua b/client/main.lua index 8fef14cf..50470819 100644 --- a/client/main.lua +++ b/client/main.lua @@ -131,17 +131,17 @@ function OpenMenu(submitCb, cancelCb, restrict) TriggerEvent('skinchanger:getData', function(components, maxVals) for i=1, #elements, 1 do - if elements[i].textureof ~= nil then - local newData = {max = maxVals[elements[i].name]} - - if data.current.name == elements[i].textureof then - newData.value = 0 - end - - menu.update({name = elements[i].name}, newData) + local newData = {} + + newData.max = maxVals[elements[i].name] + if elements[i].textureof ~= nil and data.current.name == elements[i].textureof then + newData.value = 0 end + + menu.update({name = elements[i].name}, newData) + end menu.refresh() @@ -292,7 +292,7 @@ AddEventHandler('playerSpawned', function() ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin, jobSkin) if skin == nil then - OpenSaveableMenu(nil, nil, nil) + TriggerEvent('skinchanger:loadSkin', {sex = 0}, OpenSaveableMenu) else TriggerEvent('skinchanger:loadSkin', skin) end From 4bf26770d7fa6b52148b79b7a00e59c44322d3b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Tue, 26 Sep 2017 21:51:22 +0200 Subject: [PATCH 29/66] chore(version): Increment version --- __resource.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__resource.lua b/__resource.lua index 37dcb94b..76706d7b 100644 --- a/__resource.lua +++ b/__resource.lua @@ -2,7 +2,7 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ESX Skin' -version '1.0.0' +version '1.0.1' server_scripts { '@es_extended/locale.lua', From d283aa3bd272c9034f5f008d813f4fcb3a842968 Mon Sep 17 00:00:00 2001 From: Romain Lanz Date: Sat, 30 Sep 2017 15:26:15 +0200 Subject: [PATCH 30/66] chore(coding-style): change tabs to space --- .editorconfig | 9 + __resource.lua | 32 ++-- client/main.lua | 456 ++++++++++++++++++++++++------------------------ locales/br.lua | 8 +- locales/de.lua | 8 +- locales/en.lua | 8 +- locales/fr.lua | 8 +- server/main.lua | 76 ++++---- 8 files changed, 306 insertions(+), 299 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..4bfca33b --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*] +indent_size = 2 +indent_style = space +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true diff --git a/__resource.lua b/__resource.lua index 76706d7b..c2ff2048 100644 --- a/__resource.lua +++ b/__resource.lua @@ -1,26 +1,24 @@ -resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' - description 'ESX Skin' version '1.0.1' server_scripts { - '@es_extended/locale.lua', - 'config.lua', - 'locales/de.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/fr.lua', - '@mysql-async/lib/MySQL.lua', - 'server/main.lua' + '@es_extended/locale.lua', + 'config.lua', + 'locales/de.lua', + 'locales/br.lua', + 'locales/en.lua', + 'locales/fr.lua', + '@mysql-async/lib/MySQL.lua', + 'server/main.lua', } client_scripts { - '@es_extended/locale.lua', - 'config.lua', - 'locales/de.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/fr.lua', - 'client/main.lua' + '@es_extended/locale.lua', + 'config.lua', + 'locales/de.lua', + 'locales/br.lua', + 'locales/en.lua', + 'locales/fr.lua', + 'client/main.lua', } diff --git a/client/main.lua b/client/main.lua index 50470819..d6c88ec3 100644 --- a/client/main.lua +++ b/client/main.lua @@ -2,361 +2,361 @@ ESX = nil local FirstSpawn = true local LastSkin = nil local PlayerLoaded = false -local cam = nil +local cam = nil local isCameraActive = false -local zoomOffset = 0.0 -local camOffset = 0.0 -local heading = 90.0 +local zoomOffset = 0.0 +local camOffset = 0.0 +local heading = 90.0 Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end + while ESX == nil do + TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + Citizen.Wait(0) + end end) function OpenMenu(submitCb, cancelCb, restrict) - local playerPed = GetPlayerPed(-1) + local playerPed = GetPlayerPed(-1) - TriggerEvent('skinchanger:getSkin', function(skin) - LastSkin = skin - end) + TriggerEvent('skinchanger:getSkin', function(skin) + LastSkin = skin + end) - TriggerEvent('skinchanger:getData', function(components, maxVals) + TriggerEvent('skinchanger:getData', function(components, maxVals) - local elements = {} - local _components = {} + local elements = {} + local _components = {} - -- Restrict menu - if restrict == nil then - for i=1, #components, 1 do - _components[i] = components[i] - end - else - for i=1, #components, 1 do + -- Restrict menu + if restrict == nil then + for i=1, #components, 1 do + _components[i] = components[i] + end + else + for i=1, #components, 1 do - local found = false + local found = false - for j=1, #restrict, 1 do - if components[i].name == restrict[j] then - found = true - end - end + for j=1, #restrict, 1 do + if components[i].name == restrict[j] then + found = true + end + end - if found then - table.insert(_components, components[i]) - end + if found then + table.insert(_components, components[i]) + end - end - end + end + end - -- Insert elements - for i=1, #_components, 1 do + -- Insert elements + for i=1, #_components, 1 do - local value = _components[i].value - local componentId = _components[i].componentId + local value = _components[i].value + local componentId = _components[i].componentId - if componentId == 0 then - value = GetPedPropIndex(playerPed, _components[i].componentId) - end + if componentId == 0 then + value = GetPedPropIndex(playerPed, _components[i].componentId) + end - local data = { - label = _components[i].label, - name = _components[i].name, - value = value, - min = _components[i].min, - textureof = _components[i].textureof, - zoomOffset= _components[i].zoomOffset, - camOffset = _components[i].camOffset, - type = 'slider' - } + local data = { + label = _components[i].label, + name = _components[i].name, + value = value, + min = _components[i].min, + textureof = _components[i].textureof, + zoomOffset= _components[i].zoomOffset, + camOffset = _components[i].camOffset, + type = 'slider' + } - for k,v in pairs(maxVals) do - if k == _components[i].name then - data.max = v - end - end + for k,v in pairs(maxVals) do + if k == _components[i].name then + data.max = v + end + end - table.insert(elements, data) + table.insert(elements, data) - end + end - CreateSkinCam() - zoomOffset = _components[1].zoomOffset - camOffset = _components[1].camOffset + CreateSkinCam() + zoomOffset = _components[1].zoomOffset + camOffset = _components[1].camOffset - ESX.UI.Menu.Open( - 'default', GetCurrentResourceName(), 'skin', - { - title = _U('skin_menu'), - align = 'top-left', - elements = elements - }, - function(data, menu) + ESX.UI.Menu.Open( + 'default', GetCurrentResourceName(), 'skin', + { + title = _U('skin_menu'), + align = 'top-left', + elements = elements + }, + function(data, menu) - TriggerEvent('skinchanger:getSkin', function(skin) - LastSkin = skin - end) + TriggerEvent('skinchanger:getSkin', function(skin) + LastSkin = skin + end) - submitCb(data, menu) - DeleteSkinCam() - end, - function(data, menu) + submitCb(data, menu) + DeleteSkinCam() + end, + function(data, menu) - menu.close() + menu.close() - DeleteSkinCam() + DeleteSkinCam() - TriggerEvent('skinchanger:loadSkin', LastSkin) + TriggerEvent('skinchanger:loadSkin', LastSkin) - if cancelCb ~= nil then - cancelCb(data, menu) - end + if cancelCb ~= nil then + cancelCb(data, menu) + end - end, - function(data, menu) + end, + function(data, menu) - TriggerEvent('skinchanger:getSkin', function(skin) + TriggerEvent('skinchanger:getSkin', function(skin) - zoomOffset = data.current.zoomOffset - camOffset = data.current.camOffset + zoomOffset = data.current.zoomOffset + camOffset = data.current.camOffset - if skin[data.current.name] ~= data.current.value then + if skin[data.current.name] ~= data.current.value then - -- Change skin element - TriggerEvent('skinchanger:change', data.current.name, data.current.value) + -- Change skin element + TriggerEvent('skinchanger:change', data.current.name, data.current.value) - -- Update max values - TriggerEvent('skinchanger:getData', function(components, maxVals) + -- Update max values + TriggerEvent('skinchanger:getData', function(components, maxVals) - for i=1, #elements, 1 do + for i=1, #elements, 1 do - local newData = {} - - newData.max = maxVals[elements[i].name] + local newData = {} - if elements[i].textureof ~= nil and data.current.name == elements[i].textureof then - newData.value = 0 - end + newData.max = maxVals[elements[i].name] - menu.update({name = elements[i].name}, newData) + if elements[i].textureof ~= nil and data.current.name == elements[i].textureof then + newData.value = 0 + end - end + menu.update({name = elements[i].name}, newData) - menu.refresh() + end - end) + menu.refresh() - end + end) - end) + end - end, - function() - DeleteSkinCam() - end - ) + end) - end) + end, + function() + DeleteSkinCam() + end + ) + + end) end function CreateSkinCam() - if not DoesCamExist(cam) then - cam = CreateCam('DEFAULT_SCRIPTED_CAMERA', true) - end - SetCamActive(cam, true) - RenderScriptCams(true, true, 500, true, true) - isCameraActive = true - SetCamRot(cam, 0.0, 0.0, 270.0, true) - SetEntityHeading(playerPed, 90.0) + if not DoesCamExist(cam) then + cam = CreateCam('DEFAULT_SCRIPTED_CAMERA', true) + end + SetCamActive(cam, true) + RenderScriptCams(true, true, 500, true, true) + isCameraActive = true + SetCamRot(cam, 0.0, 0.0, 270.0, true) + SetEntityHeading(playerPed, 90.0) end function DeleteSkinCam() - isCameraActive = false - SetCamActive(cam, false) - RenderScriptCams(false, true, 500, true, true) - cam = nil + isCameraActive = false + SetCamActive(cam, false) + RenderScriptCams(false, true, 500, true, true) + cam = nil end Citizen.CreateThread(function() - while true do - Citizen.Wait(0) - if isCameraActive then - DisableControlAction(2, 30, true) - DisableControlAction(2, 31, true) - DisableControlAction(2, 32, true) - DisableControlAction(2, 33, true) - DisableControlAction(2, 34, true) - DisableControlAction(2, 35, true) + while true do + Citizen.Wait(0) + if isCameraActive then + DisableControlAction(2, 30, true) + DisableControlAction(2, 31, true) + DisableControlAction(2, 32, true) + DisableControlAction(2, 33, true) + DisableControlAction(2, 34, true) + DisableControlAction(2, 35, true) - DisableControlAction(0, 25, true) -- Input Aim - DisableControlAction(0, 24, true) -- Input Attack + DisableControlAction(0, 25, true) -- Input Aim + DisableControlAction(0, 24, true) -- Input Attack - local playerPed = GetPlayerPed(-1) - local coords = GetEntityCoords(playerPed) + local playerPed = GetPlayerPed(-1) + local coords = GetEntityCoords(playerPed) - local angle = heading * math.pi / 180.0 - local theta = { - x = math.cos(angle), - y = math.sin(angle) - } - local pos = { - x = coords.x + (zoomOffset * theta.x), - y = coords.y + (zoomOffset * theta.y), - } + local angle = heading * math.pi / 180.0 + local theta = { + x = math.cos(angle), + y = math.sin(angle) + } + local pos = { + x = coords.x + (zoomOffset * theta.x), + y = coords.y + (zoomOffset * theta.y), + } - local angleToLook = heading - 140.0 - if angleToLook > 360 then - angleToLook = angleToLook - 360 - elseif angleToLook < 0 then - angleToLook = angleToLook + 360 - end - angleToLook = angleToLook * math.pi / 180.0 - local thetaToLook = { - x = math.cos(angleToLook), - y = math.sin(angleToLook) - } - local posToLook = { - x = coords.x + (zoomOffset * thetaToLook.x), - y = coords.y + (zoomOffset * thetaToLook.y), - } + local angleToLook = heading - 140.0 + if angleToLook > 360 then + angleToLook = angleToLook - 360 + elseif angleToLook < 0 then + angleToLook = angleToLook + 360 + end + angleToLook = angleToLook * math.pi / 180.0 + local thetaToLook = { + x = math.cos(angleToLook), + y = math.sin(angleToLook) + } + local posToLook = { + x = coords.x + (zoomOffset * thetaToLook.x), + y = coords.y + (zoomOffset * thetaToLook.y), + } - SetCamCoord(cam, pos.x, pos.y, coords.z + camOffset) - PointCamAtCoord(cam, posToLook.x, posToLook.y, coords.z + camOffset) + SetCamCoord(cam, pos.x, pos.y, coords.z + camOffset) + PointCamAtCoord(cam, posToLook.x, posToLook.y, coords.z + camOffset) - SetTextComponentFormat("STRING") - AddTextComponentString(_U('use_rotate_view')) - DisplayHelpTextFromStringLabel(0, 0, 0, -1) - end - end + SetTextComponentFormat("STRING") + AddTextComponentString(_U('use_rotate_view')) + DisplayHelpTextFromStringLabel(0, 0, 0, -1) + end + end end) Citizen.CreateThread(function() - local angle = 90 - while true do - Citizen.Wait(0) - if isCameraActive then - if IsControlPressed(0, 108) then - angle = angle - 1 - elseif IsControlPressed(0, 109) then - angle = angle + 1 - end - if angle > 360 then - angle = angle - 360 - elseif angle < 0 then - angle = angle + 360 - end - heading = angle + 0.0 - end - end + local angle = 90 + while true do + Citizen.Wait(0) + if isCameraActive then + if IsControlPressed(0, 108) then + angle = angle - 1 + elseif IsControlPressed(0, 109) then + angle = angle + 1 + end + if angle > 360 then + angle = angle - 360 + elseif angle < 0 then + angle = angle + 360 + end + heading = angle + 0.0 + end + end end) function OpenSaveableMenu(submitCb, cancelCb, restrict) - TriggerEvent('skinchanger:getSkin', function(skin) - LastSkin = skin - end) + TriggerEvent('skinchanger:getSkin', function(skin) + LastSkin = skin + end) - OpenMenu(function(data, menu) + OpenMenu(function(data, menu) - menu.close() + menu.close() - DeleteSkinCam() + DeleteSkinCam() - TriggerEvent('skinchanger:getSkin', function(skin) + TriggerEvent('skinchanger:getSkin', function(skin) - TriggerServerEvent('esx_skin:save', skin) + TriggerServerEvent('esx_skin:save', skin) - if submitCb ~= nil then - submitCb(data, menu) - end + if submitCb ~= nil then + submitCb(data, menu) + end - end) + end) - end, cancelCb, restrict) + end, cancelCb, restrict) end AddEventHandler('playerSpawned', function() - Citizen.CreateThread(function() + Citizen.CreateThread(function() - while not PlayerLoaded do - Citizen.Wait(0) - end + while not PlayerLoaded do + Citizen.Wait(0) + end - if FirstSpawn then + if FirstSpawn then - ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin, jobSkin) + ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin, jobSkin) - if skin == nil then - TriggerEvent('skinchanger:loadSkin', {sex = 0}, OpenSaveableMenu) - else - TriggerEvent('skinchanger:loadSkin', skin) - end + if skin == nil then + TriggerEvent('skinchanger:loadSkin', {sex = 0}, OpenSaveableMenu) + else + TriggerEvent('skinchanger:loadSkin', skin) + end - end) + end) - FirstSpawn = false + FirstSpawn = false - end + end - end) + end) end) RegisterNetEvent('esx:playerLoaded') AddEventHandler('esx:playerLoaded', function(xPlayer) - PlayerLoaded = true + PlayerLoaded = true end) AddEventHandler('esx_skin:getLastSkin', function(cb) - cb(LastSkin) + cb(LastSkin) end) AddEventHandler('esx_skin:setLastSkin', function(skin) - LastSkin = skin + LastSkin = skin end) RegisterNetEvent('esx_skin:openMenu') AddEventHandler('esx_skin:openMenu', function(submitCb, cancelCb) - OpenMenu(submitCb, cancelCb, nil) + OpenMenu(submitCb, cancelCb, nil) end) RegisterNetEvent('esx_skin:openRestrictedMenu') AddEventHandler('esx_skin:openRestrictedMenu', function(submitCb, cancelCb, restrict) - OpenMenu(submitCb, cancelCb, restrict) + OpenMenu(submitCb, cancelCb, restrict) end) RegisterNetEvent('esx_skin:openSaveableMenu') AddEventHandler('esx_skin:openSaveableMenu', function(submitCb, cancelCb) - OpenSaveableMenu(submitCb, cancelCb, nil) + OpenSaveableMenu(submitCb, cancelCb, nil) end) RegisterNetEvent('esx_skin:openSaveableRestrictedMenu') AddEventHandler('esx_skin:openSaveableRestrictedMenu', function(submitCb, cancelCb, restrict) - OpenSaveableMenu(submitCb, cancelCb, restrict) + OpenSaveableMenu(submitCb, cancelCb, restrict) end) RegisterNetEvent('esx_skin:requestSaveSkin') AddEventHandler('esx_skin:requestSaveSkin', function() - TriggerEvent('skinchanger:getSkin', function(skin) - TriggerServerEvent('esx_skin:responseSaveSkin', skin) - end) + TriggerEvent('skinchanger:getSkin', function(skin) + TriggerServerEvent('esx_skin:responseSaveSkin', skin) + end) end) Citizen.CreateThread(function() - while true do + while true do - Citizen.Wait(0) + Citizen.Wait(0) - local playerPed = GetPlayerPed(-1) + local playerPed = GetPlayerPed(-1) - if IsEntityDead(playerPed) then - HasLoadedModel = false - end + if IsEntityDead(playerPed) then + HasLoadedModel = false + end - end + end end) diff --git a/locales/br.lua b/locales/br.lua index f35e7998..1716b1f1 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -1,8 +1,8 @@ Locales['br'] = { - ['skin_menu'] = 'Skin Menu', - ['use_rotate_view'] = 'Use ~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ e ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ para girar a visão.', - ['skin'] = 'Trocar', - ['saveskin'] = 'Salvar', + ['skin_menu'] = 'Skin Menu', + ['use_rotate_view'] = 'Use ~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ e ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ para girar a visão.', + ['skin'] = 'Trocar', + ['saveskin'] = 'Salvar', } diff --git a/locales/de.lua b/locales/de.lua index ea5b6bb1..d8d43483 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -1,8 +1,8 @@ Locales['de'] = { - ['skin_menu'] = 'Skin Menü', - ['use_rotate_view'] = 'benutze ~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ und ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ um die Sicht zu drehen.', - ['skin'] = 'Skin ändern', - ['saveskin'] = 'Skin speichern', + ['skin_menu'] = 'Skin Menü', + ['use_rotate_view'] = 'benutze ~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ und ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ um die Sicht zu drehen.', + ['skin'] = 'Skin ändern', + ['saveskin'] = 'Skin speichern', } diff --git a/locales/en.lua b/locales/en.lua index 7609234d..99d37d86 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,8 +1,8 @@ Locales['en'] = { - ['skin_menu'] = 'Skin Menu', - ['use_rotate_view'] = 'use ~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ and ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ to rotate the view.', - ['skin'] = 'change skin', - ['saveskin'] = 'save skin to a file', + ['skin_menu'] = 'Skin Menu', + ['use_rotate_view'] = 'use ~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ and ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ to rotate the view.', + ['skin'] = 'change skin', + ['saveskin'] = 'save skin to a file', } diff --git a/locales/fr.lua b/locales/fr.lua index e20a772e..d8f1f20b 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,8 +1,8 @@ Locales['fr'] = { - ['skin_menu'] = 'Skin Menu', - ['use_rotate_view'] = 'utilisez ~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ et ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ pour tourner la vue.', - ['skin'] = 'changer de skin', - ['saveskin'] = 'sauvegarder skin dans un fichier', + ['skin_menu'] = 'Skin Menu', + ['use_rotate_view'] = 'utilisez ~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ et ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ pour tourner la vue.', + ['skin'] = 'changer de skin', + ['saveskin'] = 'sauvegarder skin dans un fichier', } diff --git a/server/main.lua b/server/main.lua index 1c259e71..2299b58c 100644 --- a/server/main.lua +++ b/server/main.lua @@ -5,68 +5,68 @@ TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) RegisterServerEvent('esx_skin:save') AddEventHandler('esx_skin:save', function(skin) - local xPlayer = ESX.GetPlayerFromId(source) + local xPlayer = ESX.GetPlayerFromId(source) - MySQL.Async.execute( - 'UPDATE users SET `skin` = @skin WHERE identifier = @identifier', - { - ['@skin'] = json.encode(skin), - ['@identifier'] = xPlayer.identifier - } - ) + MySQL.Async.execute( + 'UPDATE users SET `skin` = @skin WHERE identifier = @identifier', + { + ['@skin'] = json.encode(skin), + ['@identifier'] = xPlayer.identifier + } + ) end) RegisterServerEvent('esx_skin:responseSaveSkin') AddEventHandler('esx_skin:responseSaveSkin', function(skin) - local file = io.open('resources/[esx]/esx_skin/skins.txt', "a") - - file:write(json.encode(skin) .. "\n\n") - file:flush() - file:close() - + local file = io.open('resources/[esx]/esx_skin/skins.txt', "a") + + file:write(json.encode(skin) .. "\n\n") + file:flush() + file:close() + end) ESX.RegisterServerCallback('esx_skin:getPlayerSkin', function(source, cb) - local xPlayer = ESX.GetPlayerFromId(source) + local xPlayer = ESX.GetPlayerFromId(source) - MySQL.Async.fetchAll( - 'SELECT * FROM users WHERE identifier = @identifier', - { - ['@identifier'] = xPlayer.identifier - }, - function(users) + MySQL.Async.fetchAll( + 'SELECT * FROM users WHERE identifier = @identifier', + { + ['@identifier'] = xPlayer.identifier + }, + function(users) - local user = users[1] - local skin = nil + local user = users[1] + local skin = nil - local jobSkin = { - skin_male = xPlayer.job.skin_male, - skin_female = xPlayer.job.skin_female - } + local jobSkin = { + skin_male = xPlayer.job.skin_male, + skin_female = xPlayer.job.skin_female + } - if user.skin ~= nil then - skin = json.decode(user.skin) - end + if user.skin ~= nil then + skin = json.decode(user.skin) + end - cb(skin, jobSkin) + cb(skin, jobSkin) - end - ) + end + ) end) -- Commands TriggerEvent('es:addGroupCommand', 'skin', 'admin', function(source, args, user) - TriggerClientEvent('esx_skin:openSaveableMenu', source) + TriggerClientEvent('esx_skin:openSaveableMenu', source) end, function(source, args, user) - TriggerClientEvent('chatMessage', source, "SYSTEM", {255, 0, 0}, 'Insufficient permissions!') + TriggerClientEvent('chatMessage', source, "SYSTEM", {255, 0, 0}, 'Insufficient permissions!') end, {help = _U('skin')}) TriggerEvent('es:addGroupCommand', 'saveskin', 'admin', function(source, args, user) - TriggerClientEvent('esx_skin:requestSaveSkin', source) + TriggerClientEvent('esx_skin:requestSaveSkin', source) end, function(source, args, user) - TriggerClientEvent('chatMessage', source, "SYSTEM", {255, 0, 0}, "Insufficient Permissions.") -end, {help = _U('saveskin')}) \ No newline at end of file + TriggerClientEvent('chatMessage', source, "SYSTEM", {255, 0, 0}, "Insufficient Permissions.") +end, {help = _U('saveskin')}) From 7565c2f38672b1af7e2d524a93badb2b3bb9f689 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Thu, 10 May 2018 10:34:29 +0200 Subject: [PATCH 31/66] Swedish language, Fixes #8 --- README.md | 41 +++++++++++++++++++++++++++++++---------- __resource.lua | 36 ++++++++++++++++++++---------------- locales/sv.lua | 6 ++++++ server/main.lua | 2 +- 4 files changed, 58 insertions(+), 27 deletions(-) create mode 100644 locales/sv.lua diff --git a/README.md b/README.md index 7b3b678d..88df41b8 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,40 @@ -# fxserver-esx_skin -FXServer ESX Skin +# esx_skin -[REQUIREMENTS] +## Requirements +- [skinchanger](https://github.com/ESX-Org/skinchanger) -- skinchanger => https://github.com/FXServer-ESX/fxserver-skinchanger +## Download & Installation -[INSTALLATION] - -1) CD in your resources/[esx] folder -2) Clone the repository +### Using [fvm](https://github.com/qlaffont/fvm-installer) ``` -git clone https://github.com/FXServer-ESX/fxserver-esx_skin esx_skin +fvm install --save --folder=esx esx-org/esx_skin ``` -3) Add this in your server.cfg : + +### Using Git +``` +cd resources +git clone https://github.com/ESX-Org/esx_skin [esx]/esx_skin +``` + +### Manually +- Download https://github.com/ESX-Org/esx_skin/archive/master.zip +- Put it in the `[esx]` directory + +- Import `esx_skin.sql` in your database +- Add this in your `server.cfg`: ``` start esx_skin ``` + +# Legal +### License +esx_skin - skin selector for ESX + +Copyright (C) 2015-2018 Jérémie N'gadi + +This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. + +This program Is distributed In the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty Of MERCHANTABILITY Or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License For more details. + +You should have received a copy Of the GNU General Public License along with this program. If Not, see http://www.gnu.org/licenses/. \ No newline at end of file diff --git a/__resource.lua b/__resource.lua index c2ff2048..b5658f30 100644 --- a/__resource.lua +++ b/__resource.lua @@ -1,24 +1,28 @@ +resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' + description 'ESX Skin' -version '1.0.1' +version '1.0.2' server_scripts { - '@es_extended/locale.lua', - 'config.lua', - 'locales/de.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/fr.lua', - '@mysql-async/lib/MySQL.lua', - 'server/main.lua', + '@mysql-async/lib/MySQL.lua', + '@es_extended/locale.lua', + 'locales/de.lua', + 'locales/br.lua', + 'locales/en.lua', + 'locales/fr.lua', + 'locales/sv.lua', + 'config.lua', + 'server/main.lua' } client_scripts { - '@es_extended/locale.lua', - 'config.lua', - 'locales/de.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/fr.lua', - 'client/main.lua', + '@es_extended/locale.lua', + 'locales/de.lua', + 'locales/br.lua', + 'locales/en.lua', + 'locales/fr.lua', + 'locales/sv.lua', + 'config.lua', + 'client/main.lua' } diff --git a/locales/sv.lua b/locales/sv.lua new file mode 100644 index 00000000..02ddd5f0 --- /dev/null +++ b/locales/sv.lua @@ -0,0 +1,6 @@ +Locales['sv'] = { + ['skin_menu'] = 'skin meny', + ['use_rotate_view'] = 'använd ~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ och ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ för att rotera.', + ['skin'] = 'ändra skin', + ['saveskin'] = 'spara skin till fil', +} diff --git a/server/main.lua b/server/main.lua index 2299b58c..2528f460 100644 --- a/server/main.lua +++ b/server/main.lua @@ -65,7 +65,7 @@ end, function(source, args, user) TriggerClientEvent('chatMessage', source, "SYSTEM", {255, 0, 0}, 'Insufficient permissions!') end, {help = _U('skin')}) -TriggerEvent('es:addGroupCommand', 'saveskin', 'admin', function(source, args, user) +TriggerEvent('es:addGroupCommand', 'skinsave', 'admin', function(source, args, user) TriggerClientEvent('esx_skin:requestSaveSkin', source) end, function(source, args, user) TriggerClientEvent('chatMessage', source, "SYSTEM", {255, 0, 0}, "Insufficient Permissions.") From cabe75b6af5264a305ee7c327eee68b2f019e4a5 Mon Sep 17 00:00:00 2001 From: Samuel Date: Tue, 15 May 2018 16:59:33 +0200 Subject: [PATCH 32/66] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 88df41b8..07a7c5ee 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,6 @@ git clone https://github.com/ESX-Org/esx_skin [esx]/esx_skin - Download https://github.com/ESX-Org/esx_skin/archive/master.zip - Put it in the `[esx]` directory -- Import `esx_skin.sql` in your database - Add this in your `server.cfg`: ``` @@ -37,4 +36,4 @@ This program Is free software: you can redistribute it And/Or modify it under th This program Is distributed In the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty Of MERCHANTABILITY Or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License For more details. -You should have received a copy Of the GNU General Public License along with this program. If Not, see http://www.gnu.org/licenses/. \ No newline at end of file +You should have received a copy Of the GNU General Public License along with this program. If Not, see http://www.gnu.org/licenses/. From 89c46672be3aba64a60497d47f2dc0bab965a06d Mon Sep 17 00:00:00 2001 From: AdrineX Date: Tue, 12 Jun 2018 20:52:58 +0300 Subject: [PATCH 33/66] Add Finnish lang... --- __resource.lua | 2 ++ locales/fi.lua | 8 ++++++++ 2 files changed, 10 insertions(+) create mode 100644 locales/fi.lua diff --git a/__resource.lua b/__resource.lua index b5658f30..8f15daa4 100644 --- a/__resource.lua +++ b/__resource.lua @@ -10,6 +10,7 @@ server_scripts { 'locales/de.lua', 'locales/br.lua', 'locales/en.lua', + 'locales/fi.lua', 'locales/fr.lua', 'locales/sv.lua', 'config.lua', @@ -21,6 +22,7 @@ client_scripts { 'locales/de.lua', 'locales/br.lua', 'locales/en.lua', + 'locales/fi.lua', 'locales/fr.lua', 'locales/sv.lua', 'config.lua', diff --git a/locales/fi.lua b/locales/fi.lua new file mode 100644 index 00000000..e8a135b6 --- /dev/null +++ b/locales/fi.lua @@ -0,0 +1,8 @@ +Locales['fi'] = { + + ['skin_menu'] = 'ulkonäkö', + ['use_rotate_view'] = 'paina ~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ tai ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ liikutaaksesi kameraa.', + ['skin'] = 'vaihda ulkonäköä', + ['saveskin'] = 'talleta ulkonäkö tiedostoon', + +} From e3dfd5a52aa1b7fcb884ca54c1c6b5cdeb760c61 Mon Sep 17 00:00:00 2001 From: Samuel Date: Wed, 20 Jun 2018 21:29:47 +0200 Subject: [PATCH 34/66] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 07a7c5ee..dc324102 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,7 @@ git clone https://github.com/ESX-Org/esx_skin [esx]/esx_skin - Download https://github.com/ESX-Org/esx_skin/archive/master.zip - Put it in the `[esx]` directory +## Installation - Add this in your `server.cfg`: ``` From 4d953bb4bb9ce07e675bd75b39489165eabb3997 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Wed, 20 Jun 2018 21:46:51 +0200 Subject: [PATCH 35/66] Implemented cancel event confirmation, closes #5 --- __resource.lua | 2 +- client/main.lua | 51 ++++++++++++++++++++----------------------------- locales/br.lua | 5 +++-- locales/de.lua | 5 +++-- locales/en.lua | 5 +++-- locales/fi.lua | 5 +++-- locales/fr.lua | 5 +++-- locales/sv.lua | 3 +++ 8 files changed, 40 insertions(+), 41 deletions(-) diff --git a/__resource.lua b/__resource.lua index 8f15daa4..7faa13a7 100644 --- a/__resource.lua +++ b/__resource.lua @@ -2,7 +2,7 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ESX Skin' -version '1.0.2' +version '1.1.0' server_scripts { '@mysql-async/lib/MySQL.lua', diff --git a/client/main.lua b/client/main.lua index d6c88ec3..845003b0 100644 --- a/client/main.lua +++ b/client/main.lua @@ -101,22 +101,27 @@ function OpenMenu(submitCb, cancelCb, restrict) submitCb(data, menu) DeleteSkinCam() - end, - function(data, menu) - - menu.close() - - DeleteSkinCam() - - TriggerEvent('skinchanger:loadSkin', LastSkin) - - if cancelCb ~= nil then - cancelCb(data, menu) - end - - end, - function(data, menu) + end, function(data, menu) + ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'confirm_escape', { + title = _U('confirm_escape'), + align = 'bottom-right', + elements = { + {label = _U('no'), value = 'no'}, + {label = _U('yes'), value = 'yes'} + } + }, function(data2, menu2) + if data2.current.value == 'yes' then + menu.close() + DeleteSkinCam() + TriggerEvent('skinchanger:loadSkin', LastSkin) + end + menu2.close() + end) + if cancelCb ~= nil then + cancelCb(data, menu) + end + end,function(data, menu) TriggerEvent('skinchanger:getSkin', function(skin) zoomOffset = data.current.zoomOffset @@ -345,18 +350,4 @@ AddEventHandler('esx_skin:requestSaveSkin', function() TriggerEvent('skinchanger:getSkin', function(skin) TriggerServerEvent('esx_skin:responseSaveSkin', skin) end) -end) - -Citizen.CreateThread(function() - while true do - - Citizen.Wait(0) - - local playerPed = GetPlayerPed(-1) - - if IsEntityDead(playerPed) then - HasLoadedModel = false - end - - end -end) +end) \ No newline at end of file diff --git a/locales/br.lua b/locales/br.lua index 1716b1f1..52eb7d1c 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -1,8 +1,9 @@ Locales['br'] = { - ['skin_menu'] = 'Skin Menu', ['use_rotate_view'] = 'Use ~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ e ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ para girar a visão.', ['skin'] = 'Trocar', ['saveskin'] = 'Salvar', - + ['confirm_escape'] = 'do you want to cancel the skin changer? All changes go unsaved.', + ['no'] = 'no', + ['yes'] = 'yes', } diff --git a/locales/de.lua b/locales/de.lua index d8d43483..25bc1c4f 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -1,8 +1,9 @@ Locales['de'] = { - ['skin_menu'] = 'Skin Menü', ['use_rotate_view'] = 'benutze ~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ und ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ um die Sicht zu drehen.', ['skin'] = 'Skin ändern', ['saveskin'] = 'Skin speichern', - + ['confirm_escape'] = 'do you want to cancel the skin changer? All changes go unsaved.', + ['no'] = 'no', + ['yes'] = 'yes', } diff --git a/locales/en.lua b/locales/en.lua index 99d37d86..1fb10930 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,8 +1,9 @@ Locales['en'] = { - ['skin_menu'] = 'Skin Menu', ['use_rotate_view'] = 'use ~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ and ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ to rotate the view.', ['skin'] = 'change skin', ['saveskin'] = 'save skin to a file', - + ['confirm_escape'] = 'do you want to cancel the skin changer? All changes go unsaved.', + ['no'] = 'no', + ['yes'] = 'yes', } diff --git a/locales/fi.lua b/locales/fi.lua index e8a135b6..1ea163a5 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -1,8 +1,9 @@ Locales['fi'] = { - ['skin_menu'] = 'ulkonäkö', ['use_rotate_view'] = 'paina ~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ tai ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ liikutaaksesi kameraa.', ['skin'] = 'vaihda ulkonäköä', ['saveskin'] = 'talleta ulkonäkö tiedostoon', - + ['confirm_escape'] = 'do you want to cancel the skin changer? All changes go unsaved.', + ['no'] = 'no', + ['yes'] = 'yes', } diff --git a/locales/fr.lua b/locales/fr.lua index d8f1f20b..c71b7723 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,8 +1,9 @@ Locales['fr'] = { - ['skin_menu'] = 'Skin Menu', ['use_rotate_view'] = 'utilisez ~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ et ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ pour tourner la vue.', ['skin'] = 'changer de skin', ['saveskin'] = 'sauvegarder skin dans un fichier', - + ['confirm_escape'] = 'do you want to cancel the skin changer? All changes go unsaved.', + ['no'] = 'no', + ['yes'] = 'yes', } diff --git a/locales/sv.lua b/locales/sv.lua index 02ddd5f0..8f3dfcf8 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -3,4 +3,7 @@ Locales['sv'] = { ['use_rotate_view'] = 'använd ~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ och ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ för att rotera.', ['skin'] = 'ändra skin', ['saveskin'] = 'spara skin till fil', + ['confirm_escape'] = 'vill du avbryta menyn? Alla ändringar går osparade.', + ['no'] = 'nej', + ['yes'] = 'ja', } From a1836efdf423f88b0dec547723f708938b2bc94a Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Fri, 22 Jun 2018 21:59:22 +0200 Subject: [PATCH 36/66] Proper aligment, added dependency --- __resource.lua | 2 ++ client/main.lua | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/__resource.lua b/__resource.lua index 7faa13a7..1936deea 100644 --- a/__resource.lua +++ b/__resource.lua @@ -28,3 +28,5 @@ client_scripts { 'config.lua', 'client/main.lua' } + +dependency 'es_extended' \ No newline at end of file diff --git a/client/main.lua b/client/main.lua index 845003b0..617ac477 100644 --- a/client/main.lua +++ b/client/main.lua @@ -104,7 +104,7 @@ function OpenMenu(submitCb, cancelCb, restrict) end, function(data, menu) ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'confirm_escape', { title = _U('confirm_escape'), - align = 'bottom-right', + align = 'top-left', elements = { {label = _U('no'), value = 'no'}, {label = _U('yes'), value = 'yes'} From ba8109fbbcb9fe979c450997bf1317e9eb4b38bc Mon Sep 17 00:00:00 2001 From: deviljin112 <39461646+deviljin112@users.noreply.github.com> Date: Mon, 23 Jul 2018 23:17:38 +0100 Subject: [PATCH 37/66] Polish translation --- __resource.lua | 2 ++ locales/pl.lua | 9 +++++++++ 2 files changed, 11 insertions(+) create mode 100644 locales/pl.lua diff --git a/__resource.lua b/__resource.lua index 1936deea..d1e36309 100644 --- a/__resource.lua +++ b/__resource.lua @@ -13,6 +13,7 @@ server_scripts { 'locales/fi.lua', 'locales/fr.lua', 'locales/sv.lua', + 'locales/pl.lua', 'config.lua', 'server/main.lua' } @@ -25,6 +26,7 @@ client_scripts { 'locales/fi.lua', 'locales/fr.lua', 'locales/sv.lua', + 'locales/pl.lua', 'config.lua', 'client/main.lua' } diff --git a/locales/pl.lua b/locales/pl.lua new file mode 100644 index 00000000..173fad3e --- /dev/null +++ b/locales/pl.lua @@ -0,0 +1,9 @@ +Locales['pl'] = { + ['skin_menu'] = 'menu wyglądu', + ['use_rotate_view'] = 'użyj ~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ i ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ aby obrócić ekran.', + ['skin'] = 'zmien wygląd', + ['saveskin'] = 'zapisz wygląd do pliku', + ['confirm_escape'] = 'czy chcesz anulować zmianę wyglądu? Wszystkie zmiany zostaną utracone.', + ['no'] = 'nie', + ['yes'] = 'tak', +} From a34742b74369c1fa00cbb948c8712c705e3c32ad Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Fri, 10 Aug 2018 00:55:48 -0400 Subject: [PATCH 38/66] Repo Update --- .editorconfig | 8 ++++---- LICENSE.txt => LICENSE | 0 2 files changed, 4 insertions(+), 4 deletions(-) rename LICENSE.txt => LICENSE (100%) diff --git a/.editorconfig b/.editorconfig index 4bfca33b..9b425256 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,9 +1,9 @@ root = true [*] -indent_size = 2 -indent_style = space -end_of_line = lf +indent_size = 4 +indent_style = tab +end_of_line = crlf charset = utf-8 trim_trailing_whitespace = true -insert_final_newline = true +insert_final_newline = true \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE similarity index 100% rename from LICENSE.txt rename to LICENSE From 321c11c3dd450a4d8d2236254585d3eb30928a1b Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Thu, 11 Oct 2018 20:25:53 +0200 Subject: [PATCH 39/66] 4 tab indent update, minor improvements --- __resource.lua | 5 +- client/main.lua | 502 +++++++++++++++++++++++------------------------- server/main.lua | 72 +++---- 3 files changed, 278 insertions(+), 301 deletions(-) diff --git a/__resource.lua b/__resource.lua index d1e36309..a45df0e0 100644 --- a/__resource.lua +++ b/__resource.lua @@ -31,4 +31,7 @@ client_scripts { 'client/main.lua' } -dependency 'es_extended' \ No newline at end of file +dependencies { + 'es_extended', + 'skinchanger' +} diff --git a/client/main.lua b/client/main.lua index 617ac477..de8bee5b 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,3 +1,15 @@ +local Keys = { + ["ESC"] = 322, ["F1"] = 288, ["F2"] = 289, ["F3"] = 170, ["F5"] = 166, ["F6"] = 167, ["F7"] = 168, ["F8"] = 169, ["F9"] = 56, ["F10"] = 57, + ["~"] = 243, ["1"] = 157, ["2"] = 158, ["3"] = 160, ["4"] = 164, ["5"] = 165, ["6"] = 159, ["7"] = 161, ["8"] = 162, ["9"] = 163, ["-"] = 84, ["="] = 83, ["BACKSPACE"] = 177, + ["TAB"] = 37, ["Q"] = 44, ["W"] = 32, ["E"] = 38, ["R"] = 45, ["T"] = 245, ["Y"] = 246, ["U"] = 303, ["P"] = 199, ["["] = 39, ["]"] = 40, ["ENTER"] = 18, + ["CAPS"] = 137, ["A"] = 34, ["S"] = 8, ["D"] = 9, ["F"] = 23, ["G"] = 47, ["H"] = 74, ["K"] = 311, ["L"] = 182, + ["LEFTSHIFT"] = 21, ["Z"] = 20, ["X"] = 73, ["C"] = 26, ["V"] = 0, ["B"] = 29, ["N"] = 249, ["M"] = 244, [","] = 82, ["."] = 81, + ["LEFTCTRL"] = 36, ["LEFTALT"] = 19, ["SPACE"] = 22, ["RIGHTCTRL"] = 70, + ["HOME"] = 213, ["PAGEUP"] = 10, ["PAGEDOWN"] = 11, ["DELETE"] = 178, + ["LEFT"] = 174, ["RIGHT"] = 175, ["TOP"] = 27, ["DOWN"] = 173, + ["NENTER"] = 201, ["N4"] = 108, ["N5"] = 60, ["N6"] = 107, ["N+"] = 96, ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118 +} + ESX = nil local FirstSpawn = true local LastSkin = nil @@ -9,345 +21,321 @@ local camOffset = 0.0 local heading = 90.0 Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end + while ESX == nil do + TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + Citizen.Wait(0) + end end) function OpenMenu(submitCb, cancelCb, restrict) + local playerPed = PlayerPedId() - local playerPed = GetPlayerPed(-1) + TriggerEvent('skinchanger:getSkin', function(skin) + LastSkin = skin + end) - TriggerEvent('skinchanger:getSkin', function(skin) - LastSkin = skin - end) + TriggerEvent('skinchanger:getData', function(components, maxVals) + local elements = {} + local _components = {} - TriggerEvent('skinchanger:getData', function(components, maxVals) - - local elements = {} - local _components = {} - - -- Restrict menu - if restrict == nil then - for i=1, #components, 1 do - _components[i] = components[i] - end - else - for i=1, #components, 1 do - - local found = false - - for j=1, #restrict, 1 do - if components[i].name == restrict[j] then - found = true - end - end - - if found then - table.insert(_components, components[i]) - end - - end - end - - -- Insert elements - for i=1, #_components, 1 do - - local value = _components[i].value - local componentId = _components[i].componentId - - if componentId == 0 then - value = GetPedPropIndex(playerPed, _components[i].componentId) - end - - local data = { - label = _components[i].label, - name = _components[i].name, - value = value, - min = _components[i].min, - textureof = _components[i].textureof, - zoomOffset= _components[i].zoomOffset, - camOffset = _components[i].camOffset, - type = 'slider' - } - - for k,v in pairs(maxVals) do - if k == _components[i].name then - data.max = v - end - end - - table.insert(elements, data) - - end - - CreateSkinCam() - zoomOffset = _components[1].zoomOffset - camOffset = _components[1].camOffset - - ESX.UI.Menu.Open( - 'default', GetCurrentResourceName(), 'skin', - { - title = _U('skin_menu'), - align = 'top-left', - elements = elements - }, - function(data, menu) - - TriggerEvent('skinchanger:getSkin', function(skin) - LastSkin = skin - end) - - submitCb(data, menu) - DeleteSkinCam() - end, function(data, menu) - ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'confirm_escape', { - title = _U('confirm_escape'), - align = 'top-left', - elements = { - {label = _U('no'), value = 'no'}, - {label = _U('yes'), value = 'yes'} - } - }, function(data2, menu2) - if data2.current.value == 'yes' then - menu.close() - DeleteSkinCam() - TriggerEvent('skinchanger:loadSkin', LastSkin) + -- Restrict menu + if restrict == nil then + for i=1, #components, 1 do + _components[i] = components[i] end - menu2.close() - end) + else + for i=1, #components, 1 do + local found = false - if cancelCb ~= nil then - cancelCb(data, menu) + for j=1, #restrict, 1 do + if components[i].name == restrict[j] then + found = true + end + end + + if found then + table.insert(_components, components[i]) + end + end end - end,function(data, menu) - TriggerEvent('skinchanger:getSkin', function(skin) - zoomOffset = data.current.zoomOffset - camOffset = data.current.camOffset + -- Insert elements + for i=1, #_components, 1 do + local value = _components[i].value + local componentId = _components[i].componentId - if skin[data.current.name] ~= data.current.value then + if componentId == 0 then + value = GetPedPropIndex(playerPed, _components[i].componentId) + end - -- Change skin element - TriggerEvent('skinchanger:change', data.current.name, data.current.value) + local data = { + label = _components[i].label, + name = _components[i].name, + value = value, + min = _components[i].min, + textureof = _components[i].textureof, + zoomOffset= _components[i].zoomOffset, + camOffset = _components[i].camOffset, + type = 'slider' + } - -- Update max values - TriggerEvent('skinchanger:getData', function(components, maxVals) + for k,v in pairs(maxVals) do + if k == _components[i].name then + data.max = v + break + end + end - for i=1, #elements, 1 do + table.insert(elements, data) + end - local newData = {} + CreateSkinCam() + zoomOffset = _components[1].zoomOffset + camOffset = _components[1].camOffset - newData.max = maxVals[elements[i].name] + ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'skin', { + title = _U('skin_menu'), + align = 'top-left', + elements = elements + }, function(data, menu) - if elements[i].textureof ~= nil and data.current.name == elements[i].textureof then - newData.value = 0 - end + TriggerEvent('skinchanger:getSkin', function(skin) + LastSkin = skin + end) - menu.update({name = elements[i].name}, newData) + submitCb(data, menu) + DeleteSkinCam() + end, function(data, menu) + ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'confirm_escape', { + title = _U('confirm_escape'), + align = 'top-left', + elements = { + {label = _U('no'), value = 'no'}, + {label = _U('yes'), value = 'yes'} + } + }, function(data2, menu2) + if data2.current.value == 'yes' then + menu.close() + DeleteSkinCam() + TriggerEvent('skinchanger:loadSkin', LastSkin) + end - end + menu2.close() + end) - menu.refresh() + if cancelCb ~= nil then + cancelCb(data, menu) + end + end, function(data, menu) + TriggerEvent('skinchanger:getSkin', function(skin) + zoomOffset = data.current.zoomOffset + camOffset = data.current.camOffset - end) + if skin[data.current.name] ~= data.current.value then + -- Change skin element + TriggerEvent('skinchanger:change', data.current.name, data.current.value) - end + -- Update max values + TriggerEvent('skinchanger:getData', function(components, maxVals) + for i=1, #elements, 1 do + local newData = {} - end) + newData.max = maxVals[elements[i].name] - end, - function() - DeleteSkinCam() - end - ) + if elements[i].textureof ~= nil and data.current.name == elements[i].textureof then + newData.value = 0 + end - end) + menu.update({name = elements[i].name}, newData) + end + menu.refresh() + end) + end + end) + end, function(data, menu) + DeleteSkinCam() + end) + end) end function CreateSkinCam() - if not DoesCamExist(cam) then - cam = CreateCam('DEFAULT_SCRIPTED_CAMERA', true) - end - SetCamActive(cam, true) - RenderScriptCams(true, true, 500, true, true) - isCameraActive = true - SetCamRot(cam, 0.0, 0.0, 270.0, true) - SetEntityHeading(playerPed, 90.0) + if not DoesCamExist(cam) then + cam = CreateCam('DEFAULT_SCRIPTED_CAMERA', true) + end + + SetCamActive(cam, true) + RenderScriptCams(true, true, 500, true, true) + + isCameraActive = true + SetCamRot(cam, 0.0, 0.0, 270.0, true) + SetEntityHeading(playerPed, 90.0) end function DeleteSkinCam() - isCameraActive = false - SetCamActive(cam, false) - RenderScriptCams(false, true, 500, true, true) - cam = nil + isCameraActive = false + SetCamActive(cam, false) + RenderScriptCams(false, true, 500, true, true) + cam = nil end Citizen.CreateThread(function() - while true do - Citizen.Wait(0) - if isCameraActive then - DisableControlAction(2, 30, true) - DisableControlAction(2, 31, true) - DisableControlAction(2, 32, true) - DisableControlAction(2, 33, true) - DisableControlAction(2, 34, true) - DisableControlAction(2, 35, true) + while true do + Citizen.Wait(0) - DisableControlAction(0, 25, true) -- Input Aim - DisableControlAction(0, 24, true) -- Input Attack + if isCameraActive then + DisableControlAction(2, 30, true) + DisableControlAction(2, 31, true) + DisableControlAction(2, 32, true) + DisableControlAction(2, 33, true) + DisableControlAction(2, 34, true) + DisableControlAction(2, 35, true) + DisableControlAction(0, 25, true) -- Input Aim + DisableControlAction(0, 24, true) -- Input Attack - local playerPed = GetPlayerPed(-1) - local coords = GetEntityCoords(playerPed) + local playerPed = PlayerPedId() + local coords = GetEntityCoords(playerPed) - local angle = heading * math.pi / 180.0 - local theta = { - x = math.cos(angle), - y = math.sin(angle) - } - local pos = { - x = coords.x + (zoomOffset * theta.x), - y = coords.y + (zoomOffset * theta.y), - } + local angle = heading * math.pi / 180.0 + local theta = { + x = math.cos(angle), + y = math.sin(angle) + } - local angleToLook = heading - 140.0 - if angleToLook > 360 then - angleToLook = angleToLook - 360 - elseif angleToLook < 0 then - angleToLook = angleToLook + 360 - end - angleToLook = angleToLook * math.pi / 180.0 - local thetaToLook = { - x = math.cos(angleToLook), - y = math.sin(angleToLook) - } - local posToLook = { - x = coords.x + (zoomOffset * thetaToLook.x), - y = coords.y + (zoomOffset * thetaToLook.y), - } + local pos = { + x = coords.x + (zoomOffset * theta.x), + y = coords.y + (zoomOffset * theta.y) + } - SetCamCoord(cam, pos.x, pos.y, coords.z + camOffset) - PointCamAtCoord(cam, posToLook.x, posToLook.y, coords.z + camOffset) + local angleToLook = heading - 140.0 + if angleToLook > 360 then + angleToLook = angleToLook - 360 + elseif angleToLook < 0 then + angleToLook = angleToLook + 360 + end - SetTextComponentFormat("STRING") - AddTextComponentString(_U('use_rotate_view')) - DisplayHelpTextFromStringLabel(0, 0, 0, -1) - end - end + angleToLook = angleToLook * math.pi / 180.0 + local thetaToLook = { + x = math.cos(angleToLook), + y = math.sin(angleToLook) + } + + local posToLook = { + x = coords.x + (zoomOffset * thetaToLook.x), + y = coords.y + (zoomOffset * thetaToLook.y) + } + + SetCamCoord(cam, pos.x, pos.y, coords.z + camOffset) + PointCamAtCoord(cam, posToLook.x, posToLook.y, coords.z + camOffset) + + ESX.ShowHelpNotification(_U('use_rotate_view')) + else + Citizen.Wait(500) + end + end end) Citizen.CreateThread(function() - local angle = 90 - while true do - Citizen.Wait(0) - if isCameraActive then - if IsControlPressed(0, 108) then - angle = angle - 1 - elseif IsControlPressed(0, 109) then - angle = angle + 1 - end - if angle > 360 then - angle = angle - 360 - elseif angle < 0 then - angle = angle + 360 - end - heading = angle + 0.0 - end - end + local angle = 90 + + while true do + Citizen.Wait(0) + + if isCameraActive then + if IsControlPressed(0, Keys['N4']) then + angle = angle - 1 + elseif IsControlPressed(0, 109) then + angle = angle + 1 + end + + if angle > 360 then + angle = angle - 360 + elseif angle < 0 then + angle = angle + 360 + end + + heading = angle + 0.0 + else + Citizen.Wait(500) + end + end end) function OpenSaveableMenu(submitCb, cancelCb, restrict) + TriggerEvent('skinchanger:getSkin', function(skin) + LastSkin = skin + end) - TriggerEvent('skinchanger:getSkin', function(skin) - LastSkin = skin - end) + OpenMenu(function(data, menu) + menu.close() + DeleteSkinCam() - OpenMenu(function(data, menu) - - menu.close() - - DeleteSkinCam() - - TriggerEvent('skinchanger:getSkin', function(skin) - - TriggerServerEvent('esx_skin:save', skin) - - if submitCb ~= nil then - submitCb(data, menu) - end - - end) - - end, cancelCb, restrict) + TriggerEvent('skinchanger:getSkin', function(skin) + TriggerServerEvent('esx_skin:save', skin) + if submitCb ~= nil then + submitCb(data, menu) + end + end) + end, cancelCb, restrict) end AddEventHandler('playerSpawned', function() + Citizen.CreateThread(function() + while not PlayerLoaded do + Citizen.Wait(10) + end - Citizen.CreateThread(function() - - while not PlayerLoaded do - Citizen.Wait(0) - end - - if FirstSpawn then - - ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin, jobSkin) - - if skin == nil then - TriggerEvent('skinchanger:loadSkin', {sex = 0}, OpenSaveableMenu) - else - TriggerEvent('skinchanger:loadSkin', skin) - end - - end) - - FirstSpawn = false - - end - - end) + if FirstSpawn then + ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin, jobSkin) + if skin == nil then + TriggerEvent('skinchanger:loadSkin', {sex = 0}, OpenSaveableMenu) + else + TriggerEvent('skinchanger:loadSkin', skin) + end + end) + FirstSpawn = false + end + end) end) RegisterNetEvent('esx:playerLoaded') AddEventHandler('esx:playerLoaded', function(xPlayer) - PlayerLoaded = true + PlayerLoaded = true end) AddEventHandler('esx_skin:getLastSkin', function(cb) - cb(LastSkin) + cb(LastSkin) end) AddEventHandler('esx_skin:setLastSkin', function(skin) - LastSkin = skin + LastSkin = skin end) RegisterNetEvent('esx_skin:openMenu') AddEventHandler('esx_skin:openMenu', function(submitCb, cancelCb) - OpenMenu(submitCb, cancelCb, nil) + OpenMenu(submitCb, cancelCb, nil) end) RegisterNetEvent('esx_skin:openRestrictedMenu') AddEventHandler('esx_skin:openRestrictedMenu', function(submitCb, cancelCb, restrict) - OpenMenu(submitCb, cancelCb, restrict) + OpenMenu(submitCb, cancelCb, restrict) end) RegisterNetEvent('esx_skin:openSaveableMenu') AddEventHandler('esx_skin:openSaveableMenu', function(submitCb, cancelCb) - OpenSaveableMenu(submitCb, cancelCb, nil) + OpenSaveableMenu(submitCb, cancelCb, nil) end) RegisterNetEvent('esx_skin:openSaveableRestrictedMenu') AddEventHandler('esx_skin:openSaveableRestrictedMenu', function(submitCb, cancelCb, restrict) - OpenSaveableMenu(submitCb, cancelCb, restrict) + OpenSaveableMenu(submitCb, cancelCb, restrict) end) RegisterNetEvent('esx_skin:requestSaveSkin') AddEventHandler('esx_skin:requestSaveSkin', function() - TriggerEvent('skinchanger:getSkin', function(skin) - TriggerServerEvent('esx_skin:responseSaveSkin', skin) - end) -end) \ No newline at end of file + TriggerEvent('skinchanger:getSkin', function(skin) + TriggerServerEvent('esx_skin:responseSaveSkin', skin) + end) +end) diff --git a/server/main.lua b/server/main.lua index 2528f460..5a9ff59c 100644 --- a/server/main.lua +++ b/server/main.lua @@ -4,69 +4,55 @@ TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) RegisterServerEvent('esx_skin:save') AddEventHandler('esx_skin:save', function(skin) + local xPlayer = ESX.GetPlayerFromId(source) - local xPlayer = ESX.GetPlayerFromId(source) - - MySQL.Async.execute( - 'UPDATE users SET `skin` = @skin WHERE identifier = @identifier', - { - ['@skin'] = json.encode(skin), - ['@identifier'] = xPlayer.identifier - } - ) - + MySQL.Async.execute('UPDATE users SET `skin` = @skin WHERE identifier = @identifier', + { + ['@skin'] = json.encode(skin), + ['@identifier'] = xPlayer.identifier + }) end) RegisterServerEvent('esx_skin:responseSaveSkin') AddEventHandler('esx_skin:responseSaveSkin', function(skin) + local file = io.open('resources/[esx]/esx_skin/skins.txt', "a") - local file = io.open('resources/[esx]/esx_skin/skins.txt', "a") - - file:write(json.encode(skin) .. "\n\n") - file:flush() - file:close() - + file:write(json.encode(skin) .. "\n\n") + file:flush() + file:close() end) ESX.RegisterServerCallback('esx_skin:getPlayerSkin', function(source, cb) + local xPlayer = ESX.GetPlayerFromId(source) - local xPlayer = ESX.GetPlayerFromId(source) + MySQL.Async.fetchAll('SELECT * FROM users WHERE identifier = @identifier', { + ['@identifier'] = xPlayer.identifier + }, function(users) + local user = users[1] + local skin = nil - MySQL.Async.fetchAll( - 'SELECT * FROM users WHERE identifier = @identifier', - { - ['@identifier'] = xPlayer.identifier - }, - function(users) + local jobSkin = { + skin_male = xPlayer.job.skin_male, + skin_female = xPlayer.job.skin_female + } - local user = users[1] - local skin = nil - - local jobSkin = { - skin_male = xPlayer.job.skin_male, - skin_female = xPlayer.job.skin_female - } - - if user.skin ~= nil then - skin = json.decode(user.skin) - end - - cb(skin, jobSkin) - - end - ) + if user.skin ~= nil then + skin = json.decode(user.skin) + end + cb(skin, jobSkin) + end) end) -- Commands TriggerEvent('es:addGroupCommand', 'skin', 'admin', function(source, args, user) - TriggerClientEvent('esx_skin:openSaveableMenu', source) + TriggerClientEvent('esx_skin:openSaveableMenu', source) end, function(source, args, user) - TriggerClientEvent('chatMessage', source, "SYSTEM", {255, 0, 0}, 'Insufficient permissions!') + TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', 'Insufficient Permissions.' } }) end, {help = _U('skin')}) TriggerEvent('es:addGroupCommand', 'skinsave', 'admin', function(source, args, user) - TriggerClientEvent('esx_skin:requestSaveSkin', source) + TriggerClientEvent('esx_skin:requestSaveSkin', source) end, function(source, args, user) - TriggerClientEvent('chatMessage', source, "SYSTEM", {255, 0, 0}, "Insufficient Permissions.") + TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', 'Insufficient Permissions.' } }) end, {help = _U('saveskin')}) From 2bad03e88a02cf7ae693103b99bddcd77d6a7f6f Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 4 Nov 2018 12:32:28 +0100 Subject: [PATCH 40/66] Removed confirm escape --- client/main.lua | 27 +++++++-------------------- locales/br.lua | 3 --- locales/de.lua | 3 --- locales/en.lua | 3 --- locales/fi.lua | 3 --- locales/fr.lua | 3 --- locales/pl.lua | 3 --- locales/sv.lua | 3 --- 8 files changed, 7 insertions(+), 41 deletions(-) diff --git a/client/main.lua b/client/main.lua index de8bee5b..eb5fa08c 100644 --- a/client/main.lua +++ b/client/main.lua @@ -65,7 +65,7 @@ function OpenMenu(submitCb, cancelCb, restrict) local componentId = _components[i].componentId if componentId == 0 then - value = GetPedPropIndex(playerPed, _components[i].componentId) + value = GetPedPropIndex(playerPed, _components[i].componentId) end local data = { @@ -94,11 +94,10 @@ function OpenMenu(submitCb, cancelCb, restrict) camOffset = _components[1].camOffset ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'skin', { - title = _U('skin_menu'), - align = 'top-left', + title = _U('skin_menu'), + align = 'top-left', elements = elements }, function(data, menu) - TriggerEvent('skinchanger:getSkin', function(skin) LastSkin = skin end) @@ -106,22 +105,9 @@ function OpenMenu(submitCb, cancelCb, restrict) submitCb(data, menu) DeleteSkinCam() end, function(data, menu) - ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'confirm_escape', { - title = _U('confirm_escape'), - align = 'top-left', - elements = { - {label = _U('no'), value = 'no'}, - {label = _U('yes'), value = 'yes'} - } - }, function(data2, menu2) - if data2.current.value == 'yes' then - menu.close() - DeleteSkinCam() - TriggerEvent('skinchanger:loadSkin', LastSkin) - end - - menu2.close() - end) + menu.close() + DeleteSkinCam() + TriggerEvent('skinchanger:loadSkin', LastSkin) if cancelCb ~= nil then cancelCb(data, menu) @@ -272,6 +258,7 @@ function OpenSaveableMenu(submitCb, cancelCb, restrict) TriggerEvent('skinchanger:getSkin', function(skin) TriggerServerEvent('esx_skin:save', skin) + if submitCb ~= nil then submitCb(data, menu) end diff --git a/locales/br.lua b/locales/br.lua index 52eb7d1c..2a9d09d4 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -3,7 +3,4 @@ Locales['br'] = { ['use_rotate_view'] = 'Use ~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ e ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ para girar a visão.', ['skin'] = 'Trocar', ['saveskin'] = 'Salvar', - ['confirm_escape'] = 'do you want to cancel the skin changer? All changes go unsaved.', - ['no'] = 'no', - ['yes'] = 'yes', } diff --git a/locales/de.lua b/locales/de.lua index 25bc1c4f..f1439358 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -3,7 +3,4 @@ Locales['de'] = { ['use_rotate_view'] = 'benutze ~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ und ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ um die Sicht zu drehen.', ['skin'] = 'Skin ändern', ['saveskin'] = 'Skin speichern', - ['confirm_escape'] = 'do you want to cancel the skin changer? All changes go unsaved.', - ['no'] = 'no', - ['yes'] = 'yes', } diff --git a/locales/en.lua b/locales/en.lua index 1fb10930..f1ee073e 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -3,7 +3,4 @@ Locales['en'] = { ['use_rotate_view'] = 'use ~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ and ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ to rotate the view.', ['skin'] = 'change skin', ['saveskin'] = 'save skin to a file', - ['confirm_escape'] = 'do you want to cancel the skin changer? All changes go unsaved.', - ['no'] = 'no', - ['yes'] = 'yes', } diff --git a/locales/fi.lua b/locales/fi.lua index 1ea163a5..39e6d75f 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -3,7 +3,4 @@ Locales['fi'] = { ['use_rotate_view'] = 'paina ~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ tai ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ liikutaaksesi kameraa.', ['skin'] = 'vaihda ulkonäköä', ['saveskin'] = 'talleta ulkonäkö tiedostoon', - ['confirm_escape'] = 'do you want to cancel the skin changer? All changes go unsaved.', - ['no'] = 'no', - ['yes'] = 'yes', } diff --git a/locales/fr.lua b/locales/fr.lua index c71b7723..22cfc7bc 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -3,7 +3,4 @@ Locales['fr'] = { ['use_rotate_view'] = 'utilisez ~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ et ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ pour tourner la vue.', ['skin'] = 'changer de skin', ['saveskin'] = 'sauvegarder skin dans un fichier', - ['confirm_escape'] = 'do you want to cancel the skin changer? All changes go unsaved.', - ['no'] = 'no', - ['yes'] = 'yes', } diff --git a/locales/pl.lua b/locales/pl.lua index 173fad3e..3961df62 100644 --- a/locales/pl.lua +++ b/locales/pl.lua @@ -3,7 +3,4 @@ Locales['pl'] = { ['use_rotate_view'] = 'użyj ~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ i ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ aby obrócić ekran.', ['skin'] = 'zmien wygląd', ['saveskin'] = 'zapisz wygląd do pliku', - ['confirm_escape'] = 'czy chcesz anulować zmianę wyglądu? Wszystkie zmiany zostaną utracone.', - ['no'] = 'nie', - ['yes'] = 'tak', } diff --git a/locales/sv.lua b/locales/sv.lua index 8f3dfcf8..02ddd5f0 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -3,7 +3,4 @@ Locales['sv'] = { ['use_rotate_view'] = 'använd ~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ och ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ för att rotera.', ['skin'] = 'ändra skin', ['saveskin'] = 'spara skin till fil', - ['confirm_escape'] = 'vill du avbryta menyn? Alla ändringar går osparade.', - ['no'] = 'nej', - ['yes'] = 'ja', } From ee768270dd11a8046913769124fcceda1023b7f9 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 4 Nov 2018 12:33:22 +0100 Subject: [PATCH 41/66] Make sure only admin can write to disk #13 --- server/main.lua | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/server/main.lua b/server/main.lua index 5a9ff59c..7141a161 100644 --- a/server/main.lua +++ b/server/main.lua @@ -15,17 +15,27 @@ end) RegisterServerEvent('esx_skin:responseSaveSkin') AddEventHandler('esx_skin:responseSaveSkin', function(skin) - local file = io.open('resources/[esx]/esx_skin/skins.txt', "a") - file:write(json.encode(skin) .. "\n\n") - file:flush() - file:close() + TriggerEvent('es:getPlayerFromId', source, function(user) + TriggerEvent('es:canGroupTarget', user.getGroup(), "admin", function(available) + if available then + local file = io.open('resources/[esx]/esx_skin/skins.txt', "a") + + file:write(json.encode(skin) .. "\n\n") + file:flush() + file:close() + else + print(('esx_skin: %s attempted saving skin to file'):format(user.getIdentifier())) + end + end) + end) + end) ESX.RegisterServerCallback('esx_skin:getPlayerSkin', function(source, cb) local xPlayer = ESX.GetPlayerFromId(source) - MySQL.Async.fetchAll('SELECT * FROM users WHERE identifier = @identifier', { + MySQL.Async.fetchAll('SELECT skin FROM users WHERE identifier = @identifier', { ['@identifier'] = xPlayer.identifier }, function(users) local user = users[1] From ce687ff579343b3dbf3ce51b8ce9c721fe9545d4 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 4 Nov 2018 12:35:11 +0100 Subject: [PATCH 42/66] Manal pr closes #12 --- locales/pl.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/pl.lua b/locales/pl.lua index 3961df62..9458a7a4 100644 --- a/locales/pl.lua +++ b/locales/pl.lua @@ -1,6 +1,6 @@ Locales['pl'] = { ['skin_menu'] = 'menu wyglądu', ['use_rotate_view'] = 'użyj ~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ i ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ aby obrócić ekran.', - ['skin'] = 'zmien wygląd', + ['skin'] = 'zmień wygląd', ['saveskin'] = 'zapisz wygląd do pliku', } From 9b720acb607d616a1e6f890644f65011ae62829e Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Tue, 19 Mar 2019 22:22:30 +0100 Subject: [PATCH 43/66] Workaround for memory leak #19 --- client/main.lua | 55 ++++++++++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/client/main.lua b/client/main.lua index eb5fa08c..f89fb1aa 100644 --- a/client/main.lua +++ b/client/main.lua @@ -113,32 +113,39 @@ function OpenMenu(submitCb, cancelCb, restrict) cancelCb(data, menu) end end, function(data, menu) - TriggerEvent('skinchanger:getSkin', function(skin) - zoomOffset = data.current.zoomOffset - camOffset = data.current.camOffset + local skin, components, maxVals - if skin[data.current.name] ~= data.current.value then - -- Change skin element - TriggerEvent('skinchanger:change', data.current.name, data.current.value) - - -- Update max values - TriggerEvent('skinchanger:getData', function(components, maxVals) - for i=1, #elements, 1 do - local newData = {} - - newData.max = maxVals[elements[i].name] - - if elements[i].textureof ~= nil and data.current.name == elements[i].textureof then - newData.value = 0 - end - - menu.update({name = elements[i].name}, newData) - end - - menu.refresh() - end) - end + TriggerEvent('skinchanger:getSkin', function(getSkin) + skin = getSkin end) + + zoomOffset = data.current.zoomOffset + camOffset = data.current.camOffset + + if skin[data.current.name] ~= data.current.value then + -- Change skin element + TriggerEvent('skinchanger:change', data.current.name, data.current.value) + + -- Update max values + TriggerEvent('skinchanger:getData', function(comp, max) + components, maxVals = comp, max + end) + + local newData = {} + + for i=1, #elements, 1 do + newData = {} + newData.max = maxVals[elements[i].name] + + if elements[i].textureof ~= nil and data.current.name == elements[i].textureof then + newData.value = 0 + end + + menu.update({name = elements[i].name}, newData) + end + + menu.refresh() + end end, function(data, menu) DeleteSkinCam() end) From 01787edb2f28c2a5591312f06ed36c696a2ed0a2 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 16 Jun 2019 13:07:33 +0200 Subject: [PATCH 44/66] Minor cleanup --- client/main.lua | 48 +++++++++++++++--------------------------------- config.lua | 1 + server/main.lua | 10 ++++------ 3 files changed, 20 insertions(+), 39 deletions(-) diff --git a/client/main.lua b/client/main.lua index f89fb1aa..c2189568 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,24 +1,6 @@ -local Keys = { - ["ESC"] = 322, ["F1"] = 288, ["F2"] = 289, ["F3"] = 170, ["F5"] = 166, ["F6"] = 167, ["F7"] = 168, ["F8"] = 169, ["F9"] = 56, ["F10"] = 57, - ["~"] = 243, ["1"] = 157, ["2"] = 158, ["3"] = 160, ["4"] = 164, ["5"] = 165, ["6"] = 159, ["7"] = 161, ["8"] = 162, ["9"] = 163, ["-"] = 84, ["="] = 83, ["BACKSPACE"] = 177, - ["TAB"] = 37, ["Q"] = 44, ["W"] = 32, ["E"] = 38, ["R"] = 45, ["T"] = 245, ["Y"] = 246, ["U"] = 303, ["P"] = 199, ["["] = 39, ["]"] = 40, ["ENTER"] = 18, - ["CAPS"] = 137, ["A"] = 34, ["S"] = 8, ["D"] = 9, ["F"] = 23, ["G"] = 47, ["H"] = 74, ["K"] = 311, ["L"] = 182, - ["LEFTSHIFT"] = 21, ["Z"] = 20, ["X"] = 73, ["C"] = 26, ["V"] = 0, ["B"] = 29, ["N"] = 249, ["M"] = 244, [","] = 82, ["."] = 81, - ["LEFTCTRL"] = 36, ["LEFTALT"] = 19, ["SPACE"] = 22, ["RIGHTCTRL"] = 70, - ["HOME"] = 213, ["PAGEUP"] = 10, ["PAGEDOWN"] = 11, ["DELETE"] = 178, - ["LEFT"] = 174, ["RIGHT"] = 175, ["TOP"] = 27, ["DOWN"] = 173, - ["NENTER"] = 201, ["N4"] = 108, ["N5"] = 60, ["N6"] = 107, ["N+"] = 96, ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118 -} - -ESX = nil -local FirstSpawn = true -local LastSkin = nil -local PlayerLoaded = false -local cam = nil -local isCameraActive = false -local zoomOffset = 0.0 -local camOffset = 0.0 -local heading = 90.0 +ESX = nil +local lastSkin, playerLoaded, cam, isCameraActive +local firstSpawn, zoomOffset, camOffset, heading = true, 0.0, 0.0, 90.0 Citizen.CreateThread(function() while ESX == nil do @@ -31,7 +13,7 @@ function OpenMenu(submitCb, cancelCb, restrict) local playerPed = PlayerPedId() TriggerEvent('skinchanger:getSkin', function(skin) - LastSkin = skin + lastSkin = skin end) TriggerEvent('skinchanger:getData', function(components, maxVals) @@ -99,7 +81,7 @@ function OpenMenu(submitCb, cancelCb, restrict) elements = elements }, function(data, menu) TriggerEvent('skinchanger:getSkin', function(skin) - LastSkin = skin + lastSkin = skin end) submitCb(data, menu) @@ -107,7 +89,7 @@ function OpenMenu(submitCb, cancelCb, restrict) end, function(data, menu) menu.close() DeleteSkinCam() - TriggerEvent('skinchanger:loadSkin', LastSkin) + TriggerEvent('skinchanger:loadSkin', lastSkin) if cancelCb ~= nil then cancelCb(data, menu) @@ -235,7 +217,7 @@ Citizen.CreateThread(function() Citizen.Wait(0) if isCameraActive then - if IsControlPressed(0, Keys['N4']) then + if IsControlPressed(0, 108) then angle = angle - 1 elseif IsControlPressed(0, 109) then angle = angle + 1 @@ -256,7 +238,7 @@ end) function OpenSaveableMenu(submitCb, cancelCb, restrict) TriggerEvent('skinchanger:getSkin', function(skin) - LastSkin = skin + lastSkin = skin end) OpenMenu(function(data, menu) @@ -276,11 +258,11 @@ end AddEventHandler('playerSpawned', function() Citizen.CreateThread(function() - while not PlayerLoaded do - Citizen.Wait(10) + while not playerLoaded do + Citizen.Wait(100) end - if FirstSpawn then + if firstSpawn then ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin, jobSkin) if skin == nil then TriggerEvent('skinchanger:loadSkin', {sex = 0}, OpenSaveableMenu) @@ -289,22 +271,22 @@ AddEventHandler('playerSpawned', function() end end) - FirstSpawn = false + firstSpawn = false end end) end) RegisterNetEvent('esx:playerLoaded') AddEventHandler('esx:playerLoaded', function(xPlayer) - PlayerLoaded = true + playerLoaded = true end) AddEventHandler('esx_skin:getLastSkin', function(cb) - cb(LastSkin) + cb(lastSkin) end) AddEventHandler('esx_skin:setLastSkin', function(skin) - LastSkin = skin + lastSkin = skin end) RegisterNetEvent('esx_skin:openMenu') diff --git a/config.lua b/config.lua index 56a8b5e9..1875b978 100644 --- a/config.lua +++ b/config.lua @@ -1,2 +1,3 @@ Config = {} + Config.Locale = 'fr' diff --git a/server/main.lua b/server/main.lua index 7141a161..b2dc4b12 100644 --- a/server/main.lua +++ b/server/main.lua @@ -6,9 +6,8 @@ RegisterServerEvent('esx_skin:save') AddEventHandler('esx_skin:save', function(skin) local xPlayer = ESX.GetPlayerFromId(source) - MySQL.Async.execute('UPDATE users SET `skin` = @skin WHERE identifier = @identifier', - { - ['@skin'] = json.encode(skin), + MySQL.Async.execute('UPDATE users SET skin = @skin WHERE identifier = @identifier', { + ['@skin'] = json.encode(skin), ['@identifier'] = xPlayer.identifier }) end) @@ -38,15 +37,14 @@ ESX.RegisterServerCallback('esx_skin:getPlayerSkin', function(source, cb) MySQL.Async.fetchAll('SELECT skin FROM users WHERE identifier = @identifier', { ['@identifier'] = xPlayer.identifier }, function(users) - local user = users[1] - local skin = nil + local user, skin = users[1] local jobSkin = { skin_male = xPlayer.job.skin_male, skin_female = xPlayer.job.skin_female } - if user.skin ~= nil then + if user.skin then skin = json.decode(user.skin) end From e530a6d39ceb8220fd2828c399a82f20bf86c084 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 13 Oct 2019 20:59:11 +0200 Subject: [PATCH 45/66] Add support for new esx weight --- config.lua | 4 ++++ server/main.lua | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/config.lua b/config.lua index 1875b978..79d7c815 100644 --- a/config.lua +++ b/config.lua @@ -1,3 +1,7 @@ Config = {} Config.Locale = 'fr' + +Config.BackpackWeight = { + [40] = 16, [41] = 20, [44] = 25, [45] = 23 +} \ No newline at end of file diff --git a/server/main.lua b/server/main.lua index b2dc4b12..ee80b636 100644 --- a/server/main.lua +++ b/server/main.lua @@ -5,6 +5,14 @@ TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) RegisterServerEvent('esx_skin:save') AddEventHandler('esx_skin:save', function(skin) local xPlayer = ESX.GetPlayerFromId(source) + local defaultMaxWeight = ESX.GetConfig().MaxWeight + local backpackModifier = Config.BackpackWeight[skin.bags_1] + + if backpackModifier then + xPlayer.setMaxWeight(defaultMaxWeight + backpackModifier) + else + xPlayer.setMaxWeight(defaultMaxWeight) + end MySQL.Async.execute('UPDATE users SET skin = @skin WHERE identifier = @identifier', { ['@skin'] = json.encode(skin), From 8c2a00c4c473598ca2472275ceff796e89b111af Mon Sep 17 00:00:00 2001 From: rex2630 Date: Sun, 19 Jan 2020 17:38:02 +0100 Subject: [PATCH 46/66] Replace __resource.lua with fxmanifest.lua --- __resource.lua => fxmanifest.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) rename __resource.lua => fxmanifest.lua (89%) diff --git a/__resource.lua b/fxmanifest.lua similarity index 89% rename from __resource.lua rename to fxmanifest.lua index a45df0e0..e51331a6 100644 --- a/__resource.lua +++ b/fxmanifest.lua @@ -1,4 +1,6 @@ -resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' +fx_version 'adamant' + +game 'gta5' description 'ESX Skin' From e957ab62dafc95ed383e9b2e17d2f049d8a101e7 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 17 Feb 2020 21:44:14 +0100 Subject: [PATCH 47/66] Added missing sql file --- README.md | 3 ++- esx_skin.sql | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 esx_skin.sql diff --git a/README.md b/README.md index dc324102..64e2b8fc 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,7 @@ git clone https://github.com/ESX-Org/esx_skin [esx]/esx_skin - Put it in the `[esx]` directory ## Installation +- Import `esx_skin.sql` to your database - Add this in your `server.cfg`: ``` @@ -31,7 +32,7 @@ start esx_skin ### License esx_skin - skin selector for ESX -Copyright (C) 2015-2018 Jérémie N'gadi +Copyright (C) 2015-2020 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/esx_skin.sql b/esx_skin.sql new file mode 100644 index 00000000..43339a25 --- /dev/null +++ b/esx_skin.sql @@ -0,0 +1 @@ +ALTER TABLE `users` ADD COLUMN `skin` LONGTEXT NULL DEFAULT NULL; \ No newline at end of file From a27e3383b6b980582607a189e9343fb59e4c85de Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 17 Feb 2020 21:51:16 +0100 Subject: [PATCH 48/66] Update main.lua --- server/main.lua | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/server/main.lua b/server/main.lua index ee80b636..acac591a 100644 --- a/server/main.lua +++ b/server/main.lua @@ -60,15 +60,10 @@ ESX.RegisterServerCallback('esx_skin:getPlayerSkin', function(source, cb) end) end) --- Commands -TriggerEvent('es:addGroupCommand', 'skin', 'admin', function(source, args, user) - TriggerClientEvent('esx_skin:openSaveableMenu', source) -end, function(source, args, user) - TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', 'Insufficient Permissions.' } }) -end, {help = _U('skin')}) +ESX.RegisterCommand('skin', 'admin', function(xPlayer, args, showError) + xPlayer.triggerEvent('esx_skin:openSaveableMenu') +end, false, {help = _U('skin')}) -TriggerEvent('es:addGroupCommand', 'skinsave', 'admin', function(source, args, user) - TriggerClientEvent('esx_skin:requestSaveSkin', source) -end, function(source, args, user) - TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', 'Insufficient Permissions.' } }) -end, {help = _U('saveskin')}) +ESX.RegisterCommand('skinsave', 'admin', function(xPlayer, args, showError) + xPlayer.triggerEvent('esx_skin:requestSaveSkin') +end, false, {help = _U('saveskin')}) From 998b91e9712faa6d7b0a94804f0118069741342b Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 24 Feb 2020 21:43:50 +0100 Subject: [PATCH 49/66] Fixed leftover ES code --- server/main.lua | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/server/main.lua b/server/main.lua index acac591a..cd92fa3f 100644 --- a/server/main.lua +++ b/server/main.lua @@ -22,21 +22,17 @@ end) RegisterServerEvent('esx_skin:responseSaveSkin') AddEventHandler('esx_skin:responseSaveSkin', function(skin) + local xPlayer = ESX.GetPlayerFromId(source) - TriggerEvent('es:getPlayerFromId', source, function(user) - TriggerEvent('es:canGroupTarget', user.getGroup(), "admin", function(available) - if available then - local file = io.open('resources/[esx]/esx_skin/skins.txt', "a") - - file:write(json.encode(skin) .. "\n\n") - file:flush() - file:close() - else - print(('esx_skin: %s attempted saving skin to file'):format(user.getIdentifier())) - end - end) - end) + if xPlayer.getGroup() == 'admin' then + local file = io.open('resources/[esx]/esx_skin/skins.txt', "a") + file:write(json.encode(skin) .. "\n\n") + file:flush() + file:close() + else + print(('esx_skin: %s attempted saving skin to file'):format(xPlayer.getIdentifier())) + end end) ESX.RegisterServerCallback('esx_skin:getPlayerSkin', function(source, cb) From ffd21e2c930a7796abb672a4904830c7b6b6c81f Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Tue, 14 Apr 2020 16:53:01 +0200 Subject: [PATCH 50/66] Latest ESX code --- client/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/main.lua b/client/main.lua index c2189568..c5860818 100644 --- a/client/main.lua +++ b/client/main.lua @@ -256,7 +256,7 @@ function OpenSaveableMenu(submitCb, cancelCb, restrict) end, cancelCb, restrict) end -AddEventHandler('playerSpawned', function() +AddEventHandler('esx:onPlayerSpawn', function() Citizen.CreateThread(function() while not playerLoaded do Citizen.Wait(100) From eee001a86aca9a10abce4d4080a96240bf8c0d45 Mon Sep 17 00:00:00 2001 From: ArkSeyonet <31637812+ArkSeyonet@users.noreply.github.com> Date: Fri, 15 May 2020 19:12:36 -0500 Subject: [PATCH 51/66] 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. --- client/main.lua | 460 +++++++++++++++++++++++++----------------------- config.lua | 2 +- 2 files changed, 244 insertions(+), 218 deletions(-) diff --git a/client/main.lua b/client/main.lua index c5860818..60cf129a 100644 --- a/client/main.lua +++ b/client/main.lua @@ -3,315 +3,341 @@ local lastSkin, playerLoaded, cam, isCameraActive local firstSpawn, zoomOffset, camOffset, heading = true, 0.0, 0.0, 90.0 Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end + while ESX == nil do + TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + Citizen.Wait(0) + end end) function OpenMenu(submitCb, cancelCb, restrict) - local playerPed = PlayerPedId() + local playerPed = PlayerPedId() - TriggerEvent('skinchanger:getSkin', function(skin) - lastSkin = skin - end) + TriggerEvent('skinchanger:getSkin', function(skin) + lastSkin = skin + end) - TriggerEvent('skinchanger:getData', function(components, maxVals) - local elements = {} - local _components = {} + TriggerEvent('skinchanger:getData', function(components, maxVals) + local elements = {} + local _components = {} - -- Restrict menu - if restrict == nil then - for i=1, #components, 1 do - _components[i] = components[i] - end - else - for i=1, #components, 1 do - local found = false + -- Restrict menu + if restrict == nil then + for i=1, #components, 1 do + _components[i] = components[i] + end + else + for i=1, #components, 1 do + local found = false - for j=1, #restrict, 1 do - if components[i].name == restrict[j] then - found = true - end - end + for j=1, #restrict, 1 do + if components[i].name == restrict[j] then + found = true + end + end - if found then - table.insert(_components, components[i]) - end - end - end + if found then + table.insert(_components, components[i]) + end + end + end - -- Insert elements - for i=1, #_components, 1 do - local value = _components[i].value - local componentId = _components[i].componentId + -- Insert elements + for i=1, #_components, 1 do + local value = _components[i].value + local componentId = _components[i].componentId - if componentId == 0 then - value = GetPedPropIndex(playerPed, _components[i].componentId) - end + if componentId == 0 then + value = GetPedPropIndex(playerPed, _components[i].componentId) + end - local data = { - label = _components[i].label, - name = _components[i].name, - value = value, - min = _components[i].min, - textureof = _components[i].textureof, - zoomOffset= _components[i].zoomOffset, - camOffset = _components[i].camOffset, - type = 'slider' - } + local data = { + label = _components[i].label, + name = _components[i].name, + value = value, + min = _components[i].min, + textureof = _components[i].textureof, + zoomOffset= _components[i].zoomOffset, + camOffset = _components[i].camOffset, + type = 'slider' + } - for k,v in pairs(maxVals) do - if k == _components[i].name then - data.max = v - break - end - end + for k,v in pairs(maxVals) do + if k == _components[i].name then + data.max = v + break + end + end - table.insert(elements, data) - end + table.insert(elements, data) + end - CreateSkinCam() - zoomOffset = _components[1].zoomOffset - camOffset = _components[1].camOffset + CreateSkinCam() + zoomOffset = _components[1].zoomOffset + camOffset = _components[1].camOffset - ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'skin', { - title = _U('skin_menu'), - align = 'top-left', - elements = elements - }, function(data, menu) - TriggerEvent('skinchanger:getSkin', function(skin) - lastSkin = skin - end) + ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'skin', { + title = _U('skin_menu'), + align = 'top-left', + elements = elements + }, function(data, menu) + TriggerEvent('skinchanger:getSkin', function(skin) + lastSkin = skin + end) - submitCb(data, menu) - DeleteSkinCam() - end, function(data, menu) - menu.close() - DeleteSkinCam() - TriggerEvent('skinchanger:loadSkin', lastSkin) + submitCb(data, menu) + DeleteSkinCam() + end, function(data, menu) + menu.close() + DeleteSkinCam() + TriggerEvent('skinchanger:loadSkin', lastSkin) - if cancelCb ~= nil then - cancelCb(data, menu) - end - end, function(data, menu) - local skin, components, maxVals + if cancelCb ~= nil then + cancelCb(data, menu) + end + end, function(data, menu) + local skin, components, maxVals - TriggerEvent('skinchanger:getSkin', function(getSkin) - skin = getSkin - end) + TriggerEvent('skinchanger:getSkin', function(getSkin) + skin = getSkin + end) - zoomOffset = data.current.zoomOffset - camOffset = data.current.camOffset + zoomOffset = data.current.zoomOffset + camOffset = data.current.camOffset - if skin[data.current.name] ~= data.current.value then - -- Change skin element - TriggerEvent('skinchanger:change', data.current.name, data.current.value) + if skin[data.current.name] ~= data.current.value then + -- Change skin element + TriggerEvent('skinchanger:change', data.current.name, data.current.value) - -- Update max values - TriggerEvent('skinchanger:getData', function(comp, max) - components, maxVals = comp, max - end) + -- Update max values + TriggerEvent('skinchanger:getData', function(comp, max) + components, maxVals = comp, max + end) - local newData = {} + local newData = {} - for i=1, #elements, 1 do - newData = {} - newData.max = maxVals[elements[i].name] + for i=1, #elements, 1 do + newData = {} + newData.max = maxVals[elements[i].name] - if elements[i].textureof ~= nil and data.current.name == elements[i].textureof then - newData.value = 0 - end + if elements[i].textureof ~= nil and data.current.name == elements[i].textureof then + newData.value = 0 + end - menu.update({name = elements[i].name}, newData) - end + menu.update({name = elements[i].name}, newData) + end - menu.refresh() - end - end, function(data, menu) - DeleteSkinCam() - end) - end) + menu.refresh() + end + end, function(data, menu) + DeleteSkinCam() + end) + end) end function CreateSkinCam() - if not DoesCamExist(cam) then - cam = CreateCam('DEFAULT_SCRIPTED_CAMERA', true) - end + if not DoesCamExist(cam) then + cam = CreateCam('DEFAULT_SCRIPTED_CAMERA', true) + end - SetCamActive(cam, true) - RenderScriptCams(true, true, 500, true, true) + local playerPed = PlayerPedId() - isCameraActive = true - SetCamRot(cam, 0.0, 0.0, 270.0, true) - SetEntityHeading(playerPed, 90.0) + SetCamActive(cam, true) + RenderScriptCams(true, true, 500, true, true) + + isCameraActive = true + SetCamRot(cam, 0.0, 0.0, 270.0, true) + SetEntityHeading(playerPed, 0.0) end function DeleteSkinCam() - isCameraActive = false - SetCamActive(cam, false) - RenderScriptCams(false, true, 500, true, true) - cam = nil + isCameraActive = false + SetCamActive(cam, false) + RenderScriptCams(false, true, 500, true, true) + cam = nil end Citizen.CreateThread(function() - while true do - Citizen.Wait(0) + while true do + Citizen.Wait(0) - if isCameraActive then - DisableControlAction(2, 30, true) - DisableControlAction(2, 31, true) - DisableControlAction(2, 32, true) - DisableControlAction(2, 33, true) - DisableControlAction(2, 34, true) - DisableControlAction(2, 35, true) - DisableControlAction(0, 25, true) -- Input Aim - DisableControlAction(0, 24, true) -- Input Attack + if isCameraActive then + DisableControlAction(2, 30, true) + DisableControlAction(2, 31, true) + DisableControlAction(2, 32, true) + DisableControlAction(2, 33, true) + DisableControlAction(2, 34, true) + DisableControlAction(2, 35, true) + DisableControlAction(0, 25, true) -- Input Aim + DisableControlAction(0, 24, true) -- Input Attack - local playerPed = PlayerPedId() - local coords = GetEntityCoords(playerPed) + local playerPed = PlayerPedId() + local coords = GetEntityCoords(playerPed) - local angle = heading * math.pi / 180.0 - local theta = { - x = math.cos(angle), - y = math.sin(angle) - } + local angle = heading * math.pi / 180.0 + local theta = { + x = math.cos(angle), + y = math.sin(angle) + } - local pos = { - x = coords.x + (zoomOffset * theta.x), - y = coords.y + (zoomOffset * theta.y) - } + local pos = { + x = coords.x + (zoomOffset * theta.x), + y = coords.y + (zoomOffset * theta.y) + } - local angleToLook = heading - 140.0 - if angleToLook > 360 then - angleToLook = angleToLook - 360 - elseif angleToLook < 0 then - angleToLook = angleToLook + 360 - end + local angleToLook = heading - 140.0 + if angleToLook > 360 then + angleToLook = angleToLook - 360 + elseif angleToLook < 0 then + angleToLook = angleToLook + 360 + end - angleToLook = angleToLook * math.pi / 180.0 - local thetaToLook = { - x = math.cos(angleToLook), - y = math.sin(angleToLook) - } + angleToLook = angleToLook * math.pi / 180.0 + local thetaToLook = { + x = math.cos(angleToLook), + y = math.sin(angleToLook) + } - local posToLook = { - x = coords.x + (zoomOffset * thetaToLook.x), - y = coords.y + (zoomOffset * thetaToLook.y) - } + local posToLook = { + x = coords.x + (zoomOffset * thetaToLook.x), + y = coords.y + (zoomOffset * thetaToLook.y) + } - SetCamCoord(cam, pos.x, pos.y, coords.z + camOffset) - PointCamAtCoord(cam, posToLook.x, posToLook.y, coords.z + camOffset) + SetCamCoord(cam, pos.x, pos.y, coords.z + camOffset) + PointCamAtCoord(cam, posToLook.x, posToLook.y, coords.z + camOffset) - ESX.ShowHelpNotification(_U('use_rotate_view')) - else - Citizen.Wait(500) - end - end + ESX.ShowHelpNotification(_U('use_rotate_view')) + else + Citizen.Wait(500) + end + end end) Citizen.CreateThread(function() - local angle = 90 + local angle = 90 - while true do - Citizen.Wait(0) + while true do + Citizen.Wait(0) - if isCameraActive then - if IsControlPressed(0, 108) then - angle = angle - 1 - elseif IsControlPressed(0, 109) then - angle = angle + 1 - end + if isCameraActive then + if IsControlPressed(0, 108) then + angle = angle - 1 + elseif IsControlPressed(0, 109) then + angle = angle + 1 + end - if angle > 360 then - angle = angle - 360 - elseif angle < 0 then - angle = angle + 360 - end + if angle > 360 then + angle = angle - 360 + elseif angle < 0 then + angle = angle + 360 + end - heading = angle + 0.0 - else - Citizen.Wait(500) - end - end + heading = angle + 0.0 + else + Citizen.Wait(500) + end + end end) function OpenSaveableMenu(submitCb, cancelCb, restrict) - TriggerEvent('skinchanger:getSkin', function(skin) - lastSkin = skin - end) + TriggerEvent('skinchanger:getSkin', function(skin) + lastSkin = skin + end) - OpenMenu(function(data, menu) - menu.close() - DeleteSkinCam() + OpenMenu(function(data, menu) + menu.close() + DeleteSkinCam() - TriggerEvent('skinchanger:getSkin', function(skin) - TriggerServerEvent('esx_skin:save', skin) + TriggerEvent('skinchanger:getSkin', function(skin) + TriggerServerEvent('esx_skin:save', skin) - if submitCb ~= nil then - submitCb(data, menu) - end - end) + if submitCb ~= nil then + submitCb(data, menu) + end + end) - end, cancelCb, restrict) + end, cancelCb, restrict) end -AddEventHandler('esx:onPlayerSpawn', function() - Citizen.CreateThread(function() - while not playerLoaded do - Citizen.Wait(100) - end +-- AddEventHandler('esx:onPlayerSpawn', function() +-- Citizen.CreateThread(function() +-- while not playerLoaded do +-- Citizen.Wait(100) +-- end - if firstSpawn then - ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin, jobSkin) - if skin == nil then - TriggerEvent('skinchanger:loadSkin', {sex = 0}, OpenSaveableMenu) - else - TriggerEvent('skinchanger:loadSkin', skin) - end - end) +-- if firstSpawn then +-- ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin, jobSkin) +-- if skin == nil then +-- TriggerEvent('skinchanger:loadSkin', {sex = 0}, OpenSaveableMenu) +-- else +-- TriggerEvent('skinchanger:loadSkin', skin) +-- end +-- end) - firstSpawn = false - end - end) +-- firstSpawn = false +-- end +-- end) +-- end) + +AddEventHandler('esx_skin:resetFirstSpawn', function() + firstSpawn = true +end) + +AddEventHandler('esx_skin:playerRegistered', function() + Citizen.CreateThread(function() + while not playerLoaded do + Citizen.Wait(100) + end + + if firstSpawn then + ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin, jobSkin) + if skin == nil then + TriggerEvent('skinchanger:loadSkin', {sex = 0}, OpenSaveableMenu) + else + TriggerEvent('skinchanger:loadSkin', skin) + end + end) + + firstSpawn = false + end + end) end) RegisterNetEvent('esx:playerLoaded') AddEventHandler('esx:playerLoaded', function(xPlayer) - playerLoaded = true + playerLoaded = true end) AddEventHandler('esx_skin:getLastSkin', function(cb) - cb(lastSkin) + cb(lastSkin) end) AddEventHandler('esx_skin:setLastSkin', function(skin) - lastSkin = skin + lastSkin = skin end) RegisterNetEvent('esx_skin:openMenu') AddEventHandler('esx_skin:openMenu', function(submitCb, cancelCb) - OpenMenu(submitCb, cancelCb, nil) + OpenMenu(submitCb, cancelCb, nil) end) RegisterNetEvent('esx_skin:openRestrictedMenu') AddEventHandler('esx_skin:openRestrictedMenu', function(submitCb, cancelCb, restrict) - OpenMenu(submitCb, cancelCb, restrict) + OpenMenu(submitCb, cancelCb, restrict) end) RegisterNetEvent('esx_skin:openSaveableMenu') AddEventHandler('esx_skin:openSaveableMenu', function(submitCb, cancelCb) - OpenSaveableMenu(submitCb, cancelCb, nil) + OpenSaveableMenu(submitCb, cancelCb, nil) end) RegisterNetEvent('esx_skin:openSaveableRestrictedMenu') AddEventHandler('esx_skin:openSaveableRestrictedMenu', function(submitCb, cancelCb, restrict) - OpenSaveableMenu(submitCb, cancelCb, restrict) + OpenSaveableMenu(submitCb, cancelCb, restrict) end) RegisterNetEvent('esx_skin:requestSaveSkin') AddEventHandler('esx_skin:requestSaveSkin', function() - TriggerEvent('skinchanger:getSkin', function(skin) - TriggerServerEvent('esx_skin:responseSaveSkin', skin) - end) + TriggerEvent('skinchanger:getSkin', function(skin) + TriggerServerEvent('esx_skin:responseSaveSkin', skin) + end) end) diff --git a/config.lua b/config.lua index 79d7c815..5c06ca16 100644 --- a/config.lua +++ b/config.lua @@ -1,6 +1,6 @@ Config = {} -Config.Locale = 'fr' +Config.Locale = 'en' Config.BackpackWeight = { [40] = 16, [41] = 20, [44] = 25, [45] = 23 From 0319cf7ec4912e8bc4b6271330a5ee1e7e7c581e Mon Sep 17 00:00:00 2001 From: ArkSeyonet <31637812+ArkSeyonet@users.noreply.github.com> Date: Fri, 15 May 2020 19:13:10 -0500 Subject: [PATCH 52/66] Fix default locale --- config.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.lua b/config.lua index 5c06ca16..2fdd3003 100644 --- a/config.lua +++ b/config.lua @@ -1,7 +1,7 @@ Config = {} -Config.Locale = 'en' +Config.Locale = 'fr' Config.BackpackWeight = { [40] = 16, [41] = 20, [44] = 25, [45] = 23 -} \ No newline at end of file +} From 718c0c88456a1b76cfbc41c44871543697b6754c Mon Sep 17 00:00:00 2001 From: ArkSeyonet <31637812+ArkSeyonet@users.noreply.github.com> Date: Mon, 20 Jul 2020 09:15:58 -0500 Subject: [PATCH 53/66] Update ESX Skin (#58) - Fix breaking nui by pressing keys before loaded --- client/main.lua | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/client/main.lua b/client/main.lua index 60cf129a..5b589f07 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,6 +1,6 @@ ESX = nil local lastSkin, playerLoaded, cam, isCameraActive -local firstSpawn, zoomOffset, camOffset, heading = true, 0.0, 0.0, 90.0 +local firstSpawn, zoomOffset, camOffset, heading, skinLoaded = true, 0.0, 0.0, 90.0, false Citizen.CreateThread(function() while ESX == nil do @@ -160,7 +160,7 @@ Citizen.CreateThread(function() while true do Citizen.Wait(0) - if isCameraActive then + if not skinLoaded or isCameraActive then DisableControlAction(2, 30, true) DisableControlAction(2, 31, true) DisableControlAction(2, 32, true) @@ -280,6 +280,7 @@ end AddEventHandler('esx_skin:resetFirstSpawn', function() firstSpawn = true + skinLoaded = false end) AddEventHandler('esx_skin:playerRegistered', function() @@ -292,8 +293,12 @@ AddEventHandler('esx_skin:playerRegistered', function() ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin, jobSkin) if skin == nil then TriggerEvent('skinchanger:loadSkin', {sex = 0}, OpenSaveableMenu) + Citizen.Wait(100) + skinLoaded = true else TriggerEvent('skinchanger:loadSkin', skin) + Citizen.Wait(100) + skinLoaded = true end end) From ebabbd49badf4d9b7553024159ccb47bc3e705d6 Mon Sep 17 00:00:00 2001 From: Kevin O'Byrne <62954271+TehZombiJesus@users.noreply.github.com> Date: Mon, 20 Jul 2020 10:16:15 -0400 Subject: [PATCH 54/66] Update esx_skin.sql (#51) --- esx_skin.sql | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/esx_skin.sql b/esx_skin.sql index 43339a25..193a02c8 100644 --- a/esx_skin.sql +++ b/esx_skin.sql @@ -1 +1,3 @@ -ALTER TABLE `users` ADD COLUMN `skin` LONGTEXT NULL DEFAULT NULL; \ No newline at end of file +USE `es_extended`; + +ALTER TABLE `users` ADD COLUMN `skin` LONGTEXT NULL DEFAULT NULL; From 8066b87e212521bb2440855d0bd5d54740260244 Mon Sep 17 00:00:00 2001 From: Kevin O'Byrne <62954271+TehZombiJesus@users.noreply.github.com> Date: Mon, 20 Jul 2020 10:16:35 -0400 Subject: [PATCH 55/66] Update fr.lua (#50) --- locales/fr.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/fr.lua b/locales/fr.lua index 22cfc7bc..1379d27e 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,5 +1,5 @@ Locales['fr'] = { - ['skin_menu'] = 'Skin Menu', + ['skin_menu'] = 'menu de Skin', ['use_rotate_view'] = 'utilisez ~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ et ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ pour tourner la vue.', ['skin'] = 'changer de skin', ['saveskin'] = 'sauvegarder skin dans un fichier', From 5b80fc1137f4d0b2921d3803bb34285b734821ec Mon Sep 17 00:00:00 2001 From: BackrndSource Date: Mon, 20 Jul 2020 16:19:16 +0200 Subject: [PATCH 56/66] Add Spanish translation (#22) * Spanish Traduction * Update es.lua * Update to add es.lua * Update and rename __resource.lua to fxmanifest.lua Co-authored-by: Yulian Ivanov <67766145+BrakingESX247@users.noreply.github.com> --- fxmanifest.lua | 2 ++ locales/es.lua | 6 ++++++ 2 files changed, 8 insertions(+) create mode 100644 locales/es.lua diff --git a/fxmanifest.lua b/fxmanifest.lua index e51331a6..32b1a2fc 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -16,6 +16,7 @@ server_scripts { 'locales/fr.lua', 'locales/sv.lua', 'locales/pl.lua', + 'locales/es.lua', 'config.lua', 'server/main.lua' } @@ -29,6 +30,7 @@ client_scripts { 'locales/fr.lua', 'locales/sv.lua', 'locales/pl.lua', + 'locales/es.lua', 'config.lua', 'client/main.lua' } diff --git a/locales/es.lua b/locales/es.lua new file mode 100644 index 00000000..243a49ff --- /dev/null +++ b/locales/es.lua @@ -0,0 +1,6 @@ +Locales['es'] = { + ['skin_menu'] = 'Menú Aspecto', + ['use_rotate_view'] = 'Utiliza ~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ y ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ para rotar la vista.', + ['skin'] = 'cambiar aspecto', + ['saveskin'] = 'guardar aspecto en un archivo', +} From 9716623f1cdf4dadb3192709718a4a7e0d91c351 Mon Sep 17 00:00:00 2001 From: BTNGaming <35198559+BTNGaming@users.noreply.github.com> Date: Mon, 3 Aug 2020 06:55:03 -0700 Subject: [PATCH 57/66] Fix character spawning as ped by default. (#72) This fixes your character loading in as a ped after you die or relog. For some reason the code was disabled, and nobody ever fixed it. --- client/main.lua | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/client/main.lua b/client/main.lua index 5b589f07..ba3d1e1a 100644 --- a/client/main.lua +++ b/client/main.lua @@ -258,25 +258,25 @@ function OpenSaveableMenu(submitCb, cancelCb, restrict) end, cancelCb, restrict) end --- AddEventHandler('esx:onPlayerSpawn', function() --- Citizen.CreateThread(function() --- while not playerLoaded do --- Citizen.Wait(100) --- end +AddEventHandler('esx:onPlayerSpawn', function() + Citizen.CreateThread(function() + while not playerLoaded do + Citizen.Wait(100) + end --- if firstSpawn then --- ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin, jobSkin) --- if skin == nil then --- TriggerEvent('skinchanger:loadSkin', {sex = 0}, OpenSaveableMenu) --- else --- TriggerEvent('skinchanger:loadSkin', skin) --- end --- end) + if firstSpawn then + ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin, jobSkin) + if skin == nil then + TriggerEvent('skinchanger:loadSkin', {sex = 0}, OpenSaveableMenu) + else + TriggerEvent('skinchanger:loadSkin', skin) + end + end) --- firstSpawn = false --- end --- end) --- end) + firstSpawn = false + end + end) +end) AddEventHandler('esx_skin:resetFirstSpawn', function() firstSpawn = true From 7a2c5e2e1f84078535f8dd508dd4a12d491134c2 Mon Sep 17 00:00:00 2001 From: Xen0risDEV <4227232+xen0risDEV@users.noreply.github.com> Date: Wed, 5 Aug 2020 01:46:34 +0200 Subject: [PATCH 58/66] Update main.lua (#74) Fix issue #73 --- client/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/main.lua b/client/main.lua index ba3d1e1a..a486c903 100644 --- a/client/main.lua +++ b/client/main.lua @@ -160,7 +160,7 @@ Citizen.CreateThread(function() while true do Citizen.Wait(0) - if not skinLoaded or isCameraActive then + if not skinLoaded and isCameraActive then DisableControlAction(2, 30, true) DisableControlAction(2, 31, true) DisableControlAction(2, 32, true) From 24e97d95c0a0a68b0aa53fc874fd6a7cb76006a3 Mon Sep 17 00:00:00 2001 From: Tinky <48660658+Tinky124@users.noreply.github.com> Date: Mon, 5 Oct 2020 01:03:35 +0200 Subject: [PATCH 59/66] Minor Changes (#79) --- client/main.lua | 45 +++++++++++++++------------------------------ 1 file changed, 15 insertions(+), 30 deletions(-) diff --git a/client/main.lua b/client/main.lua index a486c903..4cad3373 100644 --- a/client/main.lua +++ b/client/main.lua @@ -12,12 +12,9 @@ end) function OpenMenu(submitCb, cancelCb, restrict) local playerPed = PlayerPedId() - TriggerEvent('skinchanger:getSkin', function(skin) - lastSkin = skin - end) - + TriggerEvent('skinchanger:getSkin', function(skin) lastSkin = skin end) TriggerEvent('skinchanger:getData', function(components, maxVals) - local elements = {} + local elements = {} local _components = {} -- Restrict menu @@ -40,10 +37,9 @@ function OpenMenu(submitCb, cancelCb, restrict) end end end - -- Insert elements for i=1, #_components, 1 do - local value = _components[i].value + local value = _components[i].value local componentId = _components[i].componentId if componentId == 0 then @@ -51,14 +47,14 @@ function OpenMenu(submitCb, cancelCb, restrict) end local data = { - label = _components[i].label, - name = _components[i].name, - value = value, - min = _components[i].min, + label = _components[i].label, + name = _components[i].name, + value = value, + min = _components[i].min, textureof = _components[i].textureof, zoomOffset= _components[i].zoomOffset, camOffset = _components[i].camOffset, - type = 'slider' + type = 'slider' } for k,v in pairs(maxVals) do @@ -76,13 +72,11 @@ function OpenMenu(submitCb, cancelCb, restrict) camOffset = _components[1].camOffset ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'skin', { - title = _U('skin_menu'), - align = 'top-left', + title = _U('skin_menu'), + align = 'top-left', elements = elements }, function(data, menu) - TriggerEvent('skinchanger:getSkin', function(skin) - lastSkin = skin - end) + TriggerEvent('skinchanger:getSkin', function(skin) lastSkin = skin end) submitCb(data, menu) DeleteSkinCam() @@ -97,9 +91,7 @@ function OpenMenu(submitCb, cancelCb, restrict) end, function(data, menu) local skin, components, maxVals - TriggerEvent('skinchanger:getSkin', function(getSkin) - skin = getSkin - end) + TriggerEvent('skinchanger:getSkin', function(getSkin) skin = getSkin end) zoomOffset = data.current.zoomOffset camOffset = data.current.camOffset @@ -239,9 +231,7 @@ Citizen.CreateThread(function() end) function OpenSaveableMenu(submitCb, cancelCb, restrict) - TriggerEvent('skinchanger:getSkin', function(skin) - lastSkin = skin - end) + TriggerEvent('skinchanger:getSkin', function(skin) lastSkin = skin end) OpenMenu(function(data, menu) menu.close() @@ -312,13 +302,8 @@ AddEventHandler('esx:playerLoaded', function(xPlayer) playerLoaded = true end) -AddEventHandler('esx_skin:getLastSkin', function(cb) - cb(lastSkin) -end) - -AddEventHandler('esx_skin:setLastSkin', function(skin) - lastSkin = skin -end) +AddEventHandler('esx_skin:getLastSkin', function(cb) cb(lastSkin) end) +AddEventHandler('esx_skin:setLastSkin', function(skin) lastSkin = skin end) RegisterNetEvent('esx_skin:openMenu') AddEventHandler('esx_skin:openMenu', function(submitCb, cancelCb) From 46fc1924a0e6e2ac2624710c2e846513a456f2f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ege=20T=C3=BCrker?= <66169371+EgeTurker@users.noreply.github.com> Date: Mon, 5 Oct 2020 02:08:44 +0300 Subject: [PATCH 60/66] Added Turkish Language Support to esx_skin (#84) --- locales/tr.lua | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 locales/tr.lua diff --git a/locales/tr.lua b/locales/tr.lua new file mode 100644 index 00000000..63c213b9 --- /dev/null +++ b/locales/tr.lua @@ -0,0 +1,6 @@ +Locales['tr'] = { + ['skin_menu'] = 'Karakter Menüsü', + ['use_rotate_view'] = '~INPUT_VEH_FLY_ROLL_LEFT_ONLY~ ve ~INPUT_VEH_FLY_ROLL_RIGHT_ONLY~ ile kamera açısını değiştirebilirsiniz.', + ['skin'] = 'Karakter Değiştir', + ['saveskin'] = 'Karakteri bir dosyaya kaydet', +} \ No newline at end of file From 7dc79c331995f44736136c017d109b3fc0019918 Mon Sep 17 00:00:00 2001 From: Ruqen <73693641+Ruqen@users.noreply.github.com> Date: Wed, 4 Nov 2020 23:52:28 +0300 Subject: [PATCH 61/66] Fix of manifest It fixes the mistake on locales made by user EgeTurker. --- fxmanifest.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fxmanifest.lua b/fxmanifest.lua index 32b1a2fc..dcc7ba05 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -17,6 +17,7 @@ server_scripts { 'locales/sv.lua', 'locales/pl.lua', 'locales/es.lua', + 'locales/tr.lua', 'config.lua', 'server/main.lua' } @@ -31,6 +32,7 @@ client_scripts { 'locales/sv.lua', 'locales/pl.lua', 'locales/es.lua', + 'locales/tr.lua', 'config.lua', 'client/main.lua' } From 9580e319b308b9ac8d4df950ca2d0284bf95fb68 Mon Sep 17 00:00:00 2001 From: HypeLevels <61633775+HypeLevels@users.noreply.github.com> Date: Tue, 1 Dec 2020 21:39:27 +0000 Subject: [PATCH 62/66] Update config.lua Changed default language to english as its the universal language --- config.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.lua b/config.lua index 2fdd3003..b75d40e9 100644 --- a/config.lua +++ b/config.lua @@ -1,6 +1,6 @@ Config = {} -Config.Locale = 'fr' +Config.Locale = 'en' Config.BackpackWeight = { [40] = 16, [41] = 20, [44] = 25, [45] = 23 From ac32c3fb553591b8c0d2cb6631a2acaef29cf738 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=BCrkay=20Tanr=C4=B1kulu?= Date: Sat, 19 Dec 2020 10:04:55 +0300 Subject: [PATCH 63/66] Turkish translation fixes --- fxmanifest.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fxmanifest.lua b/fxmanifest.lua index 32b1a2fc..dcc7ba05 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -17,6 +17,7 @@ server_scripts { 'locales/sv.lua', 'locales/pl.lua', 'locales/es.lua', + 'locales/tr.lua', 'config.lua', 'server/main.lua' } @@ -31,6 +32,7 @@ client_scripts { 'locales/sv.lua', 'locales/pl.lua', 'locales/es.lua', + 'locales/tr.lua', 'config.lua', 'client/main.lua' } From 38d4fa62bb0adc4534cfd062e034871bf2683853 Mon Sep 17 00:00:00 2001 From: MiddleSkillz Date: Thu, 6 May 2021 02:39:15 -0600 Subject: [PATCH 64/66] fix: Update for Latest ESX Legacy Changes --- client/main.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/client/main.lua b/client/main.lua index 4cad3373..7c32a35b 100644 --- a/client/main.lua +++ b/client/main.lua @@ -138,6 +138,7 @@ function CreateSkinCam() isCameraActive = true SetCamRot(cam, 0.0, 0.0, 270.0, true) + SetCamCoord(cam, GetEntityCoords(playerPed)) SetEntityHeading(playerPed, 0.0) end From 274955d52ecc6d0371a2400b25faa0406d3a152e Mon Sep 17 00:00:00 2001 From: MiddleSkillz Date: Thu, 6 May 2021 02:46:35 -0600 Subject: [PATCH 65/66] fix: Don't Wait for Skin to Load --- client/main.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/main.lua b/client/main.lua index 7c32a35b..c51e8655 100644 --- a/client/main.lua +++ b/client/main.lua @@ -137,8 +137,8 @@ function CreateSkinCam() RenderScriptCams(true, true, 500, true, true) isCameraActive = true - SetCamRot(cam, 0.0, 0.0, 270.0, true) SetCamCoord(cam, GetEntityCoords(playerPed)) + SetCamRot(cam, 0.0, 0.0, 270.0, true) SetEntityHeading(playerPed, 0.0) end @@ -153,7 +153,7 @@ Citizen.CreateThread(function() while true do Citizen.Wait(0) - if not skinLoaded and isCameraActive then + if isCameraActive then DisableControlAction(2, 30, true) DisableControlAction(2, 31, true) DisableControlAction(2, 32, true) From 7edee6c09277b67e8e55345fdf3391acff7c0d7a Mon Sep 17 00:00:00 2001 From: Linden Date: Mon, 17 May 2021 21:22:37 +1000 Subject: [PATCH 66/66] fix(legacy/multichar): Do not retrieve skin if esx_multicharacter is enabled --- client/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/main.lua b/client/main.lua index c51e8655..42b92c59 100644 --- a/client/main.lua +++ b/client/main.lua @@ -255,7 +255,7 @@ AddEventHandler('esx:onPlayerSpawn', function() Citizen.Wait(100) end - if firstSpawn then + if firstSpawn and ESX.GetConfig().Multichar ~= true then ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin, jobSkin) if skin == nil then TriggerEvent('skinchanger:loadSkin', {sex = 0}, OpenSaveableMenu)