search

quellus / GDTuber

A dynamic PNGTuber program made in Godot
MIT License
16 stars 11 forks source link

Fixed merge conflicts with Unknown's Main Menu #25

Closed quellus closed 1 month ago

quellus commented 1 month ago

I'm not able to push to @tech-with-the-unkownguy's original pull request so I made a new one. He'll still get credit for his contribution via his commits.

Description

@tech-with-the-unkownguy put a lot of effort into creating a Main Menu for us. The user will be met with this menu before opening the app. I figure this is a good place to give the user instructions that will help them the first time they run the program.

Maybe once we get saving implemented we can give the user a setting to skip straight to the app and not have to click through the main menu once they get comfortable.

My contribution

We refactored basically the entire codebase while Unknown was working on this. I felt it wouldn't be fair to ask him to solve all the merge conflicts himself. So here's what I did:

  1. Solved merge conflicts
  2. Cleaned up an old unused script
  3. Added a couple containers so the main menu is always centered no matter the window/screen size.

Here's what it looks like: image

tech-with-the-unkownguy commented 1 month ago

it looks good! gj