Commit Graph

6209 Commits

Author SHA1 Message Date
Romain Lanz 3c75b44ad7 chore(coding-style): fix indentation 2017-09-14 21:58:37 +02:00
Romain Lanz 2fa1ff9ff4 chore(coding-style): correct indentation 2017-09-14 21:21:24 +02:00
Jérémie N'gadi 3eb7d27761 Fix crash when searching npc 2017-09-14 21:16:56 +02:00
Romain Lanz 29569ce133 fix(locales-en): typo in key name 2017-09-14 21:16:28 +02:00
Romain Lanz f9cd4f7ebc chore(coding-style): correct indentation 2017-09-14 18:04:21 +02:00
Romain Lanz e66b7acb17 chore(coding-style): correct indentation 2017-09-14 17:55:37 +02:00
Romain Lanz 5c4ca0168e chore(coding-style): correct indentation 2017-09-14 16:54:37 +02:00
Romain Lanz 39bd6a80f0 chore(coding-style): correct indentation 2017-09-14 16:52:50 +02:00
Romain Lanz 40e0d72491 chore(coding-style): correct indentation 2017-09-14 16:51:17 +02:00
Romain Lanz 4eb84d19eb chore(coding-style): correct indentation 2017-09-14 16:49:54 +02:00
Romain Lanz adf225574c chore(coding-style): correct indentation 2017-09-14 16:36:56 +02:00
Romain Lanz 7475640ae1 chore(coding-style): correct indentation 2017-09-14 16:23:35 +02:00
Romain Lanz 828624ccf8 chore(coding-style): correct indentation 2017-09-14 14:26:25 +02:00
Romain Lanz ed4b7ad887 chore(coding-style): correct indentation 2017-09-14 12:38:31 +02:00
Romain Lanz 64c99d111b chore(coding-style): update
- Adding the .editorconfig file
- Ensure there's a trailing comma
- Ensure there's a space before parameter when declaring a function
- Ensure there's no empty line before block declaration
- Ensure 2 spaces is used to indentate
2017-09-14 12:11:56 +02:00
Romain Lanz c418c94619 chore(coding-style): update
- Adding the .editorconfig file
- Ensure there's a trailing comma
- Ensure there's a space before parameter when declaring a function
- Ensure there's no empty line before block declaration
- Ensure 2 spaces is used to indentate
2017-09-14 10:58:18 +02:00
Romain Lanz f3e91f66e0 fix(sql): typo in french 2017-09-13 23:36:28 +02:00
Romain Lanz 5af5aac73f chore(locales-en): correct indentation 2017-09-13 23:17:34 +02:00
Romain Lanz 05dd5b5fc7 fix(locales): add comma
Closes https://github.com/FXServer-ESX/fxserver-esx_vehicleshop/issues/6
2017-09-13 23:15:42 +02:00
Romain Lanz efd73d5fc9 Merge pull request #7 from RomainForks/master
fix(locales): rename br file and correct indentation
2017-09-13 23:14:06 +02:00
Romain Lanz 5a2a36ca44 fix(locales): rename br file and correct indentation 2017-09-13 23:13:30 +02:00
Romain Lanz 690d0fdc72 fix(locales): typo in french translation 2017-09-13 23:06:36 +02:00
Jérémie N'gadi 348354ce7e Merge pull request #19 from RomainLanz/patch-2
fix(cloakroom): don't loose weapon while going back to citizen
2017-09-13 22:08:41 +02:00
Jérémie N'gadi 28d5269514 Merge pull request #12 from RomainLanz/patch-1
feat(loadout): extract loadout loading to his own handler
2017-09-13 22:06:28 +02:00
Romain Lanz f4871fba0f fix(cloakroom): don't loose weapon while going back to citizen 2017-09-13 22:06:28 +02:00
Romain Lanz bf80c92a4a feat(loadout): extract loadout loading to his own handler 2017-09-13 22:04:39 +02:00
Romain Lanz f47cc3fb69 feat(society): register the society witht the new system (#18)
* feat(society): register the society witht the new system

* Update main.lua
2017-09-13 21:29:57 +02:00
Jérémie N'gadi e1164eed01 Merge pull request #13 from RomainLanz/patch-1
fix(server): fix variable name
2017-09-13 21:24:18 +02:00
Romain Lanz 3caf7f8282 fix(server): fix variable name 2017-09-13 21:20:37 +02:00
Don aa394e1eb8 Merge pull request #2 from ArkSeyonet/master
Fixing Registration Not Working For Some Users
2017-09-13 09:26:25 -07:00
ArkSeyonet 6f7980d6e7 Update server.lua 2017-09-13 10:01:53 -05:00
ArkSeyonet d0b76fd4de Update server.lua 2017-09-13 10:00:31 -05:00
ArkSeyonet 6ffe62c364 Update server.lua 2017-09-13 09:59:05 -05:00
ArkSeyonet a9705ac271 Update server.lua 2017-09-13 09:56:03 -05:00
Jérémie N'gadi 8faec4d095 Try fix messages not sending + add phone animation 2017-09-13 14:52:49 +02:00
Jérémie N'gadi 600e0d5a1f Add GetDataStoreOwners 2017-09-13 14:49:27 +02:00
Jérémie N'gadi f9936dc41d Fix typo + add some events 2017-09-13 14:48:38 +02:00
Jérémie N'gadi db927c6530 Use new esx_society 2017-09-13 14:45:13 +02:00
Jérémie N'gadi 12f4c6f377 Use new esx_society 2017-09-13 14:44:43 +02:00
Jérémie N'gadi 446f7e5ce1 Use new esx_society 2017-09-13 14:44:08 +02:00
Jérémie N'gadi e5d22d61a8 Use new esx_society 2017-09-13 14:43:33 +02:00
Jérémie N'gadi 81e019f7fe Use new esx_society 2017-09-13 14:42:44 +02:00
Jérémie N'gadi 4d0a417de3 Use new esx_society 2017-09-13 14:42:01 +02:00
Jérémie N'gadi de6e240e33 Add registerSociety event 2017-09-13 14:40:43 +02:00
Jérémie N'gadi 0f9315acc3 Merge branch 'master' of https://github.com/FXServer-ESX/fxserver-esx_property 2017-09-13 12:30:13 +02:00
Jérémie N'gadi d59f61e422 Fix chest showing when visiting property 2017-09-13 12:30:05 +02:00
nearbyplayer 6cd451101c Update __resource.lua
Small fix.
2017-09-13 06:28:02 -04:00
Jérémie N'gadi a82d598a40 Merge branch 'master' of https://github.com/FXServer-ESX/fxserver-esx_policejob 2017-09-13 12:06:39 +02:00
Jérémie N'gadi 91e6aace4e Update licenses support 2017-09-13 12:06:28 +02:00
nearbyplayer 7be30b4c4d Small fix 2017-09-13 06:00:37 -04:00