Commit Graph

57 Commits

Author SHA1 Message Date
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
jk a43361d606 Fix: Brightened the images 2026-04-09 19:21:07 +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
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
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
Julian Kropff c0b6a5424a feat(game-ui): add PlayerStatus FXML layout 2026-03-12 07:28:27 +01:00