Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

Unified Main/Pause menu #2710

Closed
wants to merge 23 commits into from
Closed

Unified Main/Pause menu #2710

wants to merge 23 commits into from

Conversation

tritonas00
Copy link
Collaborator

@tritonas00 tritonas00 commented Mar 15, 2021 •
edited
Loading

Based on comment in https://github.com/RigsOfRods/rigs-of-rods/blob/master/source/main/gui/panels/GUI_GamePauseMenu.cpp#L42

Changes:

  • Removed GUI_GamePauseMenu(cpp/h)
  • Merged code to GUI_GameMainMenu.cpp and run by checking AppState
  • Pressing Esc on multiplayer, only the menu is shown now, simulation continues
  • Keep "Single player" button in Single player, changes map
  • Keep "Multiplayer" button in Multiplayer, changes server
  • Added "Cache updated" notice:
    kk

ohlidalp
ohlidalp reviewed Mar 17, 2021
View reviewed changes
Copy link
Member

@ohlidalp ohlidalp left a comment

Choose a reason for hiding this comment

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

Very good work so far, but I think you can take it even further. See the comments and tell me what you think.

source/main/GameContext.cpp Outdated Show resolved Hide resolved
source/main/gui/panels/GUI_GameMainMenu.cpp Outdated Show resolved Hide resolved
source/main/gui/panels/GUI_GameMainMenu.cpp Outdated Show resolved Hide resolved
source/main/gui/panels/GUI_GameMainMenu.cpp Outdated Show resolved Hide resolved
source/main/gui/panels/GUI_GameMainMenu.cpp Show resolved Hide resolved
source/main/gui/panels/GUI_GameMainMenu.cpp Show resolved Hide resolved
@tritonas00 tritonas00 requested a review from ohlidalp March 22, 2021 23:43
@tritonas00 tritonas00 mentioned this pull request Mar 30, 2021
Closed
@ohlidalp
Copy link
Member

About the 'cache updated' notification: #2718 (comment)

@tritonas00
Copy link
Collaborator Author

#2723

@tritonas00 tritonas00 closed this Mar 30, 2021
@tritonas00 tritonas00 deleted the menu branch April 5, 2021 18:47
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@ohlidalp ohlidalp Awaiting requested review from ohlidalp

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@tritonas00 @ohlidalp