mirror of
https://github.com/2OOP/pism.git
synced 2026-02-04 02:44:50 +00:00
40e1c3b124
# Conflicts: # app/src/main/java/org/toop/Main.java # app/src/main/java/org/toop/app/Server.java # app/src/main/java/org/toop/app/canvas/ReversiBitCanvas.java # app/src/main/java/org/toop/app/gameControllers/ReversiBitController.java # app/src/main/java/org/toop/app/widget/view/LocalMultiplayerView.java # app/src/main/java/org/toop/app/widget/view/ServerView.java # framework/src/main/java/org/toop/framework/game/BitboardGame.java # framework/src/main/java/org/toop/framework/game/gameThreads/OnlineThreadBehaviour.java # framework/src/main/java/org/toop/framework/game/gameThreads/ServerThreadBehaviour.java # framework/src/main/java/org/toop/framework/game/games/reversi/BitboardReversi.java # framework/src/main/java/org/toop/framework/game/players/ArtificialPlayer.java # framework/src/main/java/org/toop/framework/game/players/ServerPlayer.java # framework/src/main/java/org/toop/framework/gameFramework/model/game/TurnBasedGame.java # framework/src/main/java/org/toop/framework/networking/server/GameServer.java # framework/src/main/java/org/toop/framework/networking/server/OnlineTurnBasedGame.java # framework/src/main/java/org/toop/framework/networking/server/Server.java # framework/src/main/java/org/toop/framework/networking/server/client/NettyClient.java # framework/src/main/java/org/toop/framework/networking/server/handlers/MessageHandler.java # game/src/main/java/org/toop/game/players/ai/MCTSAI.java
PISM, pis with maven.
