Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(Changed fx_version from adamant to cerulean + added lua 54) #329

Closed
wants to merge 14 commits into from
Closed

refactor(Changed fx_version from adamant to cerulean + added lua 54) #329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2f265f2
update fxmanifest to cerulean & minor changes
ItsManueh Jul 4, 2022
6f1c38b
update fxmanifest to cerulean & minor changes
ItsManueh Jul 4, 2022
a74cc1c
chore: update fxmanifest to cerulean & minor changes
ItsManueh Jul 4, 2022
02d66a0
chore: update fxmanifest to cerulean & minor changes
ItsManueh Jul 4, 2022
159e75b
chore: update fxmanifest to cerulean & minor changes
ItsManueh Jul 4, 2022
6d7348e
chore: update fxmanifest to cerulean & minor changes
ItsManueh Jul 4, 2022
4e93a6f
chore: update fxmanifest to cerulean & minor changes
ItsManueh Jul 4, 2022
b8a55c4
chore: update fxmanifest to cerulean & minor changes
ItsManueh Jul 4, 2022
03d2d2a
chore: update fxmanifest to cerulean & minor changes
ItsManueh Jul 4, 2022
de4946e
chore: update fxmanifest to cerulean & minor changes
ItsManueh Jul 4, 2022
4044220
chore: update fxmanifest to cerulean & minor changes
ItsManueh Jul 4, 2022
d823209
chore: update fxmanifest to cerulean & minor changes
ItsManueh Jul 4, 2022
bd9a10e
chore: update fxmanifest to cerulean & minor changes
ItsManueh Jul 4, 2022
979fb9e
chore: update fxmanifest to cerulean & minor changes
ItsManueh Jul 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions [esx]/es_extended/fxmanifest.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,21 @@
fx_version 'adamant'
--#### FX Information ####--
fx_version 'cerulean'
lua54 'yes'
game 'gta5'

game 'gta5'
--#### Resource Information ####--
name 'es_extended'
version '1.7.5'
description 'ES Extended'

description 'ES Extended'
--#### Manifest ####--
dependencies {
'oxmysql',
'spawnmanager',
'/server:5104',
'/onesync'
}

lua54 'yes'
version '1.7.5'

shared_scripts {
'locale.lua',
Expand Down Expand Up @@ -69,8 +79,3 @@ files {
'html/img/accounts/black_money.png',
'html/img/accounts/money.png'
}

dependencies {
'oxmysql',
'spawnmanager',
}
2 changes: 1 addition & 1 deletion [esx]/es_extended/html/js/wrapper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
if (i == str.length - 1)
data.end = true;

$.post('http://' + namespace + '/__chunk', JSON.stringify(data));
$.post('https://' + namespace + '/__chunk', JSON.stringify(data));

}

Expand Down
16 changes: 9 additions & 7 deletions [esx]/esx_identity/fxmanifest.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
fx_version 'adamant'

game 'gta5'

description 'ESX Identity'

version '1.7.5'
--#### FX Information ####--
fx_version 'cerulean'
lua54 'yes'
game 'gta5'

--#### Resource Information ####--
name 'esx_identity'
version '1.7.5'
description 'ESX Identity'

shared_script '@es_extended/imports.lua'

