Allow visualisation of 2× healing #1251
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
necessarily-equal
changed the title
necessarily-equal
force-pushed
the
visualize-2x-healing
branch
2 times, most recently
from
bd71234
to
6aff0fd
Compare
it happens when an alien is not too far from another. It's a feature that wasn't discoverable at all, and most people don't even know it exists. Hopefully this change could make it a bit more obvious, even if I still find it a bit confusing. "Wait, why am I healing now? I didn't even move" to be merged alongside UnvanquishedAssets/unvanquished_src.dpkdir#33.
necessarily-equal
added a commit
to necessarily-equal/unvanquished_src.dpkdir
that referenced
this pull request
Dec 30, 2020
(see Unvanquished/Unvanquished#1251) For some reason, git forgot that this is actually: rename 2.png -> 3.png rename 3.png -> 4.png add a new 2.png
necessarily-equal
force-pushed
the
visualize-2x-healing
branch
from
6aff0fd
to
6926d18
Compare
|
Yeah, git stores no information of moving, so if you want to keep moves in git, you need to do dedicated commits for moves and dedicated commits for edits. |
|
Well, do _you_ want to separate commits? I know the two files are
renamed already :)
…On Fr, Jan 1, 2021 at 14:03, Thomas Debesse ***@***.***> wrote:
Yeah, git stores no information of moving, so if you want to keep
moves in git, you need to do dedicated commits for moves and
dedicated commits for edits.
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub, or unsubscribe.
|
|
I guess that file is not that precious to keep track of its move… |
|
Looks ok to me. |
illwieckz
pushed a commit
to UnvanquishedAssets/unvanquished_src.dpkdir
that referenced
this pull request
Jan 5, 2021
(see Unvanquished/Unvanquished#1251) For some reason, git forgot that this is actually: rename 2.png -> 3.png rename 3.png -> 4.png add a new 2.png
illwieckz
pushed a commit
that referenced
this pull request
Apr 12, 2023
(see #1251) For some reason, git forgot that this is actually: rename 2.png -> 3.png rename 3.png -> 4.png add a new 2.png
illwieckz
pushed a commit
that referenced
this pull request
Apr 12, 2023
(see #1251) For some reason, git forgot that this is actually: rename 2.png -> 3.png rename 3.png -> 4.png add a new 2.png
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
it happens when an alien is not too far from another. It's a feature
that wasn't discoverable at all, and most people don't even know it
exists. Hopefully this change could make it a bit more obvious, even if
I still find it a bit confusing.
"Wait, why am I healing now? I didn't even move"
I think it adds a bit of noise, so we may want to look for a better solution instead.
otherwise, to be merged alongside UnvanquishedAssets/unvanquished_src.dpkdir#33.