-
Notifications
You must be signed in to change notification settings - Fork 558
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
Sprite textboxes #987
Merged
Merged
Sprite textboxes #987
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
Conflicts need to be resolved. |
This commit adds a system for displaying sprites in textboxes, meant to replace the hardcoded system in the main game. This does not support levelcomplete.png and gamecomplete.png yet, which will most likely just be special cases.
AllyTally
force-pushed
the
sprite-textboxes
branch
from
August 13, 2023 13:15
6d048b2
to
350c634
Compare
InfoTeddy
suggested changes
Aug 13, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please undo the change to c-hashmap
.
AllyTally
force-pushed
the
sprite-textboxes
branch
2 times, most recently
from
August 13, 2023 17:09
cc941da
to
9f3d737
Compare
This commit adjusts the Y position for flip-mode, and makes the main game use this new system.
AllyTally
force-pushed
the
sprite-textboxes
branch
from
August 13, 2023 17:31
9f3d737
to
b055758
Compare
Retagged as required at the request of Ally because we don't want to support off-by-one colors for custom levels into the future. |
`levelcomplete` and `gamecomplete` were hardcoded using textbox colors which were offset by 1. This PR fixes that, no longer requiring slightly-off colors, and instead adding a new property to textboxes which tell the game to display either level complete or game complete.
NyakoFox
force-pushed
the
sprite-textboxes
branch
from
November 19, 2023 22:47
07e78be
to
2e4db2f
Compare
InfoTeddy
approved these changes
Nov 19, 2023
Daaaav
added a commit
to Daaaav/VVVVVV
that referenced
this pull request
Nov 27, 2023
At first my CJK changes also misaligned this sprite, and my solution that time was to position the textbox higher depending on the height of the textbox, so it would be centered around the crewmate sprite (which stayed at a hardcoded place onscreen). Recently, TerryCavanagh#987 changed these sprites to be relative to the position of the textbox instead of relative to the screen, which is much more logical, but it stopped centering these sprites again. But it's an easy fix: simply account for the extra-added height when adding the sprite in.
2 tasks
InfoTeddy
pushed a commit
that referenced
this pull request
Nov 27, 2023
At first my CJK changes also misaligned this sprite, and my solution that time was to position the textbox higher depending on the height of the textbox, so it would be centered around the crewmate sprite (which stayed at a hardcoded place onscreen). Recently, #987 changed these sprites to be relative to the position of the textbox instead of relative to the screen, which is much more logical, but it stopped centering these sprites again. But it's an easy fix: simply account for the extra-added height when adding the sprite in.
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.
Changes:
This commit adds a system for displaying sprites in textboxes, which replaces the hardcoded system in the main game.
This also adds a couple new commands to go along with it.
textsprite(x,y,sprite,color)
adds sprites to the textbox you're currently constructing. The coordinates are relative to the textbox.textimage(levelcomplete/gamecomplete)
displayslevelcomplete.png
orgamecomplete.png
and their flip mode variants (or text due to translation)Legal Stuff:
By submitting this pull request, I confirm that...
CONTRIBUTORS
file and the "GitHub Friends"section of the credits for all of said releases, but will NOT be compensated
for these changes