Commit Graph

240 Commits

Author SHA1 Message Date
ElPumpo eb356f2cb4 Merge branch 'master' of https://github.com/ESX-Org/es_extended 2018-06-16 10:18:13 +02:00
ElPumpo 6eb077461e Minor cleanup 2018-06-16 10:17:05 +02:00
AdrineX 6d41b42b8d Merge pull request #90 from AdrineX/master
Add locale for Cash and Finnish lang...
2018-06-12 17:54:50 -04:00
AdrineX 32a198daf8 Add Finnish lang.. 2018-06-12 17:58:23 +03:00
AdrineX dcb4fbdaa0 add locale for cash 2018-06-12 16:51:10 +03:00
Samuel f4f9d13893 Merge pull request #85 from Ferreira312/patch-2
Update br.lua
2018-05-30 20:52:03 +02:00
Samuel 71f5ecdd4d Merge pull request #86 from 123B3n/patch-1
Resolved invalid number format
2018-05-29 19:03:20 +02:00
Ben Sherman f5a9a96f38 Resolved invalid number format
Setting jobs on players causes grade check to return an error rather than the check itself.

`if PlayerData.job.grade >= 3 then` returns `Attempt to compare number with string`
2018-05-26 22:51:08 +02:00
MrLumi 56597825da Update br.lua 2018-05-24 19:37:29 +01:00
nearbyplayer a055373343 Merge pull request #82 from psycodeliccircus/patch-1
fix on update v1.0.14  20/05
2018-05-20 22:54:32 -04:00
renildomarcio 181bf9218d Update 20/05 2018-05-20 21:36:23 -03:00
renildomarcio 321e4b2af8 fix on update v1.0.14
100% corrected translation
2018-05-20 08:51:51 -03:00
ElPumpo 6511182681 Config cleanup, final commit v1.0.14 2018-05-16 21:14:08 +02:00
Samuel cc75679e8e Merge pull request #79 from SaltyGrandpa/master
Update main.lua (Fix Issue #38)
2018-05-16 20:12:51 +02:00
Corey McCown 8b8a4f45ec Update main.lua
Fix #38, item pickup issue.
2018-05-15 13:46:09 -04:00
ElPumpo 0cd409add9 Fixed invalid SQL 2018-05-13 22:30:09 +02:00
ElPumpo 66e7eceddf Improved paycheck system, added advanced notifications, see desc
- Improved paycheck system
    - we now take society money if there is any, or else the employees wont get a salary at all
    - now using ESX.ShowAdvancedNotifications
2018-05-11 13:57:35 +02:00
ElPumpo 987a40bf0d ESX.Game.GetVehicleInDirection, no more car spawn with radio 2018-05-05 23:56:12 +02:00
ElPumpo 8c129873f0 Fixed #67 one last time 2018-05-01 21:56:41 +02:00
ElPumpo 3760c3350f Improved translations, fixes #69 and #67 2018-05-01 12:09:06 +02:00
ElPumpo 0edf413a99 Exploit fixed: money negative values 2018-04-28 11:34:25 +02:00
Samuel 160dc9c849 Update README.md 2018-04-17 00:38:48 +02:00
ElPumpo 5f93c0a129 Improved i18 formatting, see desc
- /giveweapon now takes ammo as an argument
- improved Swedish translation
- hide actions in the inventory menu if they cannot be done.
- general code improvements, cleanup
2018-04-15 22:52:03 +02:00
ElPumpo 8b648c5d7f (i18n) added missing strings 2018-04-15 20:41:31 +02:00
Samuel c7e5d5d6ab Added legal information 2018-04-15 13:44:18 +02:00
Samuel 03da86848e Updated README with accual information 2018-04-15 13:39:46 +02:00
ElPumpo 36d82c922f See the description for changes (cleanup)
- reworked /setmoney [id] [money type] [amount]
- implemented /disc (/disconnect)
- the give submenu does no longer appear if there's no one nearby
- if you have 0 cash, bank or black money it wont appear in your f2 inventory
- when selecting a item, let the item label be the title of the menu (inventory menu)
- minor improvements
2018-04-15 01:33:33 +02:00
ElPumpo 2e67349645 Fixed hardcoded strings, added new trigger esx:onPlayerDeath 2018-04-14 14:25:37 +02:00
Samuel 6f79aef90f Merge pull request #60 from psycodeliccircus/patch-3
Update br.lua
2018-04-09 23:46:10 +02:00
Samuel e9c747e172 Merge branch 'master' into patch-3 2018-04-09 23:45:58 +02:00
Samuel 47963d5b0a Merge pull request #59 from psycodeliccircus/patch-2
Create br_es_extened.sql
2018-04-09 10:44:21 +02:00
Samuel e0c980a9ff Merge pull request #57 from Ferreira312/patch-1
Update br.lua
2018-04-09 10:43:54 +02:00
renildomarcio 6153d95686 Update br.lua 2018-04-01 12:18:10 -03:00
renildomarcio 7f8f7f8804 Create br_es_extened.sql 2018-04-01 12:15:25 -03:00
MrLumi 5fbf544e0f Update br.lua 2018-03-28 11:09:52 +01:00
Jérémie N'gadi 2bcd3c0ed2 Merge pull request #50 from tracid56/patch-2
Add Doomsday Weapons
2018-03-17 18:59:10 +01:00
Jérémie N'gadi 315010f67d Merge pull request #49 from tracid56/patch-1
Add Doomsday Weapons.
2018-03-17 18:59:01 +01:00
Jérémie N'gadi e38023d401 Merge pull request #51 from ElPumpo/master
Fixed famous ammo bug
2018-03-17 18:57:54 +01:00
ElPumpo aacc2d1083 Fixed ammo bug
Fixed the famous ammo bug where if you remove a weapon from your inventory, it doesn't remove the ammo for it.
2018-03-17 18:11:16 +01:00
Tracid 88c4c22fae Best Name Weapons 2018-03-17 16:27:55 +01:00
Tracid 7a6c789bec Update fr.lua 2018-03-17 16:11:00 +01:00
Tracid 2434eaee00 Update config.weapons.lua 2018-03-17 16:10:13 +01:00
Tracid 06ad627b98 Update fr.lua 2018-03-17 15:42:24 +01:00
Tracid 0b23dde6c8 Update config.weapons.lua 2018-03-17 13:44:32 +01:00
Tracid 60bde9e439 Add Doomsday Weapons 2018-03-17 07:42:31 +01:00
Tracid 09b1164e15 Add Doomsday Weapons. 2018-03-17 07:38:26 +01:00
Jérémie N'gadi 9917ac369b Merge pull request #47 from Vanheden/patch-3
Create sv_es_extended.sql
2018-03-16 21:47:26 +01:00
Jérémie N'gadi 5485d51593 Merge pull request #46 from Vanheden/patch-2
Update __resource.lua
2018-03-16 21:47:03 +01:00
Jérémie N'gadi 255254d051 Merge pull request #45 from Vanheden/patch-1
Create sv.lua
2018-03-16 21:46:49 +01:00
Jérémie N'gadi 366abeb280 Merge pull request #48 from dexslab/master
Fixed vehicle network id issues by removing mission entity re
2018-03-16 21:46:14 +01:00