mirror of
https://github.com/2OOP/pism.git
synced 2026-02-04 10:54:51 +00:00
e2132b549d
# Conflicts: # app/src/main/java/org/toop/Main.java # app/src/main/java/org/toop/app/App.java # app/src/main/java/org/toop/app/Server.java # app/src/main/java/org/toop/app/canvas/BitGameCanvas.java # app/src/main/java/org/toop/app/canvas/GameCanvas.java # app/src/main/java/org/toop/app/canvas/ReversiBitCanvas.java # app/src/main/java/org/toop/app/canvas/TicTacToeBitCanvas.java # app/src/main/java/org/toop/app/gameControllers/GenericGameController.java # app/src/main/java/org/toop/app/gameControllers/ReversiBitController.java # app/src/main/java/org/toop/app/gameControllers/TicTacToeBitController.java # app/src/main/java/org/toop/app/widget/Primitive.java # app/src/main/java/org/toop/app/widget/complex/ConfirmWidget.java # app/src/main/java/org/toop/app/widget/complex/PlayerInfoWidget.java # app/src/main/java/org/toop/app/widget/complex/ViewWidget.java # app/src/main/java/org/toop/app/widget/popup/ChallengePopup.java # app/src/main/java/org/toop/app/widget/popup/EscapePopup.java # app/src/main/java/org/toop/app/widget/popup/SendChallengePopup.java # app/src/main/java/org/toop/app/widget/tutorial/BaseTutorialWidget.java # app/src/main/java/org/toop/app/widget/tutorial/ShowEnableTutorialWidget.java # app/src/main/java/org/toop/app/widget/view/GameView.java # app/src/main/java/org/toop/app/widget/view/LocalMultiplayerView.java # app/src/main/java/org/toop/app/widget/view/LocalView.java # app/src/main/java/org/toop/app/widget/view/MainView.java # app/src/main/java/org/toop/app/widget/view/OnlineView.java # app/src/main/java/org/toop/app/widget/view/ServerView.java # framework/pom.xml # framework/src/main/java/org/toop/framework/gameFramework/GameState.java # framework/src/main/java/org/toop/framework/gameFramework/controller/GameController.java # framework/src/main/java/org/toop/framework/gameFramework/model/game/TurnBasedGame.java # framework/src/main/java/org/toop/framework/gameFramework/model/game/threadBehaviour/AbstractThreadBehaviour.java # framework/src/main/java/org/toop/framework/gameFramework/model/game/threadBehaviour/ThreadBehaviour.java # framework/src/main/java/org/toop/framework/gameFramework/model/player/AI.java # framework/src/main/java/org/toop/framework/gameFramework/model/player/AbstractAI.java # framework/src/main/java/org/toop/framework/gameFramework/model/player/AbstractPlayer.java # framework/src/main/java/org/toop/framework/gameFramework/model/player/Player.java # framework/src/main/java/org/toop/framework/networking/NetworkingClient.java # framework/src/main/java/org/toop/framework/networking/NetworkingClientManager.java # framework/src/main/java/org/toop/framework/networking/NetworkingGameClientHandler.java # framework/src/main/java/org/toop/framework/networking/NetworkingInitializationException.java # framework/src/main/java/org/toop/framework/networking/clients/TournamentNetworkingClient.java # framework/src/main/java/org/toop/framework/networking/connection/clients/TournamentNetworkingClient.java # framework/src/main/java/org/toop/framework/networking/connection/exceptions/NetworkingInitializationException.java # framework/src/main/java/org/toop/framework/networking/connection/handlers/NetworkingGameClientHandler.java # framework/src/main/java/org/toop/framework/networking/events/NetworkEvents.java # framework/src/main/java/org/toop/framework/networking/exceptions/NetworkingInitializationException.java # framework/src/main/java/org/toop/framework/networking/handlers/NetworkingGameClientHandler.java # framework/src/test/java/org/toop/framework/networking/NetworkingClientManagerTest.java # framework/src/test/java/org/toop/framework/networking/events/NetworkEventsTest.java