Commit Graph

71 Commits

Author SHA1 Message Date
ArkSeyonet ba0961095c Merge pull request #240 from Leon485/master
Edited the combat log system (Will revert if deemed disadvantageous)
2021-02-01 14:12:45 -06:00
ArkSeyonet 122c6f6aae Merge branch 'master' into master 2021-02-01 14:06:01 -06:00
SamBehner e672c3072e Stop autorespawning (#260)
Probably fixing autorespawning.
2020-07-20 14:47:30 +01:00
LeonAnderson48 27b9b8e9ac Changed the client/main.lua
By changing the main.lua i have made it so that if a player is to combat log and then join back, this will kill them and reset the timer so that they cannot force respawn
2020-05-14 17:16:04 +01:00
LeonAnderson48 cacb1baba7 Delete main.lua 2020-05-14 17:14:09 +01:00
ElPumpo 2da17bc123 Support latest esx 2020-03-24 10:33:56 +01:00
ElPumpo 739a228dd2 Updated to work with latest ESX 2020-02-17 21:15:52 +01:00
Alex Garcio e8e3eaa4d1 Added ability to find an invisible dead player
https://github.com/ESX-Org/esx_ambulancejob/issues/20
2020-02-13 16:44:14 -05:00
ElPumpo 783a5eeae2 Fixed remove blips on change job, fixed blip not properly registering 2020-02-06 13:06:25 +01:00
ElPumpo ef171d2ded Minor cleanup, removed unused code 2020-01-24 11:33:53 +01:00
ElPumpo 9a80cd0dcd Minor code improvements 2020-01-24 11:19:56 +01:00
ElPumpo 6f8587b391 Implemented dead player blips, closes #46 (read desc)
- Fixed vehicles in vehicle shop not unloading
- Use busy spinner instead of drawing when loading vehicles
2020-01-19 17:14:33 +01:00
ElPumpo 210b98975a Removed old lastPosition code 2020-01-12 22:15:47 +01:00
rex2630 dcc113ae06 Removed keys table (#172)
* Removed keys table

* Changed key values to numbers
2020-01-04 11:17:55 +01:00
ElPumpo 88b284f925 Minor changes 2019-10-27 00:12:36 +02:00
ElPumpo 19d6e032af Proper hud natives 2019-05-20 23:04:48 +02:00
ElPumpo c116378a6b Close all esx menus upon death 2019-03-09 15:41:54 +01:00
ElPumpo 7da37f36fc Disable all actions when healing 2019-02-24 12:48:03 +01:00
ElPumpo 7b614c3c7b Bandage & Medkit animations upon usage, closes #116 2019-02-24 12:44:06 +01:00
ElPumpo 56159154fe Don't parse vector3 since serializer doesn't support
See https://github.com/ESX-Org/es_extended/issues/216 for more information
2019-02-22 18:43:44 +01:00
ElPumpo 439927f28a Added respawn to config, very final commit v1.2.0 2018-12-30 23:34:24 +01:00
ElPumpo e7eabab212 New helicopter system, Config re-write 2018-12-30 23:05:04 +01:00
ElPumpo ee6b8a4c85 Proper math namespace 2018-12-23 15:08:05 +01:00
ElPumpo 8fb57b856c Much better revive animation 2018-11-25 14:41:36 +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 5df6542871 Renamed column isDead to is_dead 2018-11-03 23:10:19 +01:00
ElPumpo fab5f4d167 Disable most inputs when dead (unconscious can't speak, right?) 2018-10-30 23:58:00 +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 60eaf7faa8 Moved job-related functions to seperate file 2018-09-21 20:46:59 +02:00
ElPumpo 729bb0eb43 Minor locale changes 2018-09-04 22:36:58 +02:00
nearbyplayer ad4c159a0b Fixes Indentation & Formatting
This fixes indentation and follows .editorconfig
2018-08-10 12:50:30 -04:00
nearbyplayer bdb0c68569 Respawn Timer Overhaul & Repo Update
* Fixes #64 (Timer related)

* Will need Locale translation
2018-08-10 01:07:49 -04:00
ElPumpo 567378710e Fixed walking when dead 2018-07-10 12:57:42 +02:00
ElPumpo 83d0f2fc20 Yet a possible fix for auto-respawn bug, fixed money dupe by reviving multiple times 2018-07-03 00:19:55 +02:00
ElPumpo fdcc9ab9e5 Fixed RemoveWeaponsAfterRPDeath, fixes #21 2018-06-20 21:24:00 +02:00
MarioRogue 784aa4e1df No more respawn for no reason 2018-06-09 23:27:44 +03:00
ElPumpo b0011647a6 Added sending distress signals to available medics 2018-06-06 22:43:47 +02:00
ElPumpo 20174d6876 Possible fix for invisable players, 3rd party ipl loader compability 2018-06-06 13:12:02 +02:00
ElPumpo 8b5f2bdf71 Check for if player is concious, fixed missing translations 2018-04-25 21:55:09 +02:00
ElPumpo bac6df219d Refactored vehicle list to config (closes #37), fixed restarting script, code improvements
- A lot of minor changes here aswell, for example proper aligment, the menu wont close if you don't have a medkit when attempting to revive players
- Moved to four space (tab) indents
- Proper i18n formatting
2018-04-24 20:34:09 +02:00
ElPumpo 9e18a0f0c4 Moved anti-combat to config (enabled by default) 2018-04-15 01:41:37 +02:00
ElPumpo 65100a8abd Implemented anti-combat log 2018-04-14 23:22:09 +02:00
ElPumpo be480476b1 Use new trigger, fixed urls in readme 2018-04-14 14:25:00 +02:00
Jarrett B c92d71e7ff Universal marker size. 2018-01-14 21:04:21 -08:00
renaiku b29f12c77e Big revamp of the script. Should be bugless. 2017-10-17 20:53:47 +02:00
Jérémie N'gadi cb61181ade fix(client): Correctly remove weapons when dead 2017-09-23 10:09:04 +02:00
Romain Lanz 546e8a69bf chore(coding-style): convert tabs to spaces 2017-09-20 21:40:59 +02:00
Romain Lanz b30d9e06e1 fix(marker): move blip out of Zones Table 2017-09-20 21:20:28 +02:00