Felix Koppe
|
4313468a0c
|
Finish merge
|
2024-11-30 14:00:42 +01:00 |
|
Felix Koppe
|
0393e9b534
|
Fixing errors
|
2024-11-30 13:47:34 +01:00 |
|
Felix Koppe
|
f3bc6bc2f0
|
Fixing errors
|
2024-11-30 13:38:08 +01:00 |
|
Felix Koppe
|
12abe081c9
|
Minor changes
|
2024-11-30 13:21:31 +01:00 |
|
Felix Koppe
|
02b536aa82
|
102IQ
|
2024-11-30 13:17:53 +01:00 |
|
Felix Koppe
|
99ffee749e
|
101IQ
|
2024-11-30 13:14:41 +01:00 |
|
Felix Koppe
|
6f71a8b16d
|
Work#
|
2024-11-30 13:12:51 +01:00 |
|
Felix Koppe
|
a78b3acacd
|
100IQ
|
2024-11-30 13:10:46 +01:00 |
|
Fleischer Hanno
|
0487ff0238
|
modified messages to work with piece uuid instead of an identifier.
|
2024-11-30 13:02:23 +01:00 |
|
Felix Koppe
|
6a85aca970
|
Readd .run after some fool deleted it
|
2024-11-30 12:56:12 +01:00 |
|
Felix Koppe
|
c2cfd8c175
|
Merge remote-tracking branch 'origin/dev/client_beck' into dev/client_beck
# Conflicts:
# Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java
# Projekte/mdga/model/src/main/java/pp.mdga/server/Lobby.java
|
2024-11-30 12:48:49 +01:00 |
|
Felix Koppe
|
af5d4a95cd
|
Remove notifications
|
2024-11-30 12:45:08 +01:00 |
|
Felix Koppe
|
129ce54dd8
|
Merge branch 'refs/heads/development' into dev/client_beck
# Conflicts:
# Projekte/mdga/model/src/main/java/pp.mdga/server/DetermineStartPlayer.java
# Projekte/mdga/model/src/main/java/pp.mdga/server/Lobby.java
# Projekte/mdga/model/src/main/java/pp.mdga/server/Turn.java
# Projekte/mdga/model/src/main/java/pp/mdga/notification/SelectableMoveNotification.java
# Projekte/mdga/model/src/main/java/pp/mdga/notification/SelectablePiecesNotification.java
# Projekte/mdga/model/src/main/java/pp/mdga/notification/SelectableSwapNotification.java
|
2024-11-30 12:44:04 +01:00 |
|
Felix Koppe
|
8c8bd4db0d
|
Add sounds
|
2024-11-30 12:37:18 +01:00 |
|
Cedric Beck
|
1c222ce0e0
|
tried mergee with development
|
2024-11-30 12:36:09 +01:00 |
|
Cedric Beck
|
f7a34d0d59
|
tried merge with dev/client
|
2024-11-30 12:34:39 +01:00 |
|
Cedric Beck
|
cbb21e92f8
|
added init/shutdown
|
2024-11-30 12:07:42 +01:00 |
|
Fleischer Hanno
|
4d6cd63a3d
|
made all notifications constructors public
|
2024-11-30 11:24:46 +01:00 |
|
Felix Koppe
|
36d31e99e9
|
Fix error
|
2024-11-30 11:19:54 +01:00 |
|
Felix Koppe
|
28a2c9a448
|
Add confirm button
|
2024-11-30 11:17:42 +01:00 |
|
Felix Koppe
|
dd8b16f1ac
|
Merge commit
|
2024-11-30 10:52:44 +01:00 |
|
Felix Koppe
|
be15b3bd63
|
Minor changes
|
2024-11-30 10:51:35 +01:00 |
|
Cedric Beck
|
07f0f55192
|
added further notification implemenation
|
2024-11-30 00:33:10 +01:00 |
|
Cedric Beck
|
13690cf73d
|
added skybox; reworked guiHandler
|
2024-11-29 21:28:50 +01:00 |
|
Cedric Beck
|
220d8ff47e
|
added activePlayer+diceNum text display
|
2024-11-29 17:26:04 +01:00 |
|
Cedric Beck
|
67bb30d124
|
added new notifications for client-view communication
|
2024-11-29 15:23:34 +01:00 |
|
Felix Koppe
|
184410ba31
|
Merge commit
|
2024-11-29 14:38:23 +01:00 |
|
Felix Koppe
|
3147f5b7a3
|
Fix some errors
|
2024-11-29 14:37:46 +01:00 |
|
Felix Koppe
|
0e79f35cb0
|
Merge dev/client_koppe2
|
2024-11-29 14:02:59 +01:00 |
|
Felix Koppe
|
f024ba4866
|
Add preferences and sounds
|
2024-11-29 14:01:18 +01:00 |
|
Felix Koppe
|
35270cce7b
|
Fix ceremony statistics error
|
2024-11-29 12:49:07 +01:00 |
|
Felix Koppe
|
b0761082ce
|
Fix error after merge
|
2024-11-29 12:42:03 +01:00 |
|
Felix Koppe
|
46182b33a8
|
Merge dev/client_koppe2 and development
|
2024-11-29 12:36:07 +01:00 |
|
Felix Koppe
|
457023ad93
|
Work
|
2024-11-29 12:30:59 +01:00 |
|
Felix Koppe
|
c3055a0646
|
Work
|
2024-11-29 12:29:20 +01:00 |
|
Felix Koppe
|
ae1ec74056
|
Merge dev/client_beck
|
2024-11-29 10:48:05 +01:00 |
|
Felix Koppe
|
24cc81d9d4
|
Merge remote-tracking branch 'origin/dev/client_beck' into dev/client_koppe2
# Conflicts:
# Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java
# Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java
# Projekte/mdga/client/src/main/java/pp/mdga/client/view/GameView.java
|
2024-11-29 10:13:15 +01:00 |
|
Felix Koppe
|
c25c12d0d6
|
Work on ceremony2
|
2024-11-29 09:45:36 +01:00 |
|
Felix Koppe
|
7b689d6bf6
|
Work on ceremony
|
2024-11-28 21:39:08 +01:00 |
|
Cedric Beck
|
2099e02567
|
added board dice; edited DiceControl; added high-res font; working on ActionTextHandler
|
2024-11-28 20:07:15 +01:00 |
|
Fleischer Hanno
|
7690340b8f
|
added mor client state transitions
and renamed every client state with state as its suffix and renamed every message with messag as its suffix
|
2024-11-28 18:28:55 +01:00 |
|
Cedric Beck
|
3dcdbdf489
|
added display of 'colorÃ' to playerName
|
2024-11-28 17:29:59 +01:00 |
|
Felix Koppe
|
88cb87d4cd
|
Merge commit
|
2024-11-28 16:25:57 +01:00 |
|
Felix Koppe
|
827e7aac86
|
Add stuff
|
2024-11-28 16:25:13 +01:00 |
|
Felix Koppe
|
eec68188ee
|
Make use of parallelProjection
|
2024-11-28 16:08:33 +01:00 |
|
Hanno Fleischer
|
476ca82bda
|
created the first part of the cliejnt state machine with its corresponding logic
|
2024-11-28 15:27:31 +01:00 |
|
Felix Koppe
|
3235a46788
|
Rewrite gui
|
2024-11-28 15:00:53 +01:00 |
|
Cedric Beck
|
7da388af37
|
added improved pieces model; added functionality to notifications + todos
|
2024-11-28 02:08:51 +01:00 |
|
Cedric Beck
|
304acf17a3
|
added full highlight functionality for bonuscards; added bonus Symbols display
|
2024-11-28 01:21:15 +01:00 |
|
Cedric Beck
|
9736dc828b
|
added highlight to bonuscards
|
2024-11-27 19:50:29 +01:00 |
|