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

[feature-22] Add a Menu in the starting game #114

Merged
merged 10 commits into from
Jan 12, 2023
Merged

[feature-22] Add a Menu in the starting game #114

merged 10 commits into from
Jan 12, 2023

Conversation

lucas-mrq
Copy link
Collaborator

  • Add a Menu that you can switch by clicking on K
  • Add a Way to quit the Game Window with Escape and the arrow
  • Change the button to a new Class
  • Improve the threads and mutex on the Engine

@lucas-mrq lucas-mrq added the feature New feature or request label Jan 11, 2023
@lucas-mrq lucas-mrq requested a review from NiskuT January 11, 2023 16:30
@lucas-mrq lucas-mrq self-assigned this Jan 11, 2023
@lucas-mrq lucas-mrq linked an issue Jan 11, 2023 that may be closed by this pull request
[feature-22] Add a Menu in the starting game #109
Closed
@lucas-mrq lucas-mrq changed the title [feature-22] Add a Menu in the starting game and inside the game [feature-22] Add a Menu in the starting game Jan 11, 2023
NiskuT
NiskuT requested changes Jan 11, 2023
View reviewed changes
Copy link
Owner

@NiskuT NiskuT left a comment

Choose a reason for hiding this comment

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

Good job!

src/client/Button.cpp Show resolved Hide resolved
src/client/ClientGameEngine.cpp Outdated Show resolved Hide resolved
src/client/ClientGameEngine.cpp Outdated Show resolved Hide resolved
src/client/ClientGameEngine.cpp Show resolved Hide resolved
src/client/GameWindow.cpp Show resolved Hide resolved
src/client/GameWindow.cpp Outdated Show resolved Hide resolved
src/client/MenuWindow.cpp Show resolved Hide resolved
src/client/MenuWindow.cpp Show resolved Hide resolved
NiskuT and others added 5 commits January 11, 2023 21:50
@NiskuT
feature-22: try to change the CI workflow
ebccbba 
Trying to prevent github Unable to fetch some archives
@NiskuT
feature-22: try to fix CI
d1486a6 
github Unable to fetch some archives
@NiskuT
feature-22: fix CI
fa86696 
github Unable to fetch some archives
@NiskuT
feature-22: fix CI (nightly)
de8540f 
github Unable to fetch some archives
@lucas-mrq
feature-22 Add defines
d937350
@lucas-mrq lucas-mrq merged commit 0c8966f into develop Jan 12, 2023
@lucas-mrq lucas-mrq deleted the feature-22 branch January 13, 2023 10:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NiskuT NiskuT NiskuT approved these changes

Assignees

@lucas-mrq lucas-mrq

Labels
feature New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[feature-22] Add a Menu in the starting game
2 participants
@lucas-mrq @NiskuT