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

Adds in some improvements and fixes to emotes #6387

Merged
merged 11 commits into from
Apr 24, 2021

Conversation

MaxIsJoe
Copy link
Contributor

@MaxIsJoe MaxIsJoe commented Apr 17, 2021

Purpose

Part of #6276 and should two issues in fix an issue in #6195

Adds in an improvement I've suggested me and gillies a while ago to make crits check available in the base EmoteSO script + added in a check for some emotes to avoid them from doing backflips while crawling + fixes an issue where the player becomes upside down while surrendering and crawling at the same time.

Notes:

Requires testing by other people on more than one client, pls.

Changelog:

CL: Fixed an issue where players become upside down when surrendering.
CL: You will no longer be able to do some emotes like backflips while crawling.
CL: Critical condition texts are no longer exclusive to gendered emotes, all emotes use them now.
CL: ActionText will no longer get rotated.

@PerfectTangent PerfectTangent added the System: Animation Tasks related to animation system / sprites label Apr 18, 2021
@MaxIsJoe
Copy link
Contributor Author

I've tested everything and made sure everything works across all clients.
This PR is done and has been tested, we can merge now 👍

P,S: I've enabled the surrender Emote since all of it's issues has been fixed + you can now stand up after laying down.

@github-actions github-actions bot added the UI label Apr 19, 2021
@MaxIsJoe
Copy link
Contributor Author

Bonus Fix!

Bonus Fix!

Come get your bonus fixes! Fixed another issue where ActionTexts get rotated. They no longer will.

@MaxIsJoe MaxIsJoe mentioned this pull request Apr 19, 2021
62 tasks
@Bod9001
Copy link
Member

Bod9001 commented Apr 19, 2021

I'll wait for Giles

@corp-0
Copy link
Member

corp-0 commented Apr 19, 2021

looks good, don't know if the text rotation thing works or if it is a good solution. It is setting a right rotation every frame, maybe the actual solution would be searching what is rotating it and make sure that doesn't happen.

@MaxIsJoe
Copy link
Contributor Author

MaxIsJoe commented Apr 19, 2021

looks good, don't know if the text rotation thing works or if it is a good solution. It is setting a right rotation every frame, maybe the actual solution would be searching what is rotating it and make sure that doesn't happen.

It is the best solution that doesn't introduce more issues from my testing and it always stays at 0 no matter what.

Changing the transform's parent or playing around with freezing the rotation of the action text through other means causes the text to disappear completely, get stuck in its original place or gitter/delaying while moving.

@corp-0
Copy link
Member

corp-0 commented Apr 19, 2021

Changing the transform's parent or playing around with freezing the rotation of the action text through other means causes the text to disappear completely, get stuck in its original place or gitter/delaying while moving.

Well I first would wonder why is it rotating. Without looking at any code, I could throw a guess about how the crawling effect is applying rotation to the whole player game object instead of the sprite and since the text is following a transform inside the player game object, it rotates. If that's the case, then the real solution is to make crawling only rotate the sprite game object.

@MaxIsJoe
Copy link
Contributor Author

Changing the transform's parent or playing around with freezing the rotation of the action text through other means causes the text to disappear completely, get stuck in its original place or gitter/delaying while moving.

Well I first would wonder why is it rotating. Without looking at any code, I could throw a guess about how the crawling effect is applying rotation to the whole player game object instead of the sprite and since the text is following a transform inside the player game object, it rotates. If that's the case, then the real solution is to make crawling only rotate the sprite game object.

I did investigate that and apparently not, the game isn't rotating the player's object it's rotating it's sprites.
If you're going to ask "why not just change the parent then?" refer back to what I said about how changing the parent causes issues + whoever coded this was probably correct about leaving it this way because if we offset the sprites for any reason the the actionText will follow it, if we change this you'll have text floating far away from your character in-game when their sprites are offset from 0,0

Either way consider this future proofing so that the action text never gets rotated again for any reason when we decide to actually rotate the player gameObject himself.

@github-actions github-actions bot removed the UI label Apr 23, 2021
@MaxIsJoe
Copy link
Contributor Author

This is finally it. time to merge.

@PerfectTangent PerfectTangent added the Status: Awaiting Review for PRs that are awaiting reviews/rereviews label Apr 23, 2021
@corp-0 corp-0 merged commit f150506 into unitystation:develop Apr 24, 2021
@MaxIsJoe MaxIsJoe deleted the critemotefixes branch April 24, 2021 06:36
@PerfectTangent PerfectTangent removed the Status: Awaiting Review for PRs that are awaiting reviews/rereviews label Jan 9, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
System: Animation Tasks related to animation system / sprites
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants