Daniel Grigencha
|
c3fdcf4dc7
|
added the states of the server automaton for testing purposes
|
2024-12-01 21:01:37 +01:00 |
|
Daniel Grigencha
|
8369797120
|
added JavaDocs for the 'InterruptState' classe
|
2024-12-01 20:41:30 +01:00 |
|
Daniel Grigencha
|
ef450a23f5
|
added logger to server state chart
|
2024-12-01 20:35:40 +01:00 |
|
Daniel Grigencha
|
17f0aa0209
|
added the 'Die' class to the 'Game' class
|
2024-12-01 19:46:59 +01:00 |
|
Daniel Grigencha
|
ff31335a98
|
added a new class 'Die' to handle the dice. added this class to the class 'Game'
|
2024-12-01 19:38:26 +01:00 |
|
Daniel Grigencha
|
3467dd2f04
|
added a new method getColorByIndex(int) and next() method to the enum 'Color'
|
2024-12-01 19:37:40 +01:00 |
|
Daniel Grigencha
|
fb6cfaa518
|
added JavaDocs for the classes in the package 'game'
|
2024-12-01 19:36:58 +01:00 |
|
Daniel Grigencha
|
bf38a7e00c
|
added a new method 'disconnectClient' in 'ServerSender' interface
|
2024-12-01 18:21:54 +01:00 |
|
Daniel Grigencha
|
eb54cfbc80
|
adjusted constructor for mdga server
|
2024-12-01 18:15:56 +01:00 |
|
Daniel Grigencha
|
1513576291
|
added javadocs to the 'ServerState' class
|
2024-12-01 18:03:46 +01:00 |
|
Daniel Grigencha
|
8c03b282b3
|
deleted the color attribute and their usages
|
2024-12-01 16:58:37 +01:00 |
|
Daniel Grigencha
|
a29e942191
|
added logic to the 'MdgaServer' class
|
2024-12-01 16:57:48 +01:00 |
|
Daniel Grigencha
|
efc7a2f09d
|
added logic to the 'LobbyState' class
- for leaving the lobby
|
2024-12-01 16:49:05 +01:00 |
|
Daniel Grigencha
|
121d668bf2
|
added logic to the 'LobbyState' class
|
2024-12-01 16:08:14 +01:00 |
|
Fleischer Hanno
|
ba5b9dc4b4
|
added the getter for the forcestartGame value in teh corresponding message
|
2024-12-01 16:04:55 +01:00 |
|
Daniel Grigencha
|
772c7a51e0
|
updated enum 'Color'
|
2024-12-01 15:54:06 +01:00 |
|
Fleischer Hanno
|
ed04bc1119
|
changed all messages to work with a UUID of a piece instead of a string identifier
|
2024-12-01 15:45:30 +01:00 |
|
Fleischer Hanno
|
7712ee2e7c
|
renamed JoinServerMessage to JoinedLobbyMessage and wrote a getter for the name in the message
|
2024-12-01 15:14:42 +01:00 |
|
Fleischer Hanno
|
1d5733a4b9
|
added a method for getting a piece through a uuid
|
2024-12-01 15:05:26 +01:00 |
|
Fleischer Hanno
|
dfea7e8736
|
added java docs for choosepowercard
|
2024-12-01 14:37:04 +01:00 |
|
Felix Koppe
|
2c81665f80
|
Update startmenu.png
|
2024-12-01 14:22:18 +01:00 |
|
Felix Koppe
|
150e4e4c22
|
Merge development
|
2024-12-01 14:18:44 +01:00 |
|
Felix Koppe
|
4ff84e64ed
|
Merge development
|
2024-12-01 14:11:10 +01:00 |
|
Felix Koppe
|
e6fb78507c
|
Remove garbarge files
|
2024-12-01 14:10:04 +01:00 |
|
Felix Koppe
|
9067a9b04c
|
Add javadoc
|
2024-12-01 14:08:33 +01:00 |
|
Felix Koppe
|
6758abd60e
|
Add javadoc to buttons
|
2024-12-01 13:56:45 +01:00 |
|
Fleischer Hanno
|
e70331d85d
|
changed parameter of DieMessage and included the force resumgame logic in intterrupt
|
2024-12-01 13:56:31 +01:00 |
|
Felix Koppe
|
c3ad8fe79a
|
Gerneral improvements
|
2024-12-01 13:35:14 +01:00 |
|
Fleischer Hanno
|
26d2d0587d
|
added the remaining logic for GameState and its substatemachines
|
2024-12-01 12:36:44 +01:00 |
|
Felix Koppe
|
a630ade2e1
|
Fix lobbyView leave
|
2024-11-30 14:21:45 +01:00 |
|
Felix Koppe
|
b197d70d44
|
Fix errors
|
2024-11-30 14:18:00 +01:00 |
|
Felix Koppe
|
67d120c278
|
Fix error
|
2024-11-30 14:10:42 +01:00 |
|
Felix Koppe
|
d53067f21a
|
Merge dev/client
|
2024-11-30 14:03:54 +01:00 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Cedric Beck
|
0b9fc90274
|
added dice, started adding notification implementation, added hover, highlight and select functionality for pieces
|
2024-11-27 03:05:35 +01:00 |
|
Cedric Beck
|
6528e5c2b6
|
started adding notifications
|
2024-11-26 20:53:29 +01:00 |
|
Cedric Beck
|
c204a3a4cb
|
change shader folder structure
|
2024-11-26 17:05:38 +01:00 |
|
Cedric Beck
|
d794ba9d03
|
added smooth outline
|
2024-11-26 16:54:40 +01:00 |
|
Cedric Beck
|
e97147d0e9
|
merge from koppe
|
2024-11-26 16:47:24 +01:00 |
|
Cedric Beck
|
1b151aabdd
|
added select nodes, cards & pieces
|
2024-11-26 16:45:13 +01:00 |
|
Felix
|
3e7d3dbc1b
|
Fix
|
2024-11-26 16:18:33 +01:00 |
|
Cedric Beck
|
7a482b74ab
|
fixed shaders in/out
|
2024-11-26 13:29:40 +01:00 |
|
Cedric Beck
|
5cc1888794
|
merge dev/client_koppe into dev/client_beck for camera movement
|
2024-11-26 13:13:32 +01:00 |
|
Cedric Beck
|
9dd70a96a0
|
added outline for bonuscards
|
2024-11-26 12:56:26 +01:00 |
|
Cedric Beck
|
80f5c4ce90
|
tried adding shield outline, but there is a bug -> black screen
|
2024-11-26 07:40:41 +01:00 |
|
Cedric Beck
|
b9986ded87
|
try push
|
2024-11-24 22:41:17 +01:00 |
|
Cedric Beck
|
fd09460d61
|
try push
|
2024-11-24 22:40:50 +01:00 |
|
Cedric Beck
|
e5dca013d1
|
try push
|
2024-11-24 22:38:23 +01:00 |
|
Cedric Beck
|
7bfc6e7c3e
|
try push
|
2024-11-24 22:37:37 +01:00 |
|
Cedric Beck
|
10428deedd
|
added resource restructuring
|
2024-11-24 19:54:29 +01:00 |
|
Cedric Beck
|
a196d3d7f2
|
added basic player name display
|
2024-11-24 19:49:54 +01:00 |
|