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/animated-sleeping #24

Merged
merged 11 commits into from
Oct 29, 2022

Conversation

exincore
Copy link

@exincore exincore commented Mar 11, 2022

Animated Sleeping

What?
  • The cat has a sleeping animation now
  • Varying number of sprites can be used in animations without needing to modify code
Why?
How?
  • panelMenuButton.js looks for and loads sprites into arrays based on their name like active-0 or idle-3 etc.
  • prefs.js et al. has a toggle button for reverting back to non-animated sleeping
  • Brand new sleeping sprites based on the original my-sleeping-symbolic.svg (contains cute snoozing)

my-sleeping-3-symbolic

@exincore exincore changed the title Feature/animated sleeping Feature/animated-sleeping Mar 11, 2022
@win0err
Copy link
Owner

win0err commented Mar 14, 2022

Hello, @exincore!

Thanks for the PR! I need some time to review the PR.

src/panelMenuButton.js Outdated Show resolved Hide resolved
src/panelMenuButton.js Outdated Show resolved Hide resolved
src/panelMenuButton.js Outdated Show resolved Hide resolved
src/panelMenuButton.js Outdated Show resolved Hide resolved
@win0err win0err added this to the v20 milestone Mar 22, 2022
@exincore exincore marked this pull request as ready for review May 18, 2022 18:02
@win0err win0err modified the milestones: v20, v21 Oct 3, 2022
@win0err win0err changed the base branch from master to feature/v21 October 3, 2022 17:09
@win0err
Copy link
Owner

win0err commented Oct 3, 2022

Please, fix conflicts and I will merge the PR

@win0err win0err mentioned this pull request Oct 3, 2022
@win0err win0err modified the milestones: v21, v22 Oct 3, 2022
@win0err win0err deleted the branch win0err:feature/v22 October 5, 2022 00:12
@win0err win0err closed this Oct 5, 2022
@win0err
Copy link
Owner

win0err commented Oct 5, 2022

Closed by mistake, reopening...

@win0err win0err reopened this Oct 5, 2022
@win0err win0err changed the base branch from feature/v21 to feature/v22 October 5, 2022 00:14
@exincore
Copy link
Author

exincore commented Oct 5, 2022

Goodness, this will take a while to merge/rebase

@exincore exincore force-pushed the feature/animated-sleeping branch from 00d41f8 to 3ad777f Compare October 26, 2022 00:33
@exincore
Copy link
Author

exincore commented Oct 26, 2022

@win0err I will clean up the idle sprites, but other than that, this feature is ready for re-review. Note that the animation state machine previously implemented in this feature is now removed.

* Update translations
@exincore
Copy link
Author

exincore commented Oct 26, 2022

Addition of RunnerPacks and RunnerStates constants moves hardcoded values of 'cat', 'idle', 'active' out of the way, and also makes future expansion to other runner states like walking #29 or other runner packs #23 easier.

@@ -47,47 +47,51 @@ msgid "Idle threshold"
msgstr "Порог бездействия"

#: src/resources/ui/preferences.ui:34
msgid "Idle animation"
msgstr ""
Copy link
Author

Choose a reason for hiding this comment

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

One new translation is needed

@exincore exincore mentioned this pull request Oct 27, 2022
1 task
po/messages.pot Outdated
@@ -46,45 +46,49 @@ msgid "Idle threshold"
msgstr ""

#: src/resources/ui/preferences.ui:34
msgid "Idle animation"
Copy link
Owner

Choose a reason for hiding this comment

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

Wouldn't it be better to call it "Animated idle"?

Copy link
Author

@exincore exincore Oct 29, 2022

Choose a reason for hiding this comment

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

I decided on Idle animation due to the presence of Idle threshold, however I will go ahead and rename everything. It can be reverted later.

@win0err win0err added the enhancement New feature or request label Oct 29, 2022
@win0err
Copy link
Owner

win0err commented Oct 29, 2022

LGTM. Great work, thank you!

@win0err win0err merged commit 4b21750 into win0err:feature/v22 Oct 29, 2022
win0err pushed a commit that referenced this pull request Mar 15, 2023
The cat has a sleeping animation now
win0err pushed a commit that referenced this pull request Mar 16, 2023
The cat has a sleeping animation now
win0err pushed a commit that referenced this pull request Mar 26, 2023
The cat has a sleeping animation now
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants