Skip to content

Update Main Before Sprint 3#89

Merged
XtophB merged 153 commits into
mainfrom
development
Jun 17, 2026
Merged

Update Main Before Sprint 3#89
XtophB merged 153 commits into
mainfrom
development

Conversation

@the-only-queen-anna

Copy link
Copy Markdown
Collaborator

Context

This adds a lot of functionality. For details, please view the smaller PRs with more detailed descriptions. After this PR, the game is completely playable, features a cheat function that is activated with shaking the phone during the operative phase, operatives can now skip their turn if they don't want to make any more guesses, after a game the game state is resetted and users can navigate back to the start screen.
Rejoin is enabled using a data store, where username, id, lobbycode and some other parameters are stored to enable seamless rejoin. The user has the option to join a previous game and to discard it, when he reopens the app after closing it during a game.

Changes to the codebase

Also a lot.

Changes outside the codebase

The github pipeline had to be adjusted to feature android integration tests, also some dependencies were added to build.gradle.kts.

Additional information

N/A

the-only-queen-anna and others added 30 commits May 22, 2026 22:37
…itory

Game Repository & Sprint 2 refactoring
Zheaver and others added 26 commits June 17, 2026 12:47
…o that there are no problems in a second game)
…r-uni-server

chore: change server URL to that of uni server
@sonarqubecloud

Copy link
Copy Markdown

@tasaje1 tasaje1 left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

lgtm

@XtophB XtophB left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

lgtm

@XtophB XtophB merged commit 4ae8f2b into main Jun 17, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants