 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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
Julian Kropff
|
01a72a6719
|
Style: translate comments to english
|
2026-04-01 13:02:14 +02:00 |
|
|
Jona Walpert
|
1727aec42c
|
Add: chatui added to lobby ui
|
2026-03-19 14:16:18 +01:00 |
|
|
Julian Kropff
|
8639fa420f
|
Fix: change file names to conform convention
|
2026-03-19 13:27:32 +01:00 |
|
|
jk
|
736cf230fb
|
Merge branch 'main' into 'feat/game-ui'
|
2026-03-14 14:02:13 +01:00 |
|
|
Julian Kropff
|
3a8dc98e91
|
style: update chat ui design
|
2026-03-14 13:31:45 +01:00 |
|
|
Julian Kropff
|
59a4648ad6
|
fix: reorganize folder structure for chat components
|
2026-03-14 13:01:41 +01:00 |
|
|
Julian Kropff
|
ec4d8bfb07
|
fix: update chatbox fxml
|
2026-03-14 11:54:14 +01:00 |
|
|
jk
|
8f5d90c538
|
style: update casino game ui
|
2026-03-14 11:41:05 +01:00 |
|
|
jk
|
8610f77386
|
fix: update casino game ui fxml
|
2026-03-14 11:38:54 +01:00 |
|
|
jk
|
c38f177a16
|
fix: update chatbox fxml
|
2026-03-14 11:37:26 +01:00 |
|
|
jk
|
7d2486d3be
|
fix: update taskbar fxml
|
2026-03-14 11:31:47 +01:00 |
|
|
Jona Walpert
|
d2407d61f4
|
Add: Lobby display in lobby GUI with placeholder functions.
|
2026-03-12 15:25:18 +01:00 |
|
|
Julian Kropff
|
4989e26ac6
|
style(game-ui): add Casinogameui stylesheet
|
2026-03-12 07:31:15 +01:00 |
|
|
Julian Kropff
|
89d4cad336
|
feat(game-ui): add Tastbar FXML layout
|
2026-03-12 07:30:35 +01:00 |
|
|
Julian Kropff
|
c0b6a5424a
|
feat(game-ui): add PlayerStatus FXML layout
|
2026-03-12 07:28:27 +01:00 |
|
|
Julian Kropff
|
f9b32bc979
|
feat(game-ui): add Chatbox FXML layout
|
2026-03-12 07:26:39 +01:00 |
|
|
Julian Kropff
|
25d145cffd
|
feat(game-ui): add Casinogameui FXML layout
|
2026-03-12 07:25:09 +01:00 |
|
|
Jona Walpert
|
a5204eaf29
|
Add: Lobby UI
|
2026-03-11 15:16:31 +01:00 |
|