Merge branch 'develop' into story61_player_perspective

Browse Source

# Conflicts:
#	src/main/java/seng302/fxObjects/BoatAnnotations.java
#	src/main/java/seng302/gameServer/GameState.java
#	src/main/java/seng302/gameServer/ServerToClientThread.java
#	src/main/java/seng302/model/Yacht.java
#	src/main/java/seng302/visualiser/controllers/LobbyController.java

...

This commit is contained in:

Calum

2017-07-26 02:56:46 +12:00

parent 08e369f1ae c77a48f589

commit 9c9f6e4e80

16 changed files with 133 additions and 73 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

src/main/resources/ParrotGif/alistair.gif → src/main/resources/pics/alistair.gif

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 50 KiB After Width:  |  Height:  |  Size: 50 KiB

src/main/resources/ParrotGif/calum.gif → src/main/resources/pics/calum.gif

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 44 KiB After Width:  |  Height:  |  Size: 44 KiB

src/main/resources/ParrotGif/haoming.gif → src/main/resources/pics/haoming.gif

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 52 KiB After Width:  |  Height:  |  Size: 52 KiB

src/main/resources/ParrotGif/kusal.gif → src/main/resources/pics/kusal.gif

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 46 KiB After Width:  |  Height:  |  Size: 46 KiB

src/main/resources/ParrotGif/michael.gif → src/main/resources/pics/michael.gif

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 51 KiB After Width:  |  Height:  |  Size: 51 KiB

src/main/resources/ParrotGif/parrot.gif → src/main/resources/pics/parrot.gif

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 15 KiB After Width:  |  Height:  |  Size: 15 KiB

src/main/resources/ParrotGif/peter.gif → src/main/resources/pics/peter.gif

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 54 KiB After Width:  |  Height:  |  Size: 54 KiB

src/main/resources/ParrotGif/ryan.gif → src/main/resources/pics/ryan.gif

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 49 KiB After Width:  |  Height:  |  Size: 49 KiB

src/main/resources/pics/sail.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 8.9 KiB

src/main/resources/ParrotGif/will.gif → src/main/resources/pics/will.gif

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 59 KiB After Width:  |  Height:  |  Size: 59 KiB