Merge branch 'main' into 49-button-to-leave-game-with-leave-game-request (f94bd606) · Commits · beckermar / Wizard · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

W

Wizard
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

Admin message

To receive notifications about scheduled maintenance, please subscribe to the mailing-list gitlab-operations@sympa.ethz.ch. You can subscribe to the mailing-list at https://sympa.ethz.ch

f94bd606

Commit f94bd606 authored 3 months ago by marie3003

Downloads
- Plain Diff

Merge branch 'main' into 49-button-to-leave-game-with-leave-game-request

parents f9afcca9 4df887ee

No related branches found

No related tags found

Loading

This commit is part of merge request !23. Comments created here will be created in the context of that merge request.

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

assets/card_15_1.png 0 additions, 0 deletions

assets/card_15_1.png
assets/card_15_2.png 0 additions, 0 deletions

assets/card_15_2.png
assets/card_15_3.png 0 additions, 0 deletions

assets/card_15_3.png
assets/card_15_4.png 0 additions, 0 deletions

assets/card_15_4.png
src/client/panels/MainGamePanelWizard.cpp 3 additions, 1 deletion

src/client/panels/MainGamePanelWizard.cpp
src/client/panels/TrickEstimationPanel.cpp 3 additions, 1 deletion

src/client/panels/TrickEstimationPanel.cpp
src/common/game_state/game_state.cpp 47 additions, 29 deletions

src/common/game_state/game_state.cpp
src/common/game_state/game_state.h 9 additions, 0 deletions

src/common/game_state/game_state.h

with 62 additions and 31 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment