Commit Graph

Select branches

Hide Pull Requests

b_Bauer_Lukas

b_Beck_Cedric

b_Brennfoerder_Timo

b_Feyer_Benjamin

b_Fleischer_Hanno

b_Grigencha_Daniel

b_koppe_felix

dev/client

dev/client_beck

dev/client_koppe

dev/client_koppe2

dev/model

dev/server_h

dev/test

dev_client

development

development2

main

view_assets

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#5

#6

#7

#8

#9

Version1.0

Version1.1

Version1.1.1

Mono Color

• 3658c88d72 made all enums look like the color enum Fleischer Hanno 2024-12-02 02:11:40 +01:00
• bfc812b003 minas please help no serialization Fleischer Hanno 2024-12-02 02:07:02 +01:00
• 470607af5c Merge branch 'development' into 'dev/test' Benjamin Feyer 2024-12-02 00:55:01 +00:00
• 413f35d7bf Merge commit Felix Koppe 2024-12-02 01:59:49 +01:00
• c5cb3d4dd0 Add restart on resolution change Felix Koppe 2024-12-02 01:59:37 +01:00
• efb4439431 Updated 'Game' class. Updated the 'Game' class by adding the 'setDie' method to it. Daniel Grigencha 2024-12-02 01:53:10 +01:00
• 435919306a Merge branch 'development' into 'dev/test' Benjamin Feyer 2024-12-02 00:49:22 +00:00
• f63e94cf24 added one testmethod in pieceTest Benjamin Feyer 2024-12-02 01:47:47 +01:00
• bf75b8afc9 Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development Daniel Grigencha 2024-12-02 01:39:07 +01:00
• 601366f08d Merge commit Felix Koppe 2024-12-02 01:40:58 +01:00
• 918c1f2a8a Add videoSettings Felix Koppe 2024-12-02 01:40:45 +01:00
• 0b45727bd7 Updated 'Die' class. Updated the 'Die' class by adding a third constructor for test cases. Daniel Grigencha 2024-12-02 01:39:01 +01:00
• 0aeb02a5f2 Merge branch 'development' into 'dev/test' Benjamin Feyer 2024-12-02 00:29:39 +00:00
• 5240150ec2 added some parts of test-method piecetest Benjamin Feyer 2024-12-02 01:28:42 +01:00
• a19ac2fc51 Updated 'GameState' class. Updated the 'GameState' class by changing the data types of 'determineStartPlayerState, 'animationState' and 'turnState' attributes in it. Daniel Grigencha 2024-12-02 01:27:21 +01:00
• 79f0e55c52 default value of playerData in 'Board' Daniel Grigencha 2024-12-02 01:19:41 +01:00
• 44378486d4 Merge remote-tracking branch 'origin/development' into development Fleischer Hanno 2024-12-02 01:17:14 +01:00
• 149931d2cb fixed PlayerData mistake Fleischer Hanno 2024-12-02 01:16:33 +01:00
• 1250500558 Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development Daniel Grigencha 2024-12-02 01:01:49 +01:00
• 177bfe3001 Updated 'DetermineStartPlayerState' class. Updated the 'DeterminStartPlayerState' class by removing the 'getDiceResults' method from it. In Addition, the logic inside the 'received(RequestDieMessage msg, int from)' was added. Daniel Grigencha 2024-12-02 01:01:42 +01:00
• 1b6407b75b fixed bug Fleischer Hanno 2024-12-02 00:52:28 +01:00
• 138444439d Merge remote-tracking branch 'origin/development' into development Felix Koppe 2024-12-02 00:53:58 +01:00
• 702f96b8db Add videoSettings Felix Koppe 2024-12-02 00:53:11 +01:00
• c649b8f3ae creating MapCreation Notification Fleischer Hanno 2024-12-02 00:44:11 +01:00
• 41a669d44d Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development Daniel Grigencha 2024-12-02 00:42:17 +01:00
• 4b6b12c0ac Updated 'Board' class. Updated the 'Board' class by adding the 'addPlayerData' method to it. Daniel Grigencha 2024-12-02 00:42:07 +01:00
• c1280ba089 Updated 'LobbyState' class. Updated the 'LobbyState' class by adding 'initializeGame' method to it. Daniel Grigencha 2024-12-02 00:40:21 +01:00
• 02f285a258 Remove cheat button Felix Koppe 2024-12-02 00:39:58 +01:00
• bcb0ebc0f8 Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development Daniel Grigencha 2024-12-02 00:29:21 +01:00
• a19902f819 Updated 'LobbyState' class. Updated the 'LobbyState' class by changing the method call 'isActive' to 'isReady'. Daniel Grigencha 2024-12-02 00:28:59 +01:00
• 585687055c Merge remote-tracking branch 'origin/development' into development Fleischer Hanno 2024-12-02 00:28:41 +01:00
• a86319082c included the LobbyPlayerJoined MEssage parameter of isHost Fleischer Hanno 2024-12-02 00:28:04 +01:00
• 7acc55fe25 Updated 'MdgaServer' class. Updated the 'MdgaServer' class by saving the host into the 'Game' class. Daniel Grigencha 2024-12-02 00:28:01 +01:00
• 3e56de2a17 Updated 'LobbyState' class. Updated the 'LobbyState' class by changing the method call 'isActive' to 'isReady'. Daniel Grigencha 2024-12-02 00:23:03 +01:00
• 468cd97374 Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development Daniel Grigencha 2024-12-02 00:20:41 +01:00
• dee6bf9f9c Updated 'Game' class. Updated the 'Game' class by adding the 'host' attribute and its getter method to it. Daniel Grigencha 2024-12-02 00:19:46 +01:00
• ea6431faa4 Updated 'LobbyPlayerJoinedMessage' class. Updated the 'LobbyPlayerJoinedMessage' class by adding the 'host' attribute and its getter method to. Daniel Grigencha 2024-12-02 00:12:46 +01:00
• f272fd6f08 fixed bug again Cedric Beck 2024-12-02 00:10:58 +01:00
• bfc74ee126 fixed bug Cedric Beck 2024-12-02 00:04:48 +01:00
• d890d11978 Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development Cedric Beck 2024-12-01 23:58:57 +01:00
• 9af20346f1 Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development Daniel Grigencha 2024-12-01 23:58:44 +01:00
• f853b0b54f Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development Cedric Beck 2024-12-01 23:57:59 +01:00
• 9dd2d3f58b added finish text; edited Notifications Cedric Beck 2024-12-01 23:57:53 +01:00
• 06e43903e6 Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development Daniel Grigencha 2024-12-01 23:57:39 +01:00
• 00a04c2403 fixed a bug Fleischer Hanno 2024-12-01 23:57:39 +01:00
• 92cbd9202a Updated 'LobbyState' class. Updated the 'LobbyState' class by fixing the error by sending the 'ServerStartGameMessage' after all players are ready. Daniel Grigencha 2024-12-01 23:57:26 +01:00
• 9a06afe998 Merge commit Felix Koppe 2024-12-01 23:56:33 +01:00
• 289390c528 Add comment Felix Koppe 2024-12-01 23:56:24 +01:00
• 7712a23d00 added transition from Lobby to Game Fleischer Hanno 2024-12-01 23:50:37 +01:00
• 8137a727f5 Merge remote-tracking branch 'origin/development' into development Fleischer Hanno 2024-12-01 23:49:30 +01:00
• d904a28ee0 Remove mock Felix Koppe 2024-12-01 23:48:18 +01:00
• 2f2d9c7479 Merge remote-tracking branch 'origin/development' into development Fleischer Hanno 2024-12-01 23:42:56 +01:00
• c2b6e6e9e9 made all classes for ServerStartGameMEssage serializiable Fleischer Hanno 2024-12-01 23:42:32 +01:00
• 697b974ce1 Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development Daniel Grigencha 2024-12-01 23:42:09 +01:00
• f0cab64910 Minor change Felix Koppe 2024-12-01 23:46:46 +01:00
• adcf65d7aa Updated 'LobbyState' class. Updated the 'LobbyState' class by sending a broadcast message after all players are ready. In Addition, the 'ServerStartGameMessage' getting the 'Board' object. Daniel Grigencha 2024-12-01 23:41:10 +01:00
• 8f53b76a3e Updated 'ServerStartGameMessage' class. Updated the 'ServerStartGameMessage' class by adding the 'board' attribute and its getter method to it. Daniel Grigencha 2024-12-01 23:39:36 +01:00
• eaef4b20ba Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development Cedric Beck 2024-12-01 23:34:02 +01:00
• 7bf41bc358 Merge branch 'development' into 'dev/test' Benjamin Feyer 2024-12-01 22:33:42 +00:00
• d3fe2fec14 added show/hide functionality for select button Cedric Beck 2024-12-01 23:33:28 +01:00
• 02d7ef1dd8 Updated 'ChoosePieceState' class. Updated the 'ChoosePieceState' to work correctly as a state automaton. Daniel Grigencha 2024-12-01 23:28:50 +01:00
• 23aa2db714 Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development Daniel Grigencha 2024-12-01 23:27:50 +01:00
• e68369074f Updated 'RollDiceState' class. Updated the 'RollDiceState' class by removing a spelling mistake. Daniel Grigencha 2024-12-01 23:27:45 +01:00
• aafc804c3f Updated 'ChoosePieceState' class. Updated the 'ChoosePieceState' to work correctly as a state automaton. Daniel Grigencha 2024-12-01 23:26:53 +01:00
• 48923cddd6 Merge branch 'development' into 'dev/test' Benjamin Feyer 2024-12-01 22:11:24 +00:00
• a1934e30cb minor changes Benjamin Feyer 2024-12-01 23:08:56 +01:00
• a7e048d4b4 Merge remote-tracking branch 'origin/development' into development Fleischer Hanno 2024-12-01 23:08:50 +01:00
• bcd510804f Merge commit Felix Koppe 2024-12-01 23:12:46 +01:00
• 7319f7a62c Process startMenuNotification in lobby Felix Koppe 2024-12-01 23:12:36 +01:00
• a1e51fb2f4 added logic to the leave game method Fleischer Hanno 2024-12-01 23:08:25 +01:00
• f15d0eb5d8 Merge branch 'development' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development Daniel Grigencha 2024-12-01 23:06:31 +01:00
• bec199036c Minor change Felix Koppe 2024-12-01 23:10:25 +01:00
• f484a4abc8 Updated server states. Updated server stats by adding the logger to all states. In Addition, new joined clients should be updated correctly. Daniel Grigencha 2024-12-01 23:06:02 +01:00
• 5905a232a5 Adjust state Felix Koppe 2024-12-01 23:03:26 +01:00
• 12cb87ef70 added outline package back Cedric Beck 2024-12-01 22:56:09 +01:00
• 9cb7a156bb Merge branch 'development' into dev/client_beck Cedric Beck 2024-12-01 22:47:48 +01:00
• 76e2606847 reverted the client state machine Fleischer Hanno 2024-12-01 22:47:13 +01:00
• 7762b97303 added init & taktical view by ownColor Cedric Beck 2024-12-01 22:46:17 +01:00
• eaf46f3e14 updated the project to pass the checkstyle Daniel Grigencha 2024-12-01 22:37:49 +01:00
• 92be52b62a fixed server join logic Fleischer Hanno 2024-12-01 22:33:30 +01:00
• 7a0a3589a5 trying to fix server ip to use outward ip Fleischer Hanno 2024-12-01 22:14:09 +01:00
• 661c28f096 merge to dev/client_beck from development Cedric Beck 2024-12-01 22:06:30 +01:00
• 9718ad111f Merge branch 'development' into 'dev/test' Benjamin Feyer 2024-12-01 20:56:49 +00:00
• 4a94e85aac Merge branch 'dev/client' into dev/client_beck Cedric Beck 2024-12-01 21:55:37 +01:00
• 799bd096a0 Merge development dev/client Felix Koppe 2024-12-01 21:56:52 +01:00
• 6370ec15c2 added minor changes Benjamin Feyer 2024-12-01 21:53:38 +01:00
• 5a68d3b146 fixed a method call for getMoveIndices Fleischer Hanno 2024-12-01 21:52:28 +01:00
• 63fa692910 removed comments Cedric Beck 2024-12-01 21:52:28 +01:00
• 638cb93d7b Merge dev/client_beck Felix Koppe 2024-12-01 21:51:01 +01:00
• 133f900ec7 added the server and network functionality for mdga and fixed the communication in the Lobby Fleischer Hanno 2024-12-01 21:50:28 +01:00
• 33ddea4221 Merge remote-tracking branch 'origin/development' into development Fleischer Hanno 2024-12-01 21:49:30 +01:00
• 977a7294ad updated server state diagram and added missing classes Daniel Grigencha 2024-12-01 21:49:11 +01:00
• 7db75a2ca1 added converted assets Cedric Beck 2024-12-01 21:48:40 +01:00
• 71d5701cc7 added javadoc for the classes in the notification package Daniel Grigencha 2024-12-01 21:44:35 +01:00
• 1c826bcec0 added comments Benjamin Feyer 2024-12-01 21:12:19 +01:00
• 42feca466d Merge remote-tracking branch 'origin/development' into development Fleischer Hanno 2024-12-01 21:05:41 +01:00
• 95a1f8d858 removed all inheritance of the automaton for testing purposes Daniel Grigencha 2024-12-01 21:05:22 +01:00
• bd9d8c688d Merge branch 'development' into 'dev/test' Benjamin Feyer 2024-12-01 20:02:47 +00:00
• 76757c19a9 Merge remote-tracking branch 'origin/development' into development Fleischer Hanno 2024-12-01 21:02:11 +01:00
• c3fdcf4dc7 added the states of the server automaton for testing purposes Daniel Grigencha 2024-12-01 21:01:37 +01:00