forked from esx-framework/esx_core
-
-
Notifications
You must be signed in to change notification settings - Fork 0
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
Update #2
Open
thefourcraft
wants to merge
529
commits into
IMS-Network:production
Choose a base branch
from
esx-framework:main
base: production
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Update #2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
improve setjob function
Add Indonesian translations
Create id.lua
xPlayer.removeWeaponAmmo
fix(es_extended/server/classes/player): trying to use non existent event
fix player metadata can get set to false.
Signed-off-by: JustZerooo <pohlmann_1987@web.de>
Player health regenerating even when it's disabled. It needs to be re-setted on ped change.
fix(es_extended/client/modules/actions): player health regeneration
…pping" This reverts commit 47920b7.
refactor(es_extended/client/main): use esx keymapping function
Added a function 'ESX.DeleteJob' to be used in runtime to delete jobs.
skin_male and skin_female fields in job_grades table does not have a default value and there for server console spits error when creating job in runtime. This is now fixed.
fixed a typo
chore(readme.md)
ESX.CreateJob - Fixed error for skin no default value
Added ESX.DeleteJob for Runtime
Revert "Added ESX.DeleteJob for Runtime"
🔄 Sync Main to Dev
In the last update, **RegisterInput** tries to execute the command on key release due some checks removal in #1303 . The check was restored and tested. **HashString** breaks when the joaat returns a hash bigger than 2^31. It was fix using a [shift mask](https://stackoverflow.com/a/20294714).
Add an option to use the cancel function instead of the close function when closing a menu or all menus.
fix(es_extended/client/functions.lua) RegisterInput and HashString bug
🚑 Release Hotfix 1.10.9
🚑 Fix release actions
chore: bump manifest version to 1.10.9
by default, use the txAdmin locale, unless a `esx:locale` is specified. This allows people to change languages easier, since everything will be in the same place, and if they want to specify a different language for ESX, then they can do. This also wont break anything, since it wont affect existing users whom will aready have the `esx:locale` set
🔄 Main to Dev
tweak(es_extended): use correct correct handling
fix(es_extended/client/functions.lua): Fix typos
tweak: use txAdmin locale by default
chore(readme.md): remove oxygenserv from readme
🔁 Dev -> main
chore: bump manifest version to 1.10.10
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.