Expand Down
4 changes: 2 additions & 2 deletions [esx]/esx_identity/html/js/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
$(function() {
$.post('http://esx_identity/ready', JSON.stringify({}));
$.post('https://esx_identity/ready', JSON.stringify({}));

window.addEventListener('message', function(event) {
if (event.data.type == "enableui") {
Expand All @@ -24,7 +24,7 @@ $(function() {

var formattedDate = `${da}/${mo}/${ye}`;

$.post('http://esx_identity/register', JSON.stringify({
$.post('https://esx_identity/register', JSON.stringify({
firstname: $("#firstname").val(),
lastname: $("#lastname").val(),
dateofbirth: formattedDate,
Expand Down
14 changes: 8 additions & 6 deletions [esx]/esx_menu_default/fxmanifest.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
fx_version 'adamant'
--#### FX Information ####--
fx_version 'cerulean'
lua54 'yes'
game 'gta5'

game 'gta5'

description 'ESX Menu Default'

version '1.7.5'
--#### Resource Information ####--
name 'esx_menu_default'
version '1.7.5'
description 'ESX Menu Default'

client_scripts {
'@es_extended/imports.lua',
Expand Down
6 changes: 3 additions & 3 deletions [esx]/esx_menu_default/html/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
};

ESX_MENU.submit = function(namespace, name, data) {
$.post('http://' + ESX_MENU.ResourceName + '/menu_submit', JSON.stringify({
$.post('https://' + ESX_MENU.ResourceName + '/menu_submit', JSON.stringify({
_namespace: namespace,
_name: name,
current: data,
Expand All @@ -136,14 +136,14 @@
};

ESX_MENU.cancel = function(namespace, name) {
$.post('http://' + ESX_MENU.ResourceName + '/menu_cancel', JSON.stringify({
$.post('https://' + ESX_MENU.ResourceName + '/menu_cancel', JSON.stringify({
_namespace: namespace,
_name: name
}));
};

ESX_MENU.change = function(namespace, name, data) {
$.post('http://' + ESX_MENU.ResourceName + '/menu_change', JSON.stringify({
$.post('https://' + ESX_MENU.ResourceName + '/menu_change', JSON.stringify({
_namespace: namespace,
_name: name,
current: data,
Expand Down
16 changes: 9 additions & 7 deletions [esx]/esx_menu_dialog/fxmanifest.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
fx_version 'adamant'

game 'gta5'

description 'ESX Menu Dialog'

version '1.7.5'
--#### FX Information ####--
fx_version 'cerulean'
lua54 'yes'
game 'gta5'

--#### Resource Information ####--
name 'esx_menu_dialog'
version '1.7.5'
description 'ESX Menu Dialog'

client_scripts {
'@es_extended/imports.lua',
Expand Down
16 changes: 9 additions & 7 deletions [esx]/esx_menu_list/fxmanifest.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
fx_version 'adamant'

game 'gta5'

description 'ESX Menu List'

version '1.7.5'
--#### FX Information ####--
fx_version 'cerulean'
lua54 'yes'
game 'gta5'

--#### Resource Information ####--
name 'esx_menu_list'
version '1.7.5'
description 'ESX Menu List'

client_scripts {
'@es_extended/imports.lua',
Expand Down
6 changes: 3 additions & 3 deletions [esx]/esx_menu_list/html/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
};

ESX_MENU.submit = function(namespace, name, data){
$.post('http://' + ESX_MENU.ResourceName + '/menu_submit', JSON.stringify({
$.post('https://' + ESX_MENU.ResourceName + '/menu_submit', JSON.stringify({
_namespace: namespace,
_name : name,
data : data.data,
Expand All @@ -151,7 +151,7 @@
};

ESX_MENU.cancel = function(namespace, name){
$.post('http://' + ESX_MENU.ResourceName + '/menu_cancel', JSON.stringify({
$.post('https://' + ESX_MENU.ResourceName + '/menu_cancel', JSON.stringify({
_namespace: namespace,
_name : name
}));
Expand Down Expand Up @@ -188,4 +188,4 @@
}
};

})();
})();
13 changes: 9 additions & 4 deletions [esx]/esx_notify/fxmanifest.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
fx_version 'adamant'
game 'gta5'
author 'ESX-Framework'
description 'ESX Notification'
--#### FX Information ####--
fx_version 'cerulean'
lua54 'yes'
game 'gta5'

--#### Resource Information ####--
name 'esx_notify'
version '1.7.5'
description 'ESX Notify'

client_scripts { 'Notify.lua' }

Expand Down
13 changes: 9 additions & 4 deletions [esx]/esx_progressbar/fxmanifest.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
fx_version 'adamant'
game 'gta5'
author 'ESX-Framework'
description 'ESX Progressbar'
--#### FX Information ####--
fx_version 'cerulean'
lua54 'yes'
game 'gta5'

--#### Resource Information ####--
name 'esx_progressbar'
version '1.7.5'
description 'ESX Progressbar'

client_scripts { 'Progress.lua' }
shared_script '@es_extended/imports.lua'
Expand Down
14 changes: 8 additions & 6 deletions [esx]/esx_skin/fxmanifest.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
fx_version 'adamant'
--#### FX Information ####--
fx_version 'cerulean'
lua54 'yes'
game 'gta5'

game 'gta5'

description 'ESX Skin'

version '1.7.5'
--#### Resource Information ####--
name 'esx_skin'
version '1.7.5'
description 'ESX Skin'

shared_script '@es_extended/imports.lua'

Expand Down
13 changes: 9 additions & 4 deletions [esx]/esx_textui/fxmanifest.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
fx_version 'adamant'
game 'gta5'
author 'ESX-Framework'
description 'ESX TextUI'
--#### FX Information ####--
fx_version 'cerulean'
lua54 'yes'
game 'gta5'

--#### Resource Information ####--
name 'esx_textui'
version '1.7.5'
description 'ESX TextUI'

client_scripts { 'TextUI.lua' }
shared_script '@es_extended/imports.lua'
Expand Down