Skip to content
Snippets Groups Projects
Commit 7c463135 authored by Rebekka Aashaug Stangvik's avatar Rebekka Aashaug Stangvik
Browse files

Merge branch 'main' into '2-create-game-model'

# Conflicts:
#   core/src/com/wordbattle/game/WordBattle.java
#   core/src/com/wordbattle/game/controller/JoinGameController.java
#   core/src/com/wordbattle/game/controller/MainMenuController.java
#   core/src/com/wordbattle/game/controller/SettingsController.java
#   core/src/com/wordbattle/game/manager/MusicManager.java
#   core/src/com/wordbattle/game/manager/SoundManager.java
#   core/src/com/wordbattle/game/states/SettingsState.java
#   core/src/com/wordbattle/game/view/CreateGameView.java
#   core/src/com/wordbattle/game/view/JoinGameView.java
#   core/src/com/wordbattle/game/view/MainMenuView.java
#   core/src/com/wordbattle/game/view/SettingsView.java
parents fcf5bf06 b0fde34e
Branches
No related tags found
1 merge request!22Resolve "Create game model"
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment