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

fix+chore: fixes in es_extended removed some files and other useful works #665

Merged
merged 74 commits into from
Mar 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
5b03dcb
Merge pull request #597 from bitpredator/dev
bitpredator Dec 31, 2023
9afa940
chore(deps): bump actions/dependency-review-action from 3.1.4 to 3.1.5
dependabot[bot] Jan 5, 2024
5c5636e
Merge pull request #599 from bitpredator/dependabot/github_actions/ac…
bitpredator Jan 5, 2024
43eb72e
Merge pull request #598 from bitpredator/dev
bitpredator Jan 5, 2024
a7892c3
Merge pull request #600 from bitpredator/dev
bitpredator Jan 9, 2024
ddaf081
chore(deps-dev): bump the npm_and_yarn group across 1 directories wit…
dependabot[bot] Jan 11, 2024
f040b87
Merge pull request #601 from bitpredator/dependabot/npm_and_yarn/serv…
bitpredator Jan 11, 2024
675cd0c
Merge pull request #602 from bitpredator/dev
bitpredator Jan 11, 2024
6e15d3f
Merge pull request #603 from bitpredator/dev
bitpredator Jan 12, 2024
ed2ff76
Merge pull request #604 from bitpredator/dev
bitpredator Jan 12, 2024
cbf62c7
Merge pull request #605 from bitpredator/dev
bitpredator Jan 13, 2024
0e2aa6e
Merge pull request #606 from bitpredator/dev
bitpredator Jan 13, 2024
2275557
Merge pull request #607 from bitpredator/dev
bitpredator Jan 14, 2024
6ee4228
Merge pull request #608 from bitpredator/dev
bitpredator Jan 14, 2024
07470d4
Merge pull request #609 from bitpredator/dev
bitpredator Jan 14, 2024
92a8795
Merge pull request #610 from bitpredator/dev
bitpredator Jan 17, 2024
29c9550
Merge pull request #611 from bitpredator/dev
bitpredator Jan 17, 2024
155461f
chore(deps): bump actions/dependency-review-action from 3.1.5 to 4.0.0
dependabot[bot] Jan 19, 2024
f45d5a5
Merge pull request #613 from bitpredator/dependabot/github_actions/ac…
bitpredator Jan 19, 2024
16f9846
Merge pull request #612 from bitpredator/dev
bitpredator Jan 19, 2024
fb29ac5
Merge pull request #615 from bitpredator/dev
bitpredator Jan 21, 2024
e0e4408
Merge pull request #616 from bitpredator/dev
bitpredator Jan 21, 2024
f8f319c
Merge pull request #617 from bitpredator/dev
bitpredator Jan 25, 2024
41a3fd3
Merge pull request #619 from bitpredator/dev
bitpredator Jan 27, 2024
9ffb261
Merge pull request #620 from bitpredator/dev
bitpredator Jan 28, 2024
a7da7b6
Merge pull request #621 from bitpredator/dev
bitpredator Jan 28, 2024
427d623
Merge pull request #622 from bitpredator/dev
bitpredator Jan 28, 2024
b763d1b
Merge pull request #623 from bitpredator/dev
bitpredator Jan 28, 2024
ad18ecf
Merge pull request #624 from bitpredator/dev
bitpredator Jan 28, 2024
c473ac4
Merge pull request #625 from bitpredator/dev
bitpredator Jan 28, 2024
aef561b
Merge pull request #626 from bitpredator/dev
bitpredator Jan 28, 2024
fe13f2a
Merge pull request #627 from bitpredator/dev
bitpredator Jan 28, 2024
f366e76
Merge pull request #628 from bitpredator/dev
bitpredator Jan 28, 2024
053a05d
Merge pull request #629 from bitpredator/dev
bitpredator Jan 28, 2024
656405e
Merge pull request #630 from bitpredator/dev
bitpredator Jan 29, 2024
3b8d743
Merge pull request #631 from bitpredator/dev
bitpredator Jan 30, 2024
4afa6fa
Merge pull request #632 from bitpredator/dev
bitpredator Jan 31, 2024
5bde4d7
Merge pull request #633 from bitpredator/dev
bitpredator Feb 1, 2024
b1015c2
Merge pull request #634 from bitpredator/dev
bitpredator Feb 1, 2024
f9a9d22
Merge pull request #635 from bitpredator/dev
bitpredator Feb 4, 2024
6073ba4
Merge pull request #636 from bitpredator/dev
bitpredator Feb 5, 2024
210a994
Merge pull request #637 from bitpredator/dev
bitpredator Feb 6, 2024
8b6b14d
Merge pull request #638 from bitpredator/dev
bitpredator Feb 11, 2024
f2a17d5
Bump JohnnyMorganz/stylua-action from 3 to 4
dependabot[bot] Feb 12, 2024
9ecba96
Merge pull request #639 from bitpredator/dependabot/github_actions/Jo…
bitpredator Feb 12, 2024
e7a3a2d
Merge pull request #640 from bitpredator/dev
bitpredator Feb 12, 2024
36b4298
Merge pull request #641 from bitpredator/dev
bitpredator Feb 13, 2024
af3fc9b
Merge pull request #642 from bitpredator/dev
bitpredator Feb 14, 2024
e3a05e3
Bump actions/dependency-review-action from 4.0.0 to 4.1.0
dependabot[bot] Feb 15, 2024
3bfd6b7
Merge pull request #643 from bitpredator/dependabot/github_actions/ac…
bitpredator Feb 16, 2024
fff008f
Merge pull request #644 from bitpredator/dev
bitpredator Feb 19, 2024
549030e
Bump actions/dependency-review-action from 4.1.0 to 4.1.2
dependabot[bot] Feb 20, 2024
f25e715
Merge pull request #645 from bitpredator/dependabot/github_actions/ac…
bitpredator Feb 20, 2024
e0ba0a6
Bump actions/dependency-review-action from 4.1.2 to 4.1.3
dependabot[bot] Feb 21, 2024
aa5aecc
Merge pull request #646 from bitpredator/dependabot/github_actions/ac…
bitpredator Feb 21, 2024
3f3b2b3
Bump the npm_and_yarn group across 1 directories with 1 update
dependabot[bot] Feb 21, 2024
f942de1
Merge pull request #647 from bitpredator/dependabot/npm_and_yarn/serv…
bitpredator Feb 21, 2024
e885a12
Merge pull request #648 from bitpredator/dev
bitpredator Feb 23, 2024
fe85ea0
Merge pull request #649 from bitpredator/dev
bitpredator Feb 23, 2024
17ddf41
Merge pull request #650 from bitpredator/dev
bitpredator Feb 25, 2024
dcaafb3
Merge pull request #651 from bitpredator/dev
bitpredator Feb 25, 2024
eaeeb27
Merge pull request #652 from bitpredator/dev
bitpredator Feb 26, 2024
0db41b6
Merge pull request #653 from bitpredator/dev
bitpredator Feb 26, 2024
9577019
Merge pull request #654 from bitpredator/dev
bitpredator Feb 27, 2024
7fd38b3
Merge pull request #655 from bitpredator/dev
bitpredator Feb 28, 2024
ea61542
Merge pull request #656 from bitpredator/dev
bitpredator Feb 28, 2024
e968426
Merge pull request #657 from bitpredator/dev
bitpredator Feb 28, 2024
6fdf819
Merge pull request #658 from bitpredator/dev
bitpredator Feb 29, 2024
d1d836c
Merge pull request #659 from bitpredator/dev
bitpredator Feb 29, 2024
cf91f94
Merge pull request #660 from bitpredator/dev
bitpredator Mar 1, 2024
ac03ede
Merge pull request #662 from bitpredator/dev
bitpredator Mar 2, 2024
269de02
Merge pull request #663 from bitpredator/dev
bitpredator Mar 3, 2024
b3f6ac6
Merge pull request #664 from bitpredator/dev
bitpredator Mar 3, 2024
89a7b79
chore: fixes in es_extended removed some files and other useful works
busco82 Mar 6, 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
2 changes: 1 addition & 1 deletion .github/workflows/dependecy-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ jobs:
- name: Checkout
uses: actions/checkout@v4 #v3
- name: Dependency Review
uses: actions/dependency-review-action@01bc87099ba56df1e897b6874784491ea6309bc4 # v2
uses: actions/dependency-review-action@9129d7d40b8c12c1ed0f60400d00c92d437adcce # v2
23 changes: 0 additions & 23 deletions .github/workflows/formatt-all.yml

This file was deleted.

2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ server-data/resources/\[gameplay]
server-data/resources/\[managers]
server-data/resources/\[system]
server-data/resources/\[system]/\[builders]
server-data/resources/\[test]
server-data/resources/\[gamemodes]

# Resources log
server-data/resources/\[phone]/npwd/sv_npwd.log
5 changes: 3 additions & 2 deletions server-data/resources/[esx]/es_extended/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -631,7 +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.

es_extended Copyright (C) 2022-2024 bitpredator
es_extended
Copyright (C) 2015-2023 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
Expand All @@ -651,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:

es_extended Copyright (C) 2022-2024 bitpredator
es_extended Copyright (C) 2015-2023 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.
Expand Down
10 changes: 3 additions & 7 deletions server-data/resources/[esx]/es_extended/client/common.lua
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
exports("getSharedObject", function()
return ESX
return ESX
end)

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://bitpredator.github.io/bptdevelopment/docs/esx-tutorial/sharedevent for how to fix!"):format(Invoke))
end)
Loading
Loading