Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Admin Menu Player Markers (2) #412

Merged
merged 8 commits into from Jan 6, 2018
Merged

Fix Admin Menu Player Markers (2) #412

merged 8 commits into from Jan 6, 2018

Conversation

Jason2605
Copy link
Member

Admin Markers

Resolves #292

Changes proposed in this pull request:

  • Very simple re-work of how the Admin Markers work.

  • I have tested my changes and corrected any errors found

@Jason2605 Jason2605 added the bug-fix For pull requests that fix a bug or other issue. label Jan 6, 2018
Copy link
Member

@DomT602 DomT602 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, just one thing about life_fnc_checkMap, you'll need to remove the current way it handles for civs/cops/medics in fn_keyHandler, the mapkey parts.

DomT602
DomT602 previously approved these changes Jan 6, 2018
@Jason2605
Copy link
Member Author

Good spot, thanks 👍

@Wackbatt Wackbatt self-requested a review January 6, 2018 22:08
Copy link
Member

@Wackbatt Wackbatt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@Jason2605 Jason2605 merged commit fe9f14a into AsYetUntitled:master Jan 6, 2018
@Jawshy Jawshy changed the title Markers Fix Admin Menu Player Markers (2) Jan 7, 2018
@Jawshy Jawshy added this to Done in v5.0.0 Jan 7, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug-fix For pull requests that fix a bug or other issue.
Projects
Development

Successfully merging this pull request may close these issues.

None yet

3 participants