415 Commits

Author SHA1 Message Date
Fleischer Hanno
bfc812b003 minas please help no serialization 2024-12-02 02:07:02 +01:00
Felix Koppe
c5cb3d4dd0 Add restart on resolution change 2024-12-02 01:59:37 +01:00
Felix Koppe
918c1f2a8a Add videoSettings 2024-12-02 01:40:45 +01:00
Fleischer Hanno
1b6407b75b fixed bug 2024-12-02 00:52:28 +01:00
Felix Koppe
702f96b8db Add videoSettings 2024-12-02 00:53:11 +01:00
Felix Koppe
02f285a258 Remove cheat button 2024-12-02 00:39:58 +01:00
Daniel Grigencha
7acc55fe25 Updated 'MdgaServer' class.
Updated the 'MdgaServer' class by saving the host into the 'Game' class.
2024-12-02 00:28:01 +01:00
Cedric Beck
f272fd6f08 fixed bug again 2024-12-02 00:10:58 +01:00
Cedric Beck
bfc74ee126 fixed bug 2024-12-02 00:04:48 +01:00
Cedric Beck
f853b0b54f Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development 2024-12-01 23:57:59 +01:00
Cedric Beck
9dd2d3f58b added finish text; edited Notifications 2024-12-01 23:57:53 +01:00
Fleischer Hanno
00a04c2403 fixed a bug 2024-12-01 23:57:39 +01:00
Fleischer Hanno
8137a727f5 Merge remote-tracking branch 'origin/development' into development 2024-12-01 23:49:30 +01:00
Felix Koppe
d904a28ee0 Remove mock 2024-12-01 23:48:18 +01:00
Fleischer Hanno
2f2d9c7479 Merge remote-tracking branch 'origin/development' into development 2024-12-01 23:42:56 +01:00
Fleischer Hanno
c2b6e6e9e9 made all classes for ServerStartGameMEssage serializiable 2024-12-01 23:42:32 +01:00
Felix Koppe
f0cab64910 Minor change 2024-12-01 23:46:46 +01:00
Cedric Beck
eaef4b20ba Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development 2024-12-01 23:34:02 +01:00
Cedric Beck
d3fe2fec14 added show/hide functionality for select button 2024-12-01 23:33:28 +01:00
Felix Koppe
bec199036c Minor change 2024-12-01 23:10:25 +01:00
Felix Koppe
7319f7a62c Process startMenuNotification in lobby 2024-12-01 23:12:36 +01:00
Felix Koppe
5905a232a5 Adjust state 2024-12-01 23:03:26 +01:00
Cedric Beck
12cb87ef70 added outline package back 2024-12-01 22:56:09 +01:00
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
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
5b8032bed9 Prepare for model 2024-12-01 17:44:37 +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