Commit Graph

812 Commits

Author SHA1 Message Date
Jona Walpert f467d9ebe2 Docs: Add new get_lobby_list command 2026-04-11 21:12:30 +02:00
Jona Walpert 13d03637da Add: register get_lobby_list command 2026-04-11 21:12:03 +02:00
Jona Walpert 50052b72ff Feat: Add get_lobby_listcommand to server 2026-04-11 21:11:40 +02:00
Jona Walpert ab4ba0f70b Merge branch 'feat/96-add-getlobbystatus-command-on-server-side' into 'main'
Feat/96 add getlobbystatus command on server side

See merge request cs108-fs26/Gruppe-13!104
2026-04-11 19:09:04 +00:00
Jona Walpert 46ccae40ad Style: apply spotless 2026-04-11 20:51:49 +02:00
Jona Walpert 050beb9d98 Docs: update command documentation 2026-04-11 20:50:19 +02:00
Jona Walpert 517df2369d Add: register get_lobby_statsu command 2026-04-11 20:49:23 +02:00
Jona Walpert 6219c2d660 Feat: Add get_Lobby_Status command on server side 2026-04-11 20:48:58 +02:00
Jona Walpert 57b8bca1a8 Merge branch 'feat/96-add-getlobbystatus-command-on-server-side' into 'main'
Feat/96 add getlobbystatus command on server side

Closes #96

See merge request cs108-fs26/Gruppe-13!103
2026-04-11 18:35:56 +00:00
Jona Walpert 050d87ce57 Docs: Add command documentation for get_lobby_status 2026-04-11 20:32:38 +02:00
Jona Walpert a930bd94b5 Feat: Add getlobbbystatus command 2026-04-11 20:31:25 +02:00
Jona Walpert 66ee791342 Merge branch 'feat/97-add-joinlobby-command-on-server-side' into 'main'
Feat: Add addPlayer command on sever side

Closes #97

See merge request cs108-fs26/Gruppe-13!102
2026-04-11 17:49:56 +00:00
Jona Walpert 240bba9bf5 Style: apply Spotless for Serverapp 2026-04-11 19:46:48 +02:00
Jona Walpert 15d1ea4edd Add: Register JoinLobby command 2026-04-11 19:45:55 +02:00
Jona Walpert 3badca0a01 Merge branch 'feat/97-add-joinlobby-command-on-server-side' of https://git.scicore.unibas.ch/cs108-fs26/Gruppe-13 into feat/97-add-joinlobby-command-on-server-side 2026-04-11 19:42:09 +02:00
Jona Walpert 203004fc42 Add: register JoinLobby command 2026-04-11 19:31:33 +02:00
Jona Walpert de0d0f93f8 Docs: Applied Spotless to JoinLobby command 2026-04-11 19:30:54 +02:00
Jona Walpert 7788bbc5d3 Style: Spotless apllied to JoinLobby command 2026-04-11 19:28:17 +02:00
Jona Walpert 2c6ecdc0f9 Docs: Add javadoc for JoinLobby command 2026-04-11 19:20:04 +02:00
Lars Simon Winzer 15ab6faf2e Merge branch 'feat/98-checkstyle-methodlength-in-serverapp' into 'main'
Allow longer method length in ServerApp

Closes #98

See merge request cs108-fs26/Gruppe-13!101
2026-04-11 18:49:31 +02:00
Lars Simon Winzer 25c20a2ea3 Fix: Allow longer method length in ServerApp 2026-04-11 18:46:50 +02:00
Jona Walpert 73dd00f37d Feat: Add JoinLobby Command to server side
This command adds the possibility to join a created lobby
2026-04-11 18:29:21 +02:00
Jona Walpert f512e6c422 Merge branch 'feat/73-support-for-multiple-lobbies' into feat/97-add-joinlobby-command-on-server-side 2026-04-11 18:15:32 +02:00
Jona Walpert eb3ffee6fc Merge branch 'feat/92-add-serverside-add-player-command' into 'feat/97-add-joinlobby-command-on-server-side'
Feat: Add addPlayer command on sever side

See merge request cs108-fs26/Gruppe-13!100
2026-04-11 16:08:48 +00:00
Jona Walpert af9daecf46 Docs: Add documentation for Join_lobby command 2026-04-11 18:03:18 +02:00
Jona Walpert 2ab27ac3ed Feat: Add lobby class and Manager with conenction to Game engine. The gameengine will be satrte when 4 players joined the lobby. This is made possible by the callback-driven-Listener
Refs #73
2026-04-11 17:41:45 +02:00
Julian Kropff 48e6b51ad1 Merge branch 'feat/game-ui' into 'main'
Add Game UI logic

See merge request cs108-fs26/Gruppe-13!99
2026-04-11 14:59:56 +00:00
Jona Walpert e655530760 Feat: Add addPlayer command on sever side
Rafs #92
2026-04-11 16:48:58 +02:00
Jona Walpert 62f01d1e5d Docs: add documentation of create_lobby commad 2026-04-11 16:44:19 +02:00
Jona Walpert ca4283bbe7 Feat: Add createLobby command on server side
Refs #93
2026-04-11 16:38:57 +02:00
Julian Kropff 3c7773e7fb Fix: checkstyle violations 2026-04-11 16:34:24 +02:00
Julian Kropff 406567d375 Fix: Integration of chatbox.fxml into Casinogameui 2026-04-11 16:29:07 +02:00
Lars Simon Winzer ff0f9f70d4 Merge branch 'chore/91-add-jacoco-as-gradle-dependency' into 'main'
Build: Add JaCoCo as gradle plugin

Closes #91

See merge request cs108-fs26/Gruppe-13!98
2026-04-11 15:56:28 +02:00
Lars Simon Winzer 53cafd3dd2 Build: Add JaCoCo as gradle plugin 2026-04-11 15:53:23 +02:00
Julian Kropff 30dcd8f4ab Merge branch 'main' into feat/game-ui
# Conflicts:
#	src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/GameClient.java
#	src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/CasinoGameUI.java
#	src/main/resources/ui-structure/Casinogameui.fxml
2026-04-11 15:16:46 +02:00
Julian Kropff f54182fde6 Merge branch 'chore/ui-checkstyle-fixes' into 'main'
Fix: Resolving Git Merge Conflicts

Closes #88

See merge request cs108-fs26/Gruppe-13!97
2026-04-11 13:10:57 +00:00
Mathis Ginkel 9e7a80c17d Docs: add description of enum ChatType
Refs #88
2026-04-11 15:07:55 +02:00
Mathis Ginkel 9df3042978 Style: fix line breaks in UsernameAvailability
Refs #88
2026-04-11 14:57:23 +02:00
Mathis Ginkel 69333ede7a Fix: change visibility of enum UsernameAvailability
Refs #88
2026-04-11 14:48:46 +02:00
Julian Kropff cdb6d0c6b0 Fix: revert wrongfully deleted line breaks
Refs #88
2026-04-11 14:43:48 +02:00
Mathis Ginkel a65341b648 Style: Manually revert changes made to SuccessResponse 2026-04-11 14:37:13 +02:00
Julian Kropff b4b2e3b067 Fix: Resolving Git Merge Conflicts and Checkstyle
Refs #88
2026-04-11 14:01:21 +02:00
Julian Kropff 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
Julian Kropff 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
Mathis Ginkel 590a9aa658 Style: Manually revert changes made to UsernameAvailability enum 2026-04-11 11:56:06 +02:00
Lars Simon Winzer 7d74ed6263 Merge branch 'chore/87-write-documentation-to-explain-our-protocol' into 'main'
Documentation describing the structure and conventions of our network protocol

Closes #77 and #87

See merge request cs108-fs26/Gruppe-13!96
2026-04-11 11:32:49 +02:00
Lars Simon Winzer 2d7b15e593 Docs: Documentation describing the structure and conventions of our network protocol 2026-04-11 11:21:00 +02:00
Mathis Ginkel 66d3826509 Docs: Delete outdated network protocol document 2026-04-11 11:16:21 +02:00
Julian Kropff 2e705185f4 Fix: checkstyle 2026-04-11 08:33:02 +02:00
Mathis Ginkel 9c09927d09 Docs: Adding Server Commands for Client Chat to the protocol document manually reverting changes 2026-04-10 23:25:05 +02:00