Commit Graph

65 Commits

Author SHA1 Message Date
LazarusOfTheFallen 0a6dc54564 Merge pull request #53 from surdaft/master
fix empty shop bug
2021-02-01 17:01:53 -06:00
Jérémie N'gadi d8715d347c Merge pull request #91 from shortybsd/patch-1
Update esx_shops.sql
2020-05-17 11:36:54 +02:00
shortybsd 9b78b2d5c0 Update esx_shops.sql
int - Integer display width is deprecated and will be removed in a future release.
2020-05-16 23:49:48 -05:00
ElPumpo 797ed36eef Latest ESX code 2020-04-14 16:52:53 +02:00
rex2630 0214e83478 Replace __resource.lua with fxmanifest.lua 2020-01-19 17:41:15 +01:00
Samuel b9e0f3a039 Merge pull request #77 from rex2630/patch-1
Removed unused variable
2019-11-14 20:08:34 +01:00
rex2630 3eb220ad5a Removed unused variable 2019-11-12 21:36:12 +01:00
ElPumpo 549c28ff61 Fixed #66, cleanup code 2019-10-20 09:50:32 +02:00
Poggu 4efea53b37 Added weight support (#65)
* Added weight support
2019-10-19 19:35:54 +02:00
ElPumpo 18b16dea70 Removed keys table 2019-10-12 23:42:21 +02:00
SurDaft - Jack Stupple d78f21d083 Fix markers not showing 2019-05-06 01:37:23 +01:00
SurDaft - Jack Stupple cd0ede5865 fix empty shop bug 2019-05-06 01:08:58 +01:00
Samuel e242f94588 Merge pull request #46 from BackrndSource/patch-1
Update es.lua
2019-04-27 08:06:21 +02:00
BackrndSource d7ceb92d56 Update es.lua 2019-03-27 12:36:14 +00:00
ElPumpo 51d7c83c7f Check IsControlJustReleased() every frame 2018-12-30 20:59:06 +01:00
Samuel 17d1093933 Merge pull request #39 from Prophidys/optimize
Optimize shop object loading
2018-11-20 19:45:47 +01:00
ElPumpo c975980198 Switched to async fetch, fixed issue where only the last item would appear. 2018-11-20 19:39:37 +01:00
Cedric LECOMTE 8bc906f518 Optimize shop object loading 2018-11-20 15:12:51 +01:00
Samuel 737a839ff3 Merge pull request #36 from Prophidys/fix_locales
Fix french localization.
2018-11-20 13:28:36 +01:00
Cedric LECOMTE 6fc21c8415 Fix french localization. 2018-11-20 13:12:34 +01:00
ElPumpo e227338573 Proper data items in locale, resolves #34 2018-11-19 18:58:06 +01:00
ElPumpo 3c1e9ab32d Enforced correct locale indent 2018-11-19 18:53:48 +01:00
ElPumpo 25071dfe33 Added exception handler when invalid item is found, closes #32 2018-11-19 18:47:26 +01:00
Samuel 652f8f31fd Merge pull request #30 from JakeRyan1/patch-1
Causing the marker on the ground to blink very fast
2018-10-21 11:17:45 +02:00
JakeRyan1 947b808326 Causing the marker on the ground to blink very fast
This will fix the issue with the ground marker blinking very fast needs to be ran every frame
2018-10-19 02:10:30 -04:00
ElPumpo 565af10b6c mysql-async v3.0.1 support 2018-09-24 17:31:33 +02:00
ElPumpo 670305b6c7 Merge branch 'master' of https://github.com/ESX-Org/esx_shops 2018-08-11 23:56:06 +02:00
ElPumpo 53cae38fe3 Corrected Swedish currency 2018-08-11 23:56:04 +02:00
nearbyplayer 171ef9e656 Repo Update 2018-08-10 00:55:30 -04:00
Samuel 4329b281d6 Merge pull request #21 from majormarcin/master
add pl
2018-07-16 20:48:05 +02:00
MajorMarcin 3e855c0f0e add pl 2018-07-16 11:37:06 +02:00
ElPumpo 9a337a09b9 Fixed max slider when item limit is unlimited 2018-07-11 12:24:56 +02:00
ElPumpo 538a97d3f3 Fixed max slider when item limit is unlimited 2018-07-11 12:16:58 +02:00
ElPumpo af3219663e Merge branch 'master' of https://github.com/ESX-Org/esx_shops 2018-07-07 12:52:20 +02:00
ElPumpo 88eecdd08b Fixed #19 2018-07-07 12:52:03 +02:00
Samuel 8e871ba24c Merge pull request #20 from psycodeliccircus/patch-2
update br.lua
2018-06-29 05:49:43 +02:00
renildomarcio eda97f33a7 update br.lua
update in portuguese translation
2018-06-25 16:35:50 -03:00
AdrineX 4e2c8e7c08 Merge pull request #17 from AdrineX/master
Add Finnish lang..
2018-06-12 13:56:12 -04:00
AdrineX 09a282b0cb Add Finnish lang.. 2018-06-12 18:17:04 +03:00
Samuel a5cef41c5f Update __resource.lua 2018-06-11 22:11:10 +02:00
Samuel dffd081ffb Update README.md 2018-06-11 22:09:41 +02:00
ElPumpo df4b505fe7 Major improvements, added slider 2018-06-11 22:07:57 +02:00
Samuel b4a7a43fa2 Update README.md 2018-04-30 17:25:28 +02:00
ElPumpo d43ff45bfa Fixed cheating exploit, empty shop bug, broken translation 2018-04-30 17:21:59 +02:00
Samuel d357703229 Merge pull request #10 from ESX-Brasil/patch-1
Update br.lua
2018-04-30 15:53:05 +02:00
renildomarcio a96e5b9c0a Update br.lua 2018-04-10 03:08:40 -03:00
ElPumpo a86f4232d1 Added missing manifest info, Swedish language 2018-04-09 12:33:27 +02:00
ElPumpo e9f34c5d31 Corrected trigger names 2018-04-09 12:30:33 +02:00
ElPumpo e02629fa4e Fixed having more than you can carry, closes #9
- Translation improvements with formatting
- General improvements
2018-04-05 12:40:58 +02:00
Jérémie N'gadi f52ba735a3 chore(resource): Add version 2017-09-15 15:40:36 +02:00