Merge branch 'javafx' into client-server
Changed the version number to 0.3-SNAPSHOT.
Integrated FindBugs and fixed current errors.
Fixed bug where certain FXML files would not be loaded.
Merge branch 'master' of https://github.com/Cardshifter/Cardshifter into develop
Fixed bug where only one player could connect to a game.
Fixed #35.
Renamed com.cardshifter.server to com.cardshifter.api in the cardshifter-fx module, updated imports of dependent classes, fixes #36.
Removed dependency on cardshifter-console for cardshifter-fx, replaced it by dependency on cardshifter-core, fixes #38.
Merge remote-tracking branch 'origin/develop' into javafx
Added a scroll box to the UI to support the full 10 card hand limit
Deck size is now properly set at the start
Fixed Eclipse issues with POM files
Merge branch 'javafx' of github.com:Cardshifter/Cardshifter into javafx
Added array of ids to ZoneMessage, fixes #41 to let #40 be implemented
Server sends message to clients when a player disconnects, fixes #32
Deprecated 'phases' in server-controlled game, it is no longer needed
Merge branch 'client-server' into javafx
merging client-server with javafx
deck size count labels should now always be correct