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.

Sign up for GitHub

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

Jump to bottom

Add Rory the Cat and a setting to change cats #372

Merged
merged 5 commits into from Nov 2, 2022
Merged

Add Rory the Cat and a setting to change cats #372

merged 5 commits into from Nov 2, 2022

Conversation

santiagocezar
Copy link
Contributor

@santiagocezar santiagocezar commented Nov 1, 2022 •
edited

Adds Rory and the possibility to add more cats in the future!

image
image

The drawings were made by @AshtakaOOf, and the previous cat is still selectable.

BTW, what about Rory becoming the default cat?

santiagocezar and others added 2 commits November 1, 2022 19:06
@santiagocezar @AshtakaOOf
add rory
0a0ce74 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
Co-authored-by: Ashtaka <66513643+AshtakaOOf@users.noreply.github.com>
@santiagocezar @AshtakaOOf
add rory flat too (and holiday variants)
668342b 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
Co-authored-by: Ashtaka <66513643+AshtakaOOf@users.noreply.github.com>
@santiagocezar santiagocezar marked this pull request as ready for review November 1, 2022 22:34
AshtakaOOf
AshtakaOOf approved these changes Nov 1, 2022
View reviewed changes
Copy link
Contributor

@AshtakaOOf AshtakaOOf left a comment

Choose a reason for hiding this comment

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

Cat 👍

@santiagocezar
forgot the qrc
7620301 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
@flowln flowln mentioned this pull request Nov 1, 2022
Closed
@flowln flowln added the enhancement New feature or request label Nov 1, 2022
@flowln flowln added this to the 6.0 milestone Nov 1, 2022
@AshtakaOOf AshtakaOOf mentioned this pull request Nov 2, 2022
Closed
triphora
triphora approved these changes Nov 2, 2022
View reviewed changes
Copy link

@triphora triphora left a comment

Choose a reason for hiding this comment

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

Should be merged ASAP

@santiagocezar
keyboard navigation is important
48d3474 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
@Scrumplex Scrumplex self-requested a review November 2, 2022 08:30
Scrumplex
Scrumplex approved these changes Nov 2, 2022
View reviewed changes
launcher/ui/MainWindow.cpp Outdated Show resolved Hide resolved
TheKodeToad
TheKodeToad approved these changes Nov 2, 2022
View reviewed changes
Copy link
Member

@TheKodeToad TheKodeToad left a comment

Choose a reason for hiding this comment

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

Looks (trying to avoid a pun) perfect! (apart from the logging)

@santiagocezar
remove logcat
9ca4f19 
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
@Scrumplex Scrumplex merged commit 094b57b into PrismLauncher:develop Nov 2, 2022
@Scrumplex Scrumplex mentioned this pull request Nov 27, 2022
Closed
1 task
@DioEgizio DioEgizio mentioned this pull request Dec 12, 2022
Closed
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Chew Chew Chew approved these changes

@Scrumplex Scrumplex Scrumplex approved these changes

@TheKodeToad TheKodeToad TheKodeToad approved these changes

@triphora triphora triphora approved these changes

@AshtakaOOf AshtakaOOf AshtakaOOf approved these changes

@DioEgizio DioEgizio DioEgizio approved these changes

Assignees
No one assigned
Labels
enhancement New feature or request
Projects
None yet
Milestone
6.0
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@santiagocezar @Chew @Scrumplex @TheKodeToad @triphora @AshtakaOOf @DioEgizio @flowln