Fleischer Hanno
|
5a68d3b146
|
fixed a method call for getMoveIndices
|
2024-12-01 21:52:28 +01:00 |
|
Cedric Beck
|
63fa692910
|
removed comments
|
2024-12-01 21:52:28 +01:00 |
|
Felix Koppe
|
638cb93d7b
|
Merge dev/client_beck
|
2024-12-01 21:51:01 +01:00 |
|
Fleischer Hanno
|
133f900ec7
|
added the server and network functionality for mdga and fixed the communication in the Lobby
|
2024-12-01 21:50:28 +01:00 |
|
Cedric Beck
|
7db75a2ca1
|
added converted assets
|
2024-12-01 21:48:40 +01:00 |
|
Daniel Grigencha
|
71d5701cc7
|
added javadoc for the classes in the notification package
|
2024-12-01 21:44:35 +01:00 |
|
Cedric Beck
|
da2b1af698
|
fixed shutdown guiHandler bug
|
2024-12-01 20:45:24 +01:00 |
|
Cedric Beck
|
e5b007accd
|
debug commit
|
2024-12-01 20:24:26 +01:00 |
|
Cedric Beck
|
c08c81ea46
|
edited map
|
2024-12-01 18:42:57 +01:00 |
|
Daniel Grigencha
|
eb54cfbc80
|
adjusted constructor for mdga server
|
2024-12-01 18:15:56 +01:00 |
|
Cedric Beck
|
453aacfe1a
|
fixed missing messages
|
2024-12-01 18:12:31 +01:00 |
|
Cedric Beck
|
2732a89da6
|
fixed error with SelectObjectOutliner
|
2024-12-01 17:47:04 +01:00 |
|
Felix Koppe
|
21f98de3e6
|
Minor adjustment
|
2024-12-01 17:32:05 +01:00 |
|
Cedric Beck
|
b099972656
|
merge from dev/client_beck
|
2024-12-01 17:10:04 +01:00 |
|
Cedric Beck
|
eb703cbd2c
|
fixed bad performancegit status!; edited GameNotification; fixed error because of changed 'Color' enum
|
2024-12-01 17:03:09 +01:00 |
|
Daniel Grigencha
|
a29e942191
|
added logic to the 'MdgaServer' class
|
2024-12-01 16:57:48 +01:00 |
|
Fleischer Hanno
|
ba5b9dc4b4
|
added the getter for the forcestartGame value in teh corresponding message
|
2024-12-01 16:04:55 +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 |
|
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
|
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 |
|
Felix Koppe
|
c3ad8fe79a
|
Gerneral improvements
|
2024-12-01 13:35:14 +01:00 |
|
Fleischer Hanno
|
5ff56ed9d8
|
added all necessary logic for the turn waiting class and adjusted some messages
|
2024-11-30 22:23:40 +01:00 |
|
Fleischer Hanno
|
0297193be1
|
added more functionality to the client state machine and implemeted the first notifications
|
2024-11-30 16:23:09 +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
|
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
|
6f71a8b16d
|
Work#
|
2024-11-30 13:12:51 +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 |
|