Commit Graph

666 Commits

Author SHA1 Message Date
MiddleSkillz 8f91023bd9 Added Some More Stuff 2021-05-05 01:18:20 -06:00
ESXCrackhead 77f34b0176 Merge pull request #1115 from Mycroft-Studios/legacy
[Big Updates]
2021-05-03 18:10:41 -05:00
Mycroft cfa6a44b99 Update commands.lua 2021-05-03 23:48:42 +01:00
Mycroft acaa467cf4 Update commands.lua 2021-05-03 23:44:29 +01:00
Mycroft 5b1e5b9ea4 add more commands 2021-05-03 23:32:02 +01:00
Mycroft 1b481797eb Update commands.lua 2021-05-03 22:43:27 +01:00
Mycroft 640befda57 Update commands.lua 2021-05-03 22:41:49 +01:00
Mycroft c8c8ffeb4d add features 2021-05-03 22:37:02 +01:00
Mycroft 1f69396992 Update main.lua 2021-05-03 21:48:22 +01:00
Mycroft 8b55ba4c18 Update commands.lua 2021-05-03 20:41:53 +01:00
Mycroft 6c7b3ecf9e tweaks 2021-05-03 20:39:18 +01:00
Mycroft 9212219d46 changes 2021-05-03 20:04:39 +01:00
ESXCrackhead d4223d9f4e Merge pull request #1114 from SMVampire/patch-1
[Legacy] Add Missing Weapons & Components + Jenkins Hashing
2021-05-02 22:42:46 -05:00
SMVampire e306b14669 Add new Wep&Comps to English Locale 2021-05-02 22:55:35 -04:00
SMVampire 5dffe82a52 Add Missing Weapons/Comps & Jenkins GetHashKey
This adds all of the missing weapons and matching components to the weapons config.
This also switches all the GetHashKey native commands to compiletime Jenkins hashes.
They function the same, but are about 75% faster than GetHashKey.
[FiveM HashKey Cookbook](https://cookbook.fivem.net/2019/06/23/lua-support-for-compile-time-jenkins-hashes/)
2021-05-02 21:53:14 -04:00
Mycroft c4add91157 things 2021-04-29 23:04:36 +01:00
Mycroft 7d2488e40c config 2021-04-29 19:53:32 +01:00
Mycroft 75d7a63ec2 Update version.json 2021-04-29 18:41:44 +01:00
Mycroft bee2165105 Kashacter 2021-04-29 18:39:31 +01:00
Mycroft 9849bc9e51 Version Checker 2021-04-28 22:03:39 +01:00
Mycroft 4b2d95059c Updates 2021-04-28 21:42:12 +01:00
Mycroft bac6cbbb7e add commands 2021-04-26 19:05:58 +01:00
Mycroft 997fe7fc24 Add Comments 2021-04-26 16:28:08 +01:00
Mycroft 78c950f9b1 Add Config 2021-04-26 16:21:56 +01:00
FuraXx 1ecb8c7718 Merge pull request #1110 from Mycroft-Studios/legacy
(update) Legacy Readme fixes
2021-04-11 20:27:17 +02:00
Mycroft 2877cd2520 Update README.md 2021-04-11 16:02:51 +01:00
Mycroft cf5dd2b45d Update README.md 2021-04-11 16:00:23 +01:00
Mycroft 4546c3d04c Revert "kashacters changes"
This reverts commit 372774b8e4.
2021-04-06 22:57:06 +01:00
Mycroft c31f1c62b1 Revert "d"
This reverts commit 1036043629.
2021-04-06 22:57:03 +01:00
Mycroft 1036043629 d 2021-04-06 22:56:56 +01:00
Mycroft 372774b8e4 kashacters changes 2021-04-06 19:31:26 +01:00
ESXCrackhead 694cd67578 Merge pull request #1105 from tabarra/patch-1
default group for ace admins
2021-04-04 19:25:05 -05:00
tabarra e265976561 default group for ace admins
This allows server owners to become ESX admins on their first joins, based on if they have the `command` ace permission or not.  
If they do have that ace, they can `setgroup <id> admin`, so access-wise that's ok.  
I would commit this to master, but since v2 is not yet ready, PlumeESX uses "v1-final".
2021-04-04 16:30:04 -03:00
Jérémie N'gadi 06d19fdb1b Update README.md 2020-05-25 12:26:33 +02:00
Jérémie N'gadi 8142635859 Merge pull request #751 from xtrsyz/master
fix give_ammo, mistake from fixed #633
2020-05-22 11:32:43 +02:00
Jérémie N'gadi 62ded4f3a0 Merge pull request #722 from justtos/master
Add the "item_name" as an argument when executing the use item callback
2020-05-22 11:31:55 +02:00
Jérémie N'gadi fb586731c4 Merge pull request #761 from Tinky124/patch-1
Fix random position saving problem
2020-05-17 13:28:06 +02:00
Tinky 2d9de9e4c4 Fix random position saving problem
This fix the problem when position doesnt save good...
2020-05-17 11:55:31 +02:00
Jérémie N'gadi 24d2cc894f Merge pull request #760 from ArkSeyonet/master
Update es_extended
2020-05-17 11:35:33 +02:00
ArkSeyonet eacf7c0b94 Update es_extended
- Finish removing code for forcing stop resources
2020-05-17 04:16:00 -05:00
Jérémie N'gadi af87fc5319 Merge pull request #758 from shortybsd/patch-2
Update es_extended.sql
2020-05-16 23:54:31 +02:00
shortybsd c302098aa5 Update es_extended.sql
INT & TINYINT - Integer display width is deprecated and will be removed in a future release.
2020-05-16 16:26:28 -05:00
Satria Adhi a62890cc56 fix give_ammo, mistake from fixed #633 2020-05-16 19:43:30 +07:00
FuraXx 493b5c1fd0 Update README.md
- Add forum link
2020-05-16 10:34:33 +02:00
Jérémie N'gadi efdc1f580d Merge pull request #749 from ArkSeyonet/master
Finalize Update To Support Custom Loading Screens and ESX Identity Changes
2020-05-16 10:21:22 +02:00
ArkSeyonet 241b7f1346 Remove config option that wasn't used anymore 2020-05-15 17:16:31 -05:00
ArkSeyonet 7e53b8a93d Merge branch 'master' of https://github.com/ArkSeyonet/es_extended 2020-05-15 17:15:11 -05:00
ArkSeyonet ce48aa26c9 Update for es_extended
Merged Config option into normal code due to it not affecting any compatibility anywhere
2020-05-15 17:14:08 -05:00
Jérémie N'gadi 9efbb791ac Merge pull request #748 from ArkSeyonet/master
Update es_extended for newer features
2020-05-15 22:44:34 +02:00
ArkSeyonet d23dfc291d Update es_extended for newer features
1) Increase Citizen.Wait(3000) to Citizen.Wait(4000) so that the loading screen will shut down at a unified time between local and remote hosted servers
2) Include ShutdownLoadingScreenNui() for custom loading screens
3) Add additional event for Config.UseESXIdentity called esx:loadingScreenOff for future requests that will prevent UI objects from showing before the loading screen is shut down
4) Added default opacity of 0.0 to UI so that the script can determine when to show the UI based on whether loading screen is open still or not
5) Removed list of resources to force stop as FiveM is against shutting these scripts down, and most don't agree with forcing scripts to stop
2020-05-15 15:39:52 -05:00