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.

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

🎉 New release 1.10.3 #1292

Merged
merged 95 commits into from
Jan 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
1147a13
create sl.lua for esx_identity
C3-FrameWork Jul 9, 2023
e30e2bc
refactor(Player Class): Typing Code & Perf
Walker974 Sep 17, 2023
fbdc9ce
Update player.lua
Walker974 Sep 17, 2023
0e5cefe
Merge branch 'dev' into patch-1
Thekuca Sep 18, 2023
2abf70a
Update player.lua
Walker974 Sep 24, 2023
165cd21
Update & Fix player.lua
Walker974 Sep 24, 2023
5eb3194
improve spawnvehicle and remove callback
Sep 27, 2023
00c0e84
change vehicle spawn logic back.
Sep 27, 2023
4dac6a0
Merge pull request #1229 from Arctos2win/dev
Arctos2win Sep 27, 2023
eec2bd8
improve functions and removeInventoryItem event
Sep 29, 2023
d7403e0
fix
Arctos2win Sep 29, 2023
be835db
fix event
Sep 29, 2023
730f92e
Merge branch 'dev' of https://github.com/Arctos2win/esx_core into dev
Sep 29, 2023
5d44a0a
add native to dependencies
Arctos2win Sep 29, 2023
f61e664
fix last stuff
Sep 29, 2023
06e6843
Merge pull request #1231 from Arctos2win/main
Gellipapa Sep 29, 2023
6fc40c7
Update functions.lua
Arctos2win Sep 29, 2023
117fb8b
Updated fi.lua
Bloope18 Oct 1, 2023
8e71fd7
Merge pull request #1234 from Blooper562/patch-7
Arctos2win Oct 1, 2023
75799c8
Update functions.lua
Arctos2win Oct 2, 2023
2ace296
fix repo
Arctos2win Oct 2, 2023
3376ba6
Merge pull request #1232 from Arctos2win/dev
Arctos2win Oct 2, 2023
50f7dce
Merge pull request #1217 from Walker974/patch-1
Thekuca Oct 2, 2023
094becc
quick fix
Arctos2win Oct 3, 2023
9d94639
Merge pull request #1236 from Arctos2win/dev
Arctos2win Oct 3, 2023
cee4f01
Update de.lua
ItzTrivial Oct 3, 2023
59d5f14
Merge pull request #1237 from ItzTrivial/patch-1
Arctos2win Oct 3, 2023
cc03577
Create sv.lua
Dannezzzan Oct 7, 2023
52ea268
Create sv.lua
Dannezzzan Oct 7, 2023
47b41ea
Merge pull request #1239 from Dannezzzan/patch-3
Arctos2win Oct 7, 2023
33549b7
Merge pull request #1238 from Dannezzzan/patch-2
Arctos2win Oct 7, 2023
b5f21a7
Create sv.lua
Dannezzzan Oct 7, 2023
3d6b79c
Create sv.lua
Dannezzzan Oct 7, 2023
3e95b08
Create sv.lua
Dannezzzan Oct 7, 2023
ffeabfe
Create sv.js
Dannezzzan Oct 8, 2023
fe749f1
Merge pull request #1243 from Dannezzzan/patch-7
Arctos2win Oct 8, 2023
cb5c5c8
Merge pull request #1242 from Dannezzzan/patch-6
Arctos2win Oct 8, 2023
43f2834
en to sv
Arctos2win Oct 8, 2023
bdb8062
Merge pull request #1241 from Dannezzzan/patch-5
Arctos2win Oct 8, 2023
bad530a
Merge pull request #1240 from Dannezzzan/patch-4
Arctos2win Oct 8, 2023
598c2f7
:wrench: Add missing onCancel callback method to progressbar
Gellipapa Oct 16, 2023
aa84aac
Merge branch 'dev' of https://github.com/Gellipapa/esx_core into dev
Gellipapa Oct 16, 2023
a99e566
Merge pull request #1247 from Gellipapa/dev
Gellipapa Oct 16, 2023
098ac39
Update he.lua part one
thefourcraft Oct 29, 2023
6b0e39d
Update he.lua part 2
thefourcraft Oct 29, 2023
5cc7b49
part 3
thefourcraft Oct 29, 2023
abf8fe9
Merge pull request #1 from thefourcraft/thefourcraft-he
thefourcraft Oct 29, 2023
13434ac
fix missing string issue on line 169 - Lint workflow issue
thefourcraft Oct 29, 2023
6bfe862
Create sl.lua and update it!
C3-FrameWork Nov 4, 2023
9d92a4f
Add underflow check for removeAccountMoney
Kenshiin13 Nov 6, 2023
40fe04d
Merge pull request #1253 from Kenshiin13/Underflow-Check
Arctos2win Nov 6, 2023
34f7933
fix: FR translation
Cartman117 Nov 12, 2023
d41b723
Merge pull request #1254 from Cartman117/patch-1
Arctos2win Nov 14, 2023
90cc4be
improve setjob function
Arctos2win Nov 18, 2023
004b782
tonumber a value
Arctos2win Nov 18, 2023
97a6f08
Merge pull request #1255 from Arctos2win/dev
Arctos2win Nov 18, 2023
bd17e35
Create id.lua
IAmNotGod-core Nov 28, 2023
18db3c8
en -> id
Arctos2win Nov 28, 2023
69b1e16
Merge pull request #1258 from IAmNotGod-core/dev
Arctos2win Nov 29, 2023
5d1f90f
fix(es_extended/server/classes/player): trying to use non existent event
Thekuca Dec 4, 2023
4240253
Merge pull request #1263 from Thekuca/dev
Thekuca Dec 4, 2023
9bbf321
fix player metadata can get set to false.
Arctos2win Dec 12, 2023
ed9dcda
Merge pull request #1266 from Arctos2win/dev
Arctos2win Dec 12, 2023
5b68454
fix(es_extended/client/modules/actions): player health regeneration
Thekuca Dec 21, 2023
1c530ac
Merge pull request #1277 from Thekuca/dev
Thekuca Dec 21, 2023
47920b7
refactor(es_extended/client/main): use esx function for keymapping
Thekuca Dec 22, 2023
e499474
Revert "refactor(es_extended/client/main): use esx function for keyma…
Thekuca Dec 22, 2023
70c5213
refactor(es_extended/client/main): use esx keymapping function
Thekuca Dec 22, 2023
71516c1
Merge pull request #1278 from Thekuca/dev
Thekuca Dec 22, 2023
62bf3dd
Fix checkDOBFormat
xtrsyz Dec 29, 2023
b27bd00
typo in czech locale - Fixed by Negative
TheFantomas Jan 7, 2024
6fa81e2
Added ESX.DeleteJob for Runtime
t1ger-scripts Jan 14, 2024
4cf6aa1
Fixed error for skin no default value
t1ger-scripts Jan 14, 2024
82a9a1a
Fixed typo
t1ger-scripts Jan 14, 2024
090ae55
chore(readme.md)
Thekuca Jan 14, 2024
c010d53
Merge pull request #1283 from Thekuca/dev
Thekuca Jan 14, 2024
a88846f
Merge pull request #1282 from t1ger-scripts/dev
Arctos2win Jan 14, 2024
3b13fe2
Merge pull request #1281 from t1ger-scripts/patch-1
Arctos2win Jan 14, 2024
4c60fc9
Revert "Added ESX.DeleteJob for Runtime"
Arctos2win Jan 14, 2024
e0e60d6
Merge pull request #1284 from esx-framework/revert-1281-patch-1
Arctos2win Jan 14, 2024
39306c2
Rewrite LoadESXPlayer
Arctos2win Jan 18, 2024
39baa97
Merge branch 'dev' into sl.lua
Gellipapa Jan 18, 2024
0233de4
Merge pull request #1252 from C3-FrameWork/sl.lua
Gellipapa Jan 18, 2024
48dedbb
Merge pull request #1279 from gigne/main
Gellipapa Jan 18, 2024
cf52f2a
Merge pull request #1250 from thefourcraft/dev
Gellipapa Jan 18, 2024
5a443fa
fix(SQL): fixed missing column
zRxnx Jan 21, 2024
1f68b2b
Merge pull request #1289 from zRxnx/main
Gellipapa Jan 22, 2024
55ec231
Update main.lua
Arctos2win Jan 22, 2024
0b01cfd
change handling of ox inventory config
Arctos2win Jan 24, 2024
e765491
don't save player when not spawned
Arctos2win Jan 24, 2024
ae4473b
Merge pull request #2 from Arctos2win/dev
Arctos2win Jan 24, 2024
6637933
fix player bugging in ground collision at spawn
Arctos2win Jan 24, 2024
a197ead
Merge pull request #3 from Arctos2win/dev
Arctos2win Jan 24, 2024
1d7572f
Merge pull request #1290 from Arctos2win/loadESXPlayer
Gellipapa Jan 24, 2024
9d90c9d
:art: Run formatter
Gellipapa Jan 24, 2024
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
1 change: 1 addition & 0 deletions [SQL]/legacy.sql
Original file line number Diff line number Diff line change
Expand Up @@ -1011,6 +1011,7 @@ CREATE TABLE IF NOT EXISTS `banking` (
`time` bigint(20) DEFAULT NULL,
`ID` int(11) NOT NULL AUTO_INCREMENT,
`balance` int(11) DEFAULT 0,
`label` varchar(255) DEFAULT NULL,
PRIMARY KEY (`ID`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;

Expand Down
56 changes: 28 additions & 28 deletions [core]/cron/server/main.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,49 +2,49 @@ local Jobs = {}
local LastTime = nil

function RunAt(h, m, cb)
Jobs[#Jobs + 1] = {
h = h,
m = m,
cb = cb
}
Jobs[#Jobs + 1] = {
h = h,
m = m,
cb = cb,
}
end

function GetUnixTimestamp()
return os.time()
return os.time()
end

function OnTime(time)
for i = 1, #Jobs, 1 do
local scheduledTimestamp = os.time({
hour = Jobs[i].h,
minute = Jobs[i].m,
second = 0, -- Assuming tasks run at the start of the minute
day = os.date('%d', time),
month = os.date('%m', time),
year = os.date('%Y', time)
})

if time >= scheduledTimestamp and (not LastTime or LastTime < scheduledTimestamp) then
Jobs[i].cb(Jobs[i].h, Jobs[i].m)
end
end
for i = 1, #Jobs, 1 do
local scheduledTimestamp = os.time({
hour = Jobs[i].h,
minute = Jobs[i].m,
second = 0, -- Assuming tasks run at the start of the minute
day = os.date("%d", time),
month = os.date("%m", time),
year = os.date("%Y", time),
})

if time >= scheduledTimestamp and (not LastTime or LastTime < scheduledTimestamp) then
Jobs[i].cb(Jobs[i].h, Jobs[i].m)
end
end
end

function Tick()
local time = GetUnixTimestamp()
local time = GetUnixTimestamp()

if not LastTime or os.date('%M', time) ~= os.date('%M', LastTime) then
OnTime(time)
LastTime = time
end
if not LastTime or os.date("%M", time) ~= os.date("%M", LastTime) then
OnTime(time)
LastTime = time
end

SetTimeout(60000, Tick)
SetTimeout(60000, Tick)
end

LastTime = GetUnixTimestamp()

Tick()

AddEventHandler('cron:runAt', function(h, m, cb)
RunAt(h, m, cb)
AddEventHandler("cron:runAt", function(h, m, cb)
RunAt(h, m, cb)
end)
12 changes: 5 additions & 7 deletions [core]/es_extended/client/common.lua
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
exports('getSharedObject', function()
return ESX
exports("getSharedObject", function()
return ESX
end)

if GetResourceState('ox_inventory') ~= 'missing' then
Config.OxInventory = true
end
Config.OxInventory = GetResourceState("ox_inventory"):find("start") and true

AddEventHandler("esx:getSharedObject", function()
local Invoke = GetInvokingResource()
print(("[^1ERROR^7] Resource ^5%s^7 Used the ^5getSharedObject^7 Event, this event ^1no longer exists!^7 Visit https://documentation.esx-framework.org/tutorials/tutorials-esx/sharedevent for how to fix!"):format(Invoke))
local Invoke = GetInvokingResource()
print(("[^1ERROR^7] Resource ^5%s^7 Used the ^5getSharedObject^7 Event, this event ^1no longer exists!^7 Visit https://documentation.esx-framework.org/tutorials/tutorials-esx/sharedevent for how to fix!"):format(Invoke))
end)
Loading
Loading