66f0d734cf
fix: fix broken UnitTest after game integration
2026-04-12 23:45:40 +02:00
d7eb9701c9
Merge branch 'feat/84-whisper-chat' into 'main'
...
Add whisper chat option
Closes #84
See merge request cs108-fs26/Gruppe-13!123
2026-04-12 16:47:09 +00:00
e08b75dc7a
Style: Apply Spotless
2026-04-12 15:31:59 +02:00
346a308176
Merge branch 'feat/change-username-at-start-or-in-game' of https://git.scicore.unibas.ch/cs108-fs26/Gruppe-13 into feat/change-username-at-start-or-in-game
2026-04-12 09:36:48 +02:00
8998152e8d
Fix: checkstyle
2026-04-12 09:31:25 +02:00
d9e7c0c56d
Merge branch 'main' into feat/change-username-at-start-or-in-game
2026-04-12 09:12:46 +02:00
b2adeb7a56
Feat: Add whisper chat functionality
...
Introduce recording of users connected to server, to show usernames as options for whisper chat.
2026-04-12 00:19:34 +02:00
b4b2e3b067
Fix: Resolving Git Merge Conflicts and Checkstyle
...
Refs #88
2026-04-11 14:01:21 +02:00
beeba04a2c
Merge branch 'feat/client-chat' into chore/ui-checkstyle-fixes
...
# 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/CoreClient.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/ChatViewController.java
# src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/lobbyui/LobbyButtonGridManager.java
# src/main/resources/ui-structure/components/Chatbox.fxml
2026-04-11 12:56:01 +02:00
edb98c8d21
Merge branch 'feat/client-communication' into chore/ui-checkstyle-fixes
...
# Conflicts:
# src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/CasinoGameUI.java
2026-04-11 12:20:27 +02:00
97e5a55042
Style: Apply Spotless
2026-04-10 22:43:23 +02:00
3be2d3d9f4
Fix: Chekstyle naming convention
2026-04-10 14:58:00 +02:00
566c9375ab
Style: Apply Spotless
2026-04-09 20:36:18 +02:00
c0c9225d42
Fix: Parsing of Server Responses for Client Chat
2026-04-09 18:04:57 +02:00
4e7b0ab67a
Add: Implement Commands for Chat Protocol
2026-04-09 18:04:57 +02:00
39f60c9113
Fix: small changes to ChatUI
2026-04-09 18:04:57 +02:00
7d19e65428
Add: client chat architecture for lobby and global chat
2026-04-09 18:04:50 +02:00
de66757837
Resolve Conflicts
2026-04-09 18:03:26 +02:00
df31c307fe
Fix: Comment out faulty Unit Test
2026-04-09 10:42:45 +02:00
bf7ac4fc34
Fix: formatting and checkstyle issues
2026-04-05 11:15:26 +02:00
d4e69d26d7
Merge remote-tracking branch 'origin/main' into feat/game-engine
2026-04-05 11:04:19 +02:00
f7dc3d1a8e
Fix: Typo in GameController unit tests for game engine
2026-04-04 23:50:58 +02:00
585a78fbcc
Add: GameController unit tests for game engine
2026-04-04 23:38:45 +02:00
42b5344059
Test: Add in-process TestServer and update LobbyButtonGridManagerTest
...
Add TestServer that speaks the RawPacket/TcpTransport protocol for CREATE_LOBBY,
GET_LOBBY_STATUS and JOIN_LOBBY. Update LobbyButtonGridManagerTest to start the
TestServer and exercise a real `ClientService(host, port)`, enabling integration-style
tests of the client->transport->server roundtrip without an external server.
Refs #36
2026-04-02 22:28:12 +02:00
3427c661cf
Merge branch 'feat/client-chat' into feat/client-communication
...
# Conflicts:
# src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatController.java
2026-04-02 10:31:28 +02:00
cc33411911
Add: basic chat functionality
2026-04-02 10:20:03 +02:00
2906c59f25
Merge branch 'main' into 'feat/ui-switch-lobby-game'
2026-04-01 11:24:39 +02:00
2203f80490
Chore: Reflect path changes for tests
2026-03-30 18:42:19 +02:00
0930fbe990
Chore: Reflect changes to folder structure in tests
2026-03-30 18:26:45 +02:00
6e446b665a
Chore: Move 'tokenizer' into protocol section
2026-03-30 18:21:56 +02:00
af37e33f07
Style: Line length
2026-03-20 10:57:31 +01:00
85f89a91f1
Refactor: Update unit tests for LobbyButtonTranslationManager and LobbyButtonGridManager
2026-03-19 12:54:50 +01:00
7ffeca75fa
Style: Import order
2026-03-18 18:28:16 +01:00
039e3751bf
Revert "Merge branch 'feat/client-network' into 'main'"
...
This reverts merge request !36
2026-03-18 17:08:19 +01:00
98df1dc227
add: first implementation of login
2026-03-15 22:26:19 +01:00
d6468c9595
add: first version of client to client chat
2026-03-15 22:26:11 +01:00
3809b7e0e2
Fix: update clientservice
2026-03-15 22:17:18 +01:00
892f0553f6
Change protocol implementation
2026-03-15 22:17:18 +01:00
e533262c38
Add: First version of a Client-side Networking Service
2026-03-15 22:17:18 +01:00
08dc94b4b0
Style: Comply with Spotless
...
Created issue #2 regarding this issue
2026-03-15 13:38:59 +01:00
b898357d76
Merge branch 'main' into 'feat/tokenizer'
2026-03-14 18:24:03 +01:00
a15a0a0044
Style: apply Checkstyle fixes on client side
2026-03-14 17:35:47 +01:00
f3c34dfa7f
Move: Tokenizer related tests into server server directory
2026-03-14 17:14:37 +01:00
14c18df0eb
Test: Tokenizer exception
2026-03-14 16:37:11 +01:00
208a284204
Test: Tokenizer state
2026-03-14 16:33:34 +01:00
50d75e2f03
Style: Checkstyle changes to LobbyUI
2026-03-14 14:48:37 +01:00
09ebacc1e4
chore: remove demo code from project
2026-03-14 13:36:27 +01:00
a39775bd04
refactor: Button_ID - Lobby_ID translation is now only stored in hasmap and not in a Json file anymore
2026-03-13 14:54:47 +01:00
59765e33bb
Test: Unit test for Translating Button IDs into backend Lobby IDs
2026-03-12 15:36:59 +01:00
fa95ce1418
Test: Unit test for creating lobbies and trying to join them
2026-03-12 15:36:13 +01:00
Jona Walpert