Commit Graph

6209 Commits

Author SHA1 Message Date
ElPumpo c77e2948bc Merge branch 'master' of https://github.com/ESX-Org/esx_accessories 2018-11-04 22:56:32 +01:00
ElPumpo bef16c09b6 Enforce 2 space indent on locale files 2018-11-04 22:56:19 +01:00
April 2028350a95 fix for removing glasses (#11)
* fixed issue where you couldn't remove glasses (or incorrect glasses were put on)
2018-11-04 22:52:17 +01:00
ElPumpo d70d4af996 Minor changes 2018-11-04 22:50:01 +01:00
ElPumpo 750c125db7 name as primary key 2018-11-04 22:32:56 +01:00
ElPumpo c5aa786087 name as primary key 2018-11-04 22:32:37 +01:00
ElPumpo e06aa05b0e name as primary key 2018-11-04 22:31:56 +01:00
ElPumpo a5bebc8bec Fixed max key length error 2018-11-04 22:21:19 +01:00
ElPumpo c9187dd6df Corrected is_dead 2018-11-04 21:28:54 +01:00
Jeffrey-Lang 485dc685f2 Fixed respawning with /revive (#87)
- Fix spawning at hostiptal with /revive command or revive by ems menu
- Now correctly repawning to hospital after bleedoutTimer runs out
2018-11-04 21:27:34 +01:00
ElPumpo db3e45ce32 Fixed bugs with setting death status, combat loggers now force-respawn 2018-11-04 21:20:54 +01:00
ElPumpo ce687ff579 Manal pr closes #12 2018-11-04 12:35:11 +01:00
ElPumpo ee768270dd Make sure only admin can write to disk #13 2018-11-04 12:33:22 +01:00
ElPumpo 2bad03e88a Removed confirm escape 2018-11-04 12:32:28 +01:00
ElPumpo db29c87ae4 Final commit v1.1.1 2018-11-03 23:10:52 +01:00
ElPumpo 5df6542871 Renamed column isDead to is_dead 2018-11-03 23:10:19 +01:00
ElPumpo ae1a7c8ca0 Added index to datastore
Co-Authored-By: GHMatti <ghmatti@users.noreply.github.com>
2018-11-03 23:08:23 +01:00
ElPumpo 74653246b0 Performance, respect EnableHud from ESX 2018-11-03 21:53:44 +01:00
ElPumpo 53e0ac9a20 Fix for job when script restarts 2018-10-31 16:03:54 +01:00
ElPumpo f3ddbf05b4 Security improvements 2018-10-31 15:59:59 +01:00
ElPumpo 922f0c17a7 JS cleanup, performance improvements 2018-10-31 15:58:36 +01:00
ElPumpo d65947e61b Locale cleanup 2018-10-31 15:25:08 +01:00
ElPumpo a38b560a16 Enforced 4 tab indent 2018-10-31 15:20:47 +01:00
ElPumpo 5410bf75e8 Secutity improvements, lua executor safe 2018-10-31 14:33:05 +01:00
ElPumpo fab5f4d167 Disable most inputs when dead (unconscious can't speak, right?) 2018-10-30 23:58:00 +01:00
ElPumpo c2b1c1de8b Enforce 4 tab indent, final commit v1.1.0 2018-10-30 23:33:32 +01:00
ElPumpo 8f18c991b8 Death screen update, see description
The system has been changed, so that you will first enter a 'respawn available in x' timer, then after that a bleedout timer will appear.
2018-10-30 23:22:58 +01:00
ElPumpo 9189039cbc Removed incomplete translation 2018-10-30 23:14:41 +01:00
Samuel 9692058311 Merge pull request #197 from rp-esx-fivem/master
USE essentialmode db in esx_policejob.sql
2018-10-30 20:07:14 +01:00
ElPumpo bc233a1441 See description, resolves #38, resolves #36
- Fixed console error when adding invalid number (use _source)
- Fix contacts not refreshing when added (fixed broken code)
- Play sound when message recieved
- Close phone if open when script is stopping
- Get back contacts, etc when restarted mid-game
2018-10-30 15:25:53 +01:00
ElPumpo 291f6eb753 Properly formatted html files 2018-10-30 13:39:07 +01:00
ElPumpo 1ef8df207a Removed unused files 2018-10-30 13:17:19 +01:00
Samuel b87bc89781 Merge pull request #34 from deviljin112/master
Little Fix up + Translation PL
2018-10-30 13:13:20 +01:00
ElPumpo 58bbe4ebcb Re-added error message if number is unassigned 2018-10-30 13:00:41 +01:00
celestian e67aeee961 USE essentialmode db in esx_policejob.sql
Resolves #196
2018-10-28 17:26:31 +01:00
ElPumpo 542ff5a505 Fixed invalid sql fixes #29, closes #31 2018-10-26 21:22:40 +02:00
ElPumpo c7ea22d464 Get price server side 2018-10-22 23:28:03 +02:00
ElPumpo fb4887565c Properly formatted strings 2018-10-22 23:17:36 +02:00
ElPumpo ca85a1fff6 Initial cleanup 2018-10-22 22:50:43 +02:00
ElPumpo 4c5d1532b2 Added ESX.Math.* 2018-10-22 22:37:20 +02:00
Samuel dbafc73cff Merge pull request #57 from propstg/master
grammar fix
2018-10-22 18:32:17 +02:00
ElPumpo 3501f8a23b Fixed #56 2018-10-21 12:38:07 +02: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
Samuel e663862ccb Merge pull request #194 from SleepyMode/patch-1
Fix English localization of the SQL file
2018-10-21 11:01:34 +02:00
gregory propst ad0ce1bfe2 grammar fix 2018-10-20 17:30:57 -04:00
ElPumpo d987bfa877 Final commit v1.3.0 2018-10-20 20:09:11 +02:00
ElPumpo 70a882165e Implemented multiple vehicle spawn point system, closess #109 2018-10-20 20:06:47 +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 fb6f429394 RegisterNUICallback instead of AddEventHandler, improves performance
Co-Authored-By: SomeGuyX <someguyx@users.noreply.github.com>
2018-10-17 20:35:30 +02:00
ElPumpo 39c71ce4a9 Minor improvements, removed unused assets 2018-10-17 20:04:22 +02:00