Benjamin Feyer 25fff99ff0 Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2 ...

# Conflicts:
#	Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java
#	Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/ChoosePieceAutomatonState.java
#	Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/SelectPieceState.java

2024-12-09 04:50:01 +01:00

..

.run

Remove moveOccupant

2024-12-08 17:12:35 +01:00

buildSrc

added contents

2024-09-18 17:04:31 +02:00

common

added init for mdga with all states and messages

2024-11-12 17:26:10 +01:00

gradle/wrapper

added init for mdga with all states and messages

2024-11-12 17:26:10 +01:00

jme-common

added contents

2024-09-18 17:04:31 +02:00

mdga

Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2

2024-12-09 04:50:01 +01:00

gradlew

added contents

2024-09-18 17:04:31 +02:00

gradlew.bat

added contents

2024-09-18 17:04:31 +02:00

settings.gradle

merge from dev/client

2024-11-17 10:57:05 +01:00