This repository has been archived on 2026-05-29. You can view files and clone it. You cannot open issues or pull requests or push a commit.
Mathis Ginkel
84e68d8b20
Merge remote-tracking branch 'origin/feat/client-chat' into feat/client-chat
# Conflicts:
# src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatController.java
# src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatModel.java
# src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/Message.java
# src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ChatClient.java
# src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/ClientService.java
# src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/GameClient.java
# src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/LobbyClient.java
# src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatBoxController.java
# src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatViewController.java
# src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_next_message/GetNextMessageHandler.java
# src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/get_next_message/GetNextMessageResponse.java
# src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/send_message/SendMessageParser.java
# src/main/resources/ui-structure/Casinogameui.fxml
# src/main/resources/ui-structure/components/chatui/chatbox.fxml
# src/main/resources/ui-structure/components/chatui/chattab.fxml
# src/main/resources/ui-structure/gameuicomponents/chatui/chatbox.fxml
# src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatApplication.java
# src/test/java/ch/unibas/dmi/dbis/cs108/casono/client/chat/ChatTest.java
2026-04-09 18:13:29 +02:00
..
2026-04-09 18:13:29 +02:00