 Jona Walpert
|
3cabe06fb0
|
Merge branch 'main' into 'refactor/124-lobby-cleanup-job' to prevent merge conflicts
|
2026-04-24 15:15:29 +02:00 |
|
|
Mathis Ginkel
|
ebca653ab4
|
Merge remote-tracking branch 'origin/feat/chat-visual-improvement' into feat/chat-visual-improvement
|
2026-04-24 14:17:04 +02:00 |
|
|
Mathis Ginkel
|
9df48478f3
|
Feat: Change look of chat box
|
2026-04-24 14:16:55 +02:00 |
|
|
Jona Walpert
|
9023263b01
|
Refacor: Schedule LobbyCleanupJob instead of cleanup lambda
Refs #124
Co-authored-by: Copilot <copilot@github.com>
|
2026-04-24 14:16:12 +02:00 |
|
|
Jona Walpert
|
c04d4fca76
|
Refactor: Add LobbyCleanupJob for periodic expired lobby cleanup
- isolate failures per lobby during cleanup
- notify connected sessions about closed lobbies
Refs #124
Co-authored-by: Copilot <copilot@github.com>
|
2026-04-24 14:14:59 +02:00 |
|
|
Mathis Ginkel
|
d3d72bd5b4
|
Merge branch 'feat/chat-integration' into 'main'
Feat: Add chat box into the game screen
See merge request cs108-fs26/Gruppe-13!147
|
2026-04-24 12:14:16 +00:00 |
|
|
Mathis Ginkel
|
4a3c885b68
|
Style: Apply Spotless
|
2026-04-24 14:04:12 +02:00 |
|
|
Mathis Ginkel
|
571c616ce9
|
Merge remote-tracking branch 'origin/feat/chat-integration' into feat/chat-integration
|
2026-04-24 13:45:15 +02:00 |
|
|
Mathis Ginkel
|
01ecbb0497
|
Style: Apply Spotless
|
2026-04-24 13:45:02 +02:00 |
|
|
Julian Kropff
|
5e91cefabb
|
Fix: whisper chat not working in game UI
|
2026-04-24 13:44:38 +02:00 |
|
|
Julian Kropff
|
0f4d048b76
|
Fix: Chat UI initialization improved in Game UI
|
2026-04-24 13:44:18 +02:00 |
|
|
Mathis Ginkel
|
b1d099f102
|
Feat: Add load method to restore all chat message of a chat
Refs #107
|
2026-04-24 13:43:40 +02:00 |
|
|
Mathis Ginkel
|
40e558be18
|
Feat: Add chat box into the game screen
Refs #107
|
2026-04-24 13:40:44 +02:00 |
|
|
Mathis Ginkel
|
277b776fec
|
Feat: Add chat box into game ui
|
2026-04-24 13:38:52 +02:00 |
|
|
Mathis Ginkel
|
88b797ba1d
|
Feat: Add field ChatController to LobbyButtonGridManager
|
2026-04-24 13:37:12 +02:00 |
|
|
Mathis Ginkel
|
07c00275fd
|
Merge remote-tracking branch 'origin/feat/chat-integration' into feat/chat-integration
|
2026-04-24 13:27:17 +02:00 |
|
|
Mathis Ginkel
|
1d4cf2d846
|
Style: Apply Spotless
|
2026-04-24 13:26:57 +02:00 |
|
|
Julian Kropff
|
c2d0af03b7
|
Fix: whisper chat not working in game UI
|
2026-04-24 13:26:57 +02:00 |
|
|
Julian Kropff
|
48476a67f3
|
Fix: Chat UI initialization improved in Game UI
|
2026-04-24 13:26:57 +02:00 |
|
|
Julian Kropff
|
6471749133
|
Fix: correct layout layering in Game UI
|
2026-04-24 13:26:57 +02:00 |
|
|
Mathis Ginkel
|
826e58644a
|
Feat: Add load method to restore all chat message of a chat
Refs #107
|
2026-04-24 13:26:57 +02:00 |
|
|
Mathis Ginkel
|
67a0f237e6
|
Feat: Forward ChatController to all instances where its needed
Refs #107
|
2026-04-24 13:26:57 +02:00 |
|
|
Mathis Ginkel
|
2a03571cd1
|
Feat: Add chat box into the game screen
Refs #107
|
2026-04-24 13:26:57 +02:00 |
|
|
Mathis Ginkel
|
7eafaba65a
|
Feat: Add chat box into game ui
|
2026-04-24 13:26:57 +02:00 |
|
|
Mathis Ginkel
|
69fc00a3b2
|
Feat: Add field ChatController to LobbyButtonGridManager
|
2026-04-24 13:26:57 +02:00 |
|
|
Jona Walpert
|
ca65655443
|
Merge branch 'refactor/121-duplicate-check-lobby-code' into 'main'
Refactor/121 duplicate check lobby code
See merge request cs108-fs26/Gruppe-13!146
|
2026-04-24 11:26:08 +00:00 |
|
|
Jona Walpert
|
488e8f524b
|
Merge branch 'fix/123-server-assigned-username-send-to-client' into 'main'
Fix: Readd propagation of server assigned username. Login suername changed to...
Closes #123
See merge request cs108-fs26/Gruppe-13!145
|
2026-04-24 11:14:23 +00:00 |
|
|
Mathis Ginkel
|
9488ef41c3
|
Style: Apply Spotless
|
2026-04-24 11:46:32 +02:00 |
|
|
Julian Kropff
|
8bb0bfaf09
|
Fix: whisper chat not working in game UI
|
2026-04-24 11:16:34 +02:00 |
|
|
Julian Kropff
|
33998e4a88
|
Fix: Chat UI initialization improved in Game UI
|
2026-04-23 19:59:55 +02:00 |
|
|
Julian Kropff
|
d094df16da
|
Fix: correct layout layering in Game UI
|
2026-04-23 19:55:57 +02:00 |
|
|
Jona Walpert
|
b9e45142c2
|
Refactor: changed duplicate lobyb existence checks to the new preexecution check
|
2026-04-23 15:17:30 +02:00 |
|
|
Jona Walpert
|
16c91c6aae
|
Feat: Add lobby check to repalce duplicate code
|
2026-04-23 15:16:45 +02:00 |
|
|
Jona Walpert
|
ea5f6a1083
|
Fix: Readd propagation of server assigned username. Login suername changed to optional instead of required
|
2026-04-23 14:46:24 +02:00 |
|
|
Mathis Ginkel
|
c5f37392ef
|
Feat: Add load method to restore all chat message of a chat
Refs #107
|
2026-04-23 12:06:43 +02:00 |
|
|
Mathis Ginkel
|
66ee8bec46
|
Feat: Forward ChatController to all instances where its needed
Refs #107
|
2026-04-23 12:06:43 +02:00 |
|
|
Mathis Ginkel
|
36348d0d93
|
Feat: Add chat box into the game screen
Refs #107
|
2026-04-23 12:06:43 +02:00 |
|
|
Mathis Ginkel
|
90b2f3bb3a
|
Feat: Add chat box into game ui
|
2026-04-23 12:06:38 +02:00 |
|
|
Mathis Ginkel
|
1cddcf6657
|
Feat: Add field ChatController to LobbyButtonGridManager
|
2026-04-23 12:02:49 +02:00 |
|
|
Jona Walpert
|
e358c930c5
|
Merge branch 'chore/122-fix-long-file-imports' into 'main'
Fix: Correct fxml imports and restore branch state
See merge request cs108-fs26/Gruppe-13!144
|
2026-04-22 16:33:47 +00:00 |
|
|
Jona Walpert
|
95fc53ec61
|
Fix: Wire correct controllers to fxml files
Co-authored-by: Copilot <copilot@github.com>
|
2026-04-22 18:29:54 +02:00 |
|
|
Jona Walpert
|
989dc95cef
|
Fix: Final code restoration and import cleanup
Co-authored-by: Copilot <copilot@github.com>
|
2026-04-22 18:19:21 +02:00 |
|
|
Jona Walpert
|
2c343c72b3
|
Merge remote-tracking branch 'origin/main' into chore/122-fix-long-file-imports
|
2026-04-22 18:07:49 +02:00 |
|
|
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
|
97808fe26d
|
Merge branch 'fix/revert-failed-imports' into 'main'
Revert "Merge branch 'chore/122-fix-long-file-imports' into 'main'"
See merge request cs108-fs26/Gruppe-13!142
|
2026-04-22 15:43:11 +00:00 |
|
|
Jona Walpert
|
5b37dffa4c
|
Revert "Merge branch 'chore/122-fix-long-file-imports' into 'main'"
This reverts commit 838ada39d5, reversing
changes made to 028c3adb0d.
|
2026-04-22 17:39:13 +02:00 |
|
|
Jona Walpert
|
838ada39d5
|
Merge branch 'chore/122-fix-long-file-imports' into 'main'
Chore: fix long line class paths in fxml files by using imports
Closes #122
See merge request cs108-fs26/Gruppe-13!141
|
2026-04-22 12:30:48 +00:00 |
|
|
Jona Walpert
|
4e675677c0
|
Chore: fix long line class paths on server side by using imports
Refs #122
|
2026-04-22 14:20:38 +02:00 |
|
|
Jona Walpert
|
a629136fcb
|
Chore: fix long line class paths on client side by using imports
Refs #122
|
2026-04-22 14:19:53 +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 |
|