 Lars Simon Winzer
|
25c20a2ea3
|
Fix: Allow longer method length in ServerApp
|
2026-04-11 18:46:50 +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 |
|
|
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 |
|
|
Mathis Ginkel
|
97e5a55042
|
Style: Apply Spotless
|
2026-04-10 22:43:23 +02:00 |
|
|
Julian Kropff
|
f6dda36c8d
|
Merge branch 'main' into feat/game-ui
|
2026-04-10 21:05:53 +02:00 |
|
|
Julian Kropff
|
4de90e6962
|
Add: PlayerStatusController class -> player status (name, chips, dealer, fold state)
Refs #52
|
2026-04-10 20:59:07 +02:00 |
|
|
Julian Kropff
|
284ff2d043
|
Refactor: improve TaskbarController class -> Action system (fold/call/raise) implemented
Refs #52
|
2026-04-10 20:52:21 +02:00 |
|
|
Julian Kropff
|
c02680143f
|
Refactor: improve CasinoGameController class -> create UI layout for poker table
Refs #52
|
2026-04-10 20:46:50 +02:00 |
|
|
Julian Kropff
|
cb7c284314
|
Fix: small style fixes
|
2026-04-10 20:41:12 +02:00 |
|
|
Julian Kropff
|
a2d176f13c
|
Refactor: improve CasinoGameUI structure
Refs #52
|
2026-04-10 20:34:49 +02:00 |
|
|
Julian Kropff
|
644c3e93fc
|
Refactor: improve Card class
Refs #52
|
2026-04-10 20:31:15 +02:00 |
|
|
Julian Kropff
|
d0ab49ec57
|
Add: GameService class
Refs #52
|
2026-04-10 20:29:26 +02:00 |
|
|
Julian Kropff
|
8deb647e94
|
Refactor: improve GameState class
Refs #52
|
2026-04-10 20:25:54 +02:00 |
|
|
Julian Kropff
|
3ea2971ab5
|
Refactor: improve Player class
Refs #52
|
2026-04-10 20:23:42 +02:00 |
|
|
Julian Kropff
|
d10e9a72fd
|
Add: PlayerId class
Refs #52
|
2026-04-10 20:20:45 +02:00 |
|
|
Julian Kropff
|
ea41a3c75a
|
Add: PlayerState class
Refs #52
|
2026-04-10 20:18:20 +02:00 |
|
|
Julian Kropff
|
ce583062ba
|
Refactor: improve GameClient structure
Refs #52
|
2026-04-10 20:16:08 +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 |
|
|
Lars Simon Winzer
|
3ee1e63577
|
Merge branch 'fix/81-incorrect-visibility-of-throwingparser' into 'main'
Change visibility of ThrowingParser from package-private to public
Closes #81
See merge request cs108-fs26/Gruppe-13!94
|
2026-04-10 11:30:22 +02:00 |
|
|
Lars Simon Winzer
|
8f4ce1db80
|
Fix: Change visibility of ThrowingParser from package-private to public
|
2026-04-10 11:25:09 +02:00 |
|
|
Lars Simon Winzer
|
066d4ee8c3
|
Merge branch 'chore/66-milestone-achievements-template-and-contributing' into 'main'
Add milestone achievements template and update contributing guidelines
Closes #66
See merge request cs108-fs26/Gruppe-13!93
|
2026-04-10 10:57:40 +02:00 |
|
|
Lars Simon Winzer
|
5ed455c20d
|
Refactor: Cut header length
|
2026-04-10 10:48:52 +02:00 |
|
|
Lars Simon Winzer
|
938ef71c2a
|
Revert "Refactor: Swap title and category header and cut header length"
This reverts commit 09e8822bef.
|
2026-04-10 10:35:25 +02:00 |
|
|
Lars Simon Winzer
|
09e8822bef
|
Refactor: Swap title and category header and cut header length
|
2026-04-10 10:34:37 +02:00 |
|
|
Lars Simon Winzer
|
35297775dc
|
Add: Milestone Achievements section to contribution guidelines
|
2026-04-10 10:28:10 +02:00 |
|
|
Lars Simon Winzer
|
77dad54c84
|
Add: Milestone achievement gitlab issue template
|
2026-04-10 10:14:03 +02:00 |
|
|
Mathis Ginkel
|
1914aa2c7f
|
Merge branch 'main' into 'feat/client-chat'
# Conflicts:
# src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/ServerApp.java
|
2026-04-09 19:34:38 +00:00 |
|