 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 |
|
|
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
|
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 |
|
|
Julian Kropff
|
d762f7bb2b
|
Add: Background image
|
2026-03-31 19:46:28 +02:00 |
|
|
Julian Kropff
|
605260f0d0
|
Add: Diamond Card images
|
2026-03-31 19:36:15 +02:00 |
|
|
Julian Kropff
|
27913854c5
|
Add: Heart Card images
|
2026-03-31 19:35:50 +02:00 |
|
|
Julian Kropff
|
ecd66a4ee9
|
Add: Pik Card images
|
2026-03-31 19:27:07 +02:00 |
|
|
Julian Kropff
|
ae8eccb158
|
Add: Cross Card images
|
2026-03-31 19:20:45 +02:00 |
|
|
Julian Kropff
|
7a29ce0b3b
|
Add: Diamond Card image
|
2026-03-31 19:06:24 +02:00 |
|
|
Julian Kropff
|
865d5bb0dc
|
fix: rename
|
2026-03-31 18:44:19 +02:00 |
|
|
Julian Kropff
|
8ee5114d37
|
Add: poker chip images
|
2026-03-31 18:42:36 +02:00 |
|
|
Julian Kropff
|
c3bf2d4bb0
|
fix: rename
|
2026-03-31 17:46:28 +02:00 |
|
|
Julian Kropff
|
874df242ab
|
Add: Pik Card image
|
2026-03-31 17:45:52 +02:00 |
|
|
Julian Kropff
|
06e49a756c
|
Add: Heart Card image
|
2026-03-31 17:45:05 +02:00 |
|
|
Julian Kropff
|
b88fdceb9f
|
Add: Cross Card image
|
2026-03-31 17:44:11 +02:00 |
|
|
Julian Kropff
|
3d8bad2427
|
Add: first three poker cards
|
2026-03-19 20:10:19 +01:00 |
|
|
Julian Kropff
|
c88c809a2e
|
Add: Casono logos
|
2026-03-19 20:09:36 +01:00 |
|
|
Julian Kropff
|
ab851113e0
|
Add: poker chip images
|
2026-03-19 20:07:28 +01:00 |
|
|
Julian Kropff
|
4dd9c56e02
|
Add: background images
|
2026-03-19 20:05:05 +01:00 |
|
|
Julian Kropff
|
0e7507f2c4
|
Add: loading animation
|
2026-03-19 20:02:51 +01: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
|
75567c59b2
|
Merge branch 'main' into 'feat/lobby-ui'
|
2026-03-13 14:55:43 +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 |
|