Cedric Beck
|
9cb7a156bb
|
Merge branch 'development' into dev/client_beck
|
2024-12-01 22:47:48 +01:00 |
|
Fleischer Hanno
|
76e2606847
|
reverted the client state machine
|
2024-12-01 22:47:13 +01:00 |
|
Cedric Beck
|
7762b97303
|
added init & taktical view by ownColor
|
2024-12-01 22:46:17 +01:00 |
|
Daniel Grigencha
|
eaf46f3e14
|
updated the project to pass the checkstyle
|
2024-12-01 22:37:49 +01:00 |
|
Fleischer Hanno
|
92be52b62a
|
fixed server join logic
|
2024-12-01 22:33:30 +01:00 |
|
Fleischer Hanno
|
7a0a3589a5
|
trying to fix server ip to use outward ip
|
2024-12-01 22:14:09 +01:00 |
|
Cedric Beck
|
661c28f096
|
merge to dev/client_beck from development
|
2024-12-01 22:06:30 +01:00 |
|
Cedric Beck
|
4a94e85aac
|
Merge branch 'dev/client' into dev/client_beck
|
2024-12-01 21:55:37 +01:00 |
|
Felix Koppe
|
799bd096a0
|
Merge development
|
2024-12-01 21:56:52 +01:00 |
|
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 |
|
Fleischer Hanno
|
33ddea4221
|
Merge remote-tracking branch 'origin/development' into development
|
2024-12-01 21:49:30 +01:00 |
|
Daniel Grigencha
|
977a7294ad
|
updated server state diagram and added missing classes
|
2024-12-01 21:49:11 +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 |
|
Fleischer Hanno
|
42feca466d
|
Merge remote-tracking branch 'origin/development' into development
|
2024-12-01 21:05:41 +01:00 |
|
Daniel Grigencha
|
95a1f8d858
|
removed all inheritance of the automaton for testing purposes
|
2024-12-01 21:05:22 +01:00 |
|
Fleischer Hanno
|
76757c19a9
|
Merge remote-tracking branch 'origin/development' into development
|
2024-12-01 21:02:11 +01:00 |
|
Daniel Grigencha
|
c3fdcf4dc7
|
added the states of the server automaton for testing purposes
|
2024-12-01 21:01:37 +01:00 |
|
Fleischer Hanno
|
8ffab12f49
|
Merge remote-tracking branch 'origin/development' into development
|
2024-12-01 20:57:57 +01:00 |
|
Cedric Beck
|
da2b1af698
|
fixed shutdown guiHandler bug
|
2024-12-01 20:45:24 +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 |
|
Cedric Beck
|
e5b007accd
|
debug commit
|
2024-12-01 20:24:26 +01:00 |
|
Daniel Grigencha
|
17f0aa0209
|
added the 'Die' class to the 'Game' class
|
2024-12-01 19:46:59 +01:00 |
|
Fleischer Hanno
|
1d8eff8ea9
|
Merge remote-tracking branch 'origin/development' into development
|
2024-12-01 19:45:06 +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 |
|
Cedric Beck
|
c08c81ea46
|
edited map
|
2024-12-01 18:42:57 +01:00 |
|
Fleischer Hanno
|
e9d45f241f
|
Merge remote-tracking branch 'origin/development' into development
|
2024-12-01 18:22:29 +01:00 |
|
Daniel Grigencha
|
bf38a7e00c
|
added a new method 'disconnectClient' in 'ServerSender' interface
|
2024-12-01 18:21:54 +01:00 |
|
Fleischer Hanno
|
5d638a1da7
|
Merge remote-tracking branch 'origin/development' into development
|
2024-12-01 18:20:16 +01:00 |
|
Fleischer Hanno
|
b83279e835
|
Merge remote-tracking branch 'origin/development' into development
|
2024-12-01 18:16:05 +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 |
|
Daniel Grigencha
|
1513576291
|
added javadocs to the 'ServerState' class
|
2024-12-01 18:03:46 +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 |
|
Fleischer Hanno
|
5206b03966
|
added java docs
|
2024-12-01 17:03:56 +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
|
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 |
|