Commit Graph

89 Commits

Author SHA1 Message Date
Jona Walpert ffbfd2dee4 Fix: Correct fxml imports and restore branch state"
Co-authored-by: Copilot <copilot@github.com>
2026-04-22 17:51:35 +02:00
Jona Walpert 30067bd69b Chore: fix long line class paths in fxml files by using imports
Refs #122
2026-04-22 14:18:50 +02:00
Jona Walpert 15c998d549 Feat: Delete window header and white background. Add mouse dragging ability to Highscore popup 2026-04-21 20:31:52 +02:00
Jona Walpert 062e66cdf9 Feat: Add highscore popup UI and lobby display
Highscore button in GameUI replaces "Info" Button wich was unused
(Issue #110)
2026-04-21 20:13:13 +02:00
Jona Walpert 3252c7e534 Feat: Enabled username input section in lobby UI 2026-04-15 20:41:31 +02:00
Julian Kropff 0bf24b9e0f Fix: Chat implementation completed 2026-04-13 01:44:18 +02:00
Julian Kropff 6ec743f126 Fix: revision of chatContainer in the Casinomainui and Casinogameui styles 2026-04-12 22:56:40 +02:00
Julian Kropff 4557dc2f5a Fix: comment out unused input box and button 2026-04-12 21:52:40 +02:00
Julian Kropff 659ea8a744 Fix: update Lobby Button styles in Casino Main UI 2026-04-12 12:53:44 +02:00
Julian Kropff 0227145cab Fix: translations in Casino Main UI 2026-04-12 09:11:34 +02:00
Julian Kropff 755ea54381 Style: add gray-input-field class to Casino Main UI
Refs #106
2026-04-12 09:05:10 +02:00
jk c0b149cc5f Fix: add lobby ui input field style and fix translations
Refs #106
2026-04-12 09:00:41 +02:00
Julian Kropff 406567d375 Fix: Integration of chatbox.fxml into Casinogameui 2026-04-11 16:29:07 +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 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
Julian Kropff cb7c284314 Fix: small style fixes 2026-04-10 20:41:12 +02:00
Julian Kropff 040ff7cf52 Fix: correct CasinoGame UI
Refs #52
2026-04-10 20:12:14 +02:00
Julian Kropff 616f609fae Fix: update Casinogame UI styles
Refs #52
2026-04-10 20:09:04 +02:00
Julian Kropff 4895af9030 Fix: correct Taskbar UI
Refs #52
2026-04-10 20:05:49 +02:00
Julian Kropff db3f34fddf Fix: correct Player status UI layout
Refs #52
2026-04-10 20:02:33 +02:00
Mathis Ginkel 31d3947175 Add: CSS-Style changes to the ChatBox 2026-04-10 13:21:34 +02:00
Mathis Ginkel 566c9375ab Style: Apply Spotless 2026-04-09 20:36:18 +02:00
jk a43361d606 Fix: Brightened the images 2026-04-09 19:21:07 +02:00
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
Mathis Ginkel e8401a976a Add: First implementation of Button, to create Whisper Chat 2026-04-09 18:04:57 +02:00
Mathis Ginkel c0c9225d42 Fix: Parsing of Server Responses for Client Chat 2026-04-09 18:04:57 +02:00
Mathis Ginkel 4e7b0ab67a Add: Implement Commands for Chat Protocol 2026-04-09 18:04:57 +02:00
Mathis Ginkel 39f60c9113 Fix: small changes to ChatUI 2026-04-09 18:04:57 +02:00
Mathis Ginkel 7d19e65428 Add: client chat architecture for lobby and global chat 2026-04-09 18:04:50 +02:00
Mathis Ginkel de66757837 Resolve Conflicts 2026-04-09 18:03:26 +02:00
jk a5427a232f Merge branch 'main' into feat/game-ui
# Conflicts:
#	src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/CasinoGameUI.java
2026-04-09 14:37:59 +02:00
Julian Kropff e374be4e31 Add: dealer chip images 2026-04-09 14:07:33 +02:00
Julian Kropff d939b0da67 Add: background card image 2026-04-09 13:57:24 +02:00
Jona Walpert f3ecbd12f5 Feat: Add username text field to main Lobby 2026-04-08 13:34:26 +02:00
Mathis Ginkel 509aa71d9f Add: Implement Commands for Chat Protocol 2026-04-07 22:15:23 +02:00
Mathis Ginkel d1d2fb30e8 Fix: small changes to ChatUI 2026-04-07 22:11:20 +02:00
Mathis Ginkel a9dcd79b38 Add: client chat architecture for lobby and global chat 2026-04-07 22:11:20 +02:00
Mathis Ginkel 61e54f282e Resolve Conflicts 2026-04-07 22:11:20 +02:00
Julian Kropff 6693d57688 Merge remote-tracking branch 'origin/main' into feat/gameui 2026-04-05 13:36:22 +02:00
Jona Walpert 3153f7027d fix: temporyy fix for NPE and wrong naming 2026-04-02 18:50:20 +02:00
Mathis Ginkel 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
Mathis Ginkel cc33411911 Add: basic chat functionality 2026-04-02 10:20:03 +02:00
Jona Walpert 120b55f5cc Merge branch 'feat/ui-images' into 'main'
Feat/ui images

See merge request cs108-fs26/Gruppe-13!70
2026-04-01 16:24:48 +00:00
Jona Walpert 5dd620116a Chore: Move old poker chip images to old_images folder 2026-04-01 18:21:17 +02:00
Jona Walpert f4c20e1725 Chore: Rename chip images to lobby button naming scheme 2026-04-01 18:18:25 +02:00
Julian Kropff 0c6595a58b Add: red poker chip images 2026-04-01 17:41:05 +02:00
Julian Kropff 936463c8f1 Add: green poker chip images 2026-04-01 17:40:55 +02:00
Julian Kropff 01a72a6719 Style: translate comments to english 2026-04-01 13:02:14 +02:00
Julian Kropff da23a30ca5 Add: Background image 2026-03-31 19:46:58 +02:00