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

Revert #6 "Latest Experimental Psychics" #109

Conversation

ShatteredSwords
Copy link
Contributor

@ShatteredSwords ShatteredSwords commented Aug 15, 2024

Description

This is a reversion of PR #6 to make merging upstream possible. I am doing this under the guidance of @DangerRevolution to see which files are conflicting.
This also includes a revert of PR #66 by @FoxxoTrystan
I have also recieved the guidance of @VMSolidus in the later half.


TODO

  • Fix all conflicts?

🆑 ShatteredSwords and FoxxoTrystan

  • remove: Experimental Psychic Playtest
  • remove: Psionic Refractor Changes

@ShatteredSwords ShatteredSwords marked this pull request as draft August 15, 2024 10:13
@github-actions github-actions bot added Status: Needs Review Someone please review this Changes: Audio Changes any ogg files Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: UI Changes any XAML files Changes: YML Changes any yml files labels Aug 15, 2024
@Fansana
Copy link
Owner

Fansana commented Aug 15, 2024

I want a deploy stop when this is merged until the psyonics changes are back in the game.

@ShatteredSwords
Copy link
Contributor Author

I want a deploy stop when this is merged until the psyonics changes are back in the game.

That's the idea, that is why this is a draft ATM

@ShatteredSwords
Copy link
Contributor Author

Gonna get this out of draft so I can specifically test it

@ShatteredSwords ShatteredSwords marked this pull request as ready for review August 15, 2024 10:31
@ShatteredSwords
Copy link
Contributor Author

ShatteredSwords commented Aug 15, 2024

I will be working with Fansana to edit the conflicting files.

@FoxxoTrystan FoxxoTrystan added the Priority: 1-High Needs to be resolved as soon as possible label Aug 15, 2024
@FoxxoTrystan
Copy link
Collaborator

Psonic will still be in the game, nothing really will have change as this is a experimental feature, issue is that we cannot upstream merge until this is done.

@FoxxoTrystan FoxxoTrystan requested review from Memeji and removed request for Fansana August 15, 2024 21:06
Copy link
Collaborator

@Memeji Memeji left a comment

Choose a reason for hiding this comment

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

Multiple tests have failed, please have those tests pass.

Copy link
Collaborator

@FoxxoTrystan FoxxoTrystan left a comment

Choose a reason for hiding this comment

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

Test fails are legits, this will need to be resolved, and we will need to make sure nothing broke.

@ShatteredSwords
Copy link
Contributor Author

Yes, working on the files right now. Also considering just reverting all the way back to 6, and then PRing everything without 6, just to see what happens.

@VMSolidus
Copy link
Contributor

image

Easy fix, revert this specific line

@ShatteredSwords
Copy link
Contributor Author

I am not completely sure if everything is reverted, but this seems to build without the conflicting files. Please look over it and make sure I'm not forgetting something or if it doesn't need any more editing.

@FoxxoTrystan
Copy link
Collaborator

I will test it when i wake up.

@FoxxoTrystan FoxxoTrystan added the Status: Do Not Merge Do not merge label Aug 16, 2024
Copy link
Collaborator

@FoxxoTrystan FoxxoTrystan left a comment

Choose a reason for hiding this comment

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

During test, this seem ready.

Do not merge, i will handle it, aka i left a tag for it.

@FoxxoTrystan
Copy link
Collaborator

This PR has been merged with #114

Meaning its will be added at the same time as the upstream merge.

@ShatteredSwords ShatteredSwords deleted the revert-6-latest-experimental-psychics branch August 16, 2024 23:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Audio Changes any ogg files Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: UI Changes any XAML files Changes: YML Changes any yml files Priority: 1-High Needs to be resolved as soon as possible Status: Do Not Merge Do not merge Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants