search

d0p3t / fivem-js

Javascript and Typescript wrapper for the FiveM natives API
https://d0p3t.nl
Other
143 stars 57 forks source link

BlipPanel and misc. cleanup #13

Closed Yomanz closed 5 years ago

Yomanz commented 5 years ago

Adds the blip panel from https://github.com/glitchdetector/fivem-blip-info/

d0p3t commented 5 years ago

Pull Request is more than just it's original intend; BlipPanel's

Please create a new PR that only adds the BlipPanel. If you'd like to refactor Timerbar or anything else, please do that at a later stage in a separate PR. As for Timerbar specifically, I'm not comfortable enough to accept changes to that just yet as I have not completed this myself.

In the future I will be using feature branches to avoid this happening again.

Also make sure you correctly pull/merge from upstream

git fetch upstream
git merge --ff-only upstream/development
git push