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.

Sign up for GitHub

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

Jump to bottom

[ENHANCEMENT] Stage Editor re-work from the ground up #3482

Merged
merged 6 commits into from
Oct 10, 2024
Merged

[ENHANCEMENT] Stage Editor re-work from the ground up #3482

merged 6 commits into from
Oct 10, 2024

Conversation

KoloInDaCrib
Copy link
Contributor

Does this PR close any issues? If so, link them below.

N/A

Briefly describe the issue(s) fixed.

This PR adds a rework/addition of the Stage Editor, nearly identical to the one from the Stage Editor Engine, which was also made by me. anysad should be the one with the most familiarity to it, as they have left a suggestion to make it a pull request long time ago.

In comparison to that iteration, this one is modified to support the Stage Format of the Base Game by implementing z-Index support, changing how the animations are handled and so on.

Include any relevant screenshots or videos.

Welcome Dialog:
screenshot-2024-09-29-19-28-53

Main View:
screenshot-2024-09-29-19-30-47

Some of the Dialogs:
screenshot-2024-09-29-19-38-21

Note:

If this gets accepted:

  1. Haxe-UI Component .xml datas for this editor (link) would need to be added to assets/exclude/data/ui.

  2. Stage Files would need to get updated to these (link). They are pretty much identical to the current ones, just with the field directory added to avoid hard-coding.

  3. Pull Request 3397 would need to get accepted, as this Stage Editor modifies the Stage Data fields that were added in that pr.

@ninjamuffin99
Copy link
Member

wow this looks awesome, definitely will be poking into this :)

@KoloInDaCrib
Copy link
Contributor Author

wow this looks awesome, definitely will be poking into this :)

My gratitudes :D

@EliteMasterEric EliteMasterEric added type: enhancement Involves an enhancement or new feature. topic: mods Related to the creation or use of mods. status: reviewing internally Under consideration and testing. labels Sep 30, 2024
@ninjamuffin99
Copy link
Member

I've rebased your branch to sit on top of develop and also made the assets submod point towards a stage-editor branch in funkin.assets repo. Since there's some changes to stage code and whatnot, just poking around and doing testing to see how it shakes out and if there are any bugs we need to fix :)

@EliteMasterEric EliteMasterEric added status: pending triage Awaiting review. status: reviewing internally Under consideration and testing. and removed status: reviewing internally Under consideration and testing. status: pending triage Awaiting review. labels Oct 1, 2024
@sphis-Sinco
Copy link

hire this man

@amyspark-ng
Copy link
Contributor

incredibly cool

@ninjamuffin99 ninjamuffin99 force-pushed the develop branch 2 times, most recently from e0b1b01 to 410cfe9 Compare October 4, 2024 01:25
@JVNpixels
Copy link
Contributor

This is a really cool upgrade!

@github-actions github-actions bot added pr: haxe PR modifies game code. size: large A large pull request with more than 100 changes. labels Oct 10, 2024
@ninjamuffin99
Copy link
Member

pushed some changes and now i'll merge in, thanks! this is very awesome and I think we'll aim to work off of it!

@ninjamuffin99 ninjamuffin99 merged commit 1189c22 into FunkinCrew:develop Oct 10, 2024
2 checks passed
@KoloInDaCrib
Copy link
Contributor Author

pushed some changes and now i'll merge in, thanks! this is very awesome and I think we'll aim to work off of it!

Hell yeah thats awesomesauce thanks cam :]

@EliteMasterEric EliteMasterEric added this to the 0.5.2 milestone Oct 12, 2024
@KoloInDaCrib KoloInDaCrib deleted the StageEditorThing branch November 30, 2024 12:53
@Hundrec Hundrec added status: accepted PR was approved for contribution. If it's not already merged, it may be merged on a private branch. and removed status: reviewing internally Under consideration and testing. labels Jan 22, 2025
@Hundrec Hundrec added topic: animation editor Related to the operation of the Animation Editor. topic: stage editor Related to the operation of the Stage Editor. and removed topic: mods Related to the creation or use of mods. topic: animation editor Related to the operation of the Animation Editor. labels Mar 9, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FabsTheFabs FabsTheFabs Awaiting requested review from FabsTheFabs

@EliteMasterEric EliteMasterEric Awaiting requested review from EliteMasterEric

Assignees
No one assigned
Labels
pr: haxe PR modifies game code. size: large A large pull request with more than 100 changes. status: accepted PR was approved for contribution. If it's not already merged, it may be merged on a private branch. topic: stage editor Related to the operation of the Stage Editor. type: enhancement Involves an enhancement or new feature.
Projects
None yet
Milestone
0.5.2
Development

Successfully merging this pull request may close these issues.
7 participants
@KoloInDaCrib @ninjamuffin99 @sphis-Sinco @amyspark-ng @JVNpixels @EliteMasterEric @Hundrec