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

Feature: Add player highlighting for the Punchcard Artifact #1089

Merged
merged 64 commits into from
Jun 16, 2024

Conversation

martimavocado
Copy link
Contributor

@martimavocado martimavocado commented Mar 2, 2024

What

Highlights unpunched players in the Rift, for use with the Punchcard Artifact.
Also adds an overlay with how many players were punched in the current session.
both these features have a reverse mode, highlighting only punched players and counting down how many punched players are left.
https://canary.discord.com/channels/997079228510117908/1211833441444823080

Images

2024-05-01_01 15 58

current issues:

  • if using chroma, it only applies a static color

Changelog New Features

  • Punchcard Artifact Highlighter & Overlay. - martimavocado
    • Highlights unpunched players in the Rift.

@martimavocado martimavocado marked this pull request as ready for review March 2, 2024 17:49
@hannibal002 hannibal002 added this to the Version 0.24 milestone Mar 2, 2024
@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Mar 4, 2024
Copy link

github-actions bot commented Mar 4, 2024

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Mar 4, 2024
Copy link

github-actions bot commented Mar 4, 2024

Conflicts have been resolved! 🎉

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Mar 6, 2024
Copy link

github-actions bot commented Mar 6, 2024

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@hannibal002 hannibal002 added the Soon This Pull Request will be merged within the next couple of betas label Mar 7, 2024
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Mar 7, 2024
Copy link

github-actions bot commented Mar 7, 2024

Conflicts have been resolved! 🎉

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Mar 9, 2024
Copy link

github-actions bot commented Mar 9, 2024

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@hannibal002 hannibal002 self-requested a review March 9, 2024 21:25
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Mar 9, 2024
Copy link

github-actions bot commented Mar 9, 2024

Conflicts have been resolved! 🎉

Copy link
Owner

@hannibal002 hannibal002 left a comment

Choose a reason for hiding this comment

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

Cant test, so only code cleanups so far.

Copy link

github-actions bot commented Jun 9, 2024

Conflicts have been resolved! 🎉

@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Jun 9, 2024
@hannibal002 hannibal002 added the Soon This Pull Request will be merged within the next couple of betas label Jun 15, 2024
Copy link
Owner

@hannibal002 hannibal002 left a comment

Choose a reason for hiding this comment

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

I cant test this feature in game. have just reviewed the code

Copy link
Owner

@hannibal002 hannibal002 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

Copy link
Owner

@hannibal002 hannibal002 left a comment

Choose a reason for hiding this comment

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

tested, works fine in game

@hannibal002 hannibal002 merged commit 420b43c into hannibal002:beta Jun 16, 2024
4 checks passed
@github-actions github-actions bot removed the Soon This Pull Request will be merged within the next couple of betas label Jun 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants