search

maxgribov / Spine

Unofficial Spine runtime Swift library, allows you to play animations created in the Spine app (http://esotericsoftware.com).
MIT License
183 stars 36 forks source link

Fix for instant color change of node #61

Closed vldygrf closed 8 months ago

vldygrf commented 8 months ago

If the duration is zero, then the change should occur instantly. Therefore, in the case of zero, we need 1 for the deltaTime and not 0.

maxgribov commented 8 months ago

Ok, but to avoid merge conflicts you have to do:

  1. Move commit c6065a0 to new branch (color_anim_fix for example)
  2. Fetch master branch from this repo to your fork (as result it must contains changes introduced in 947f47c commit)
  3. Cherri-pic commit from color_anim_fix to master (or just merge color_anim_fix branch to master)
  4. Push changes to origin
vldygrf commented 8 months ago

master branch from my fork already has commit 947f47c followed by a new commit. It seems that commit 947f47c in this repo is not taken into account when creating a pull request.

maxgribov commented 8 months ago

master branch from my fork already has commit 947f47c

yes, but for this repo its different commit:

Screenshot 2023-12-27 at 23 17 46

You have to reset your master branch first. Make it exactly the same as the original repo (this) and only after this you can make changes without merge conflicts.

maxgribov commented 8 months ago

In your fork you have button Sync fork:

Screenshot 2023-12-27 at 23 27 22

but before sync - move commit c6065a0 to another branch, or you will loose this changes.