Merge branch 'develop' into wind_arrow

Browse Source

# Conflicts:
#	src/main/java/seng302/visualiser/controllers/RaceViewController.java
#	src/main/resources/views/RaceView.fxml

...

This commit is contained in:

Zhi You Tan

2017-09-28 16:36:34 +13:00

parent d436d2a6e4 27379ae96d

commit 6fafb02a8f

63 changed files with 659 additions and 1583 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/meshes/boatSTLs/parrot_sail.stl

BIN

Binary file not shown.

src/main/resources/meshes/mark_area.dae

+10 -10

File diff suppressed because one or more lines are too long

src/main/resources/meshes/mark_pointer.stl

BIN

Binary file not shown.

src/main/resources/meshes/player_circle.stl

BIN

Binary file not shown.

src/main/resources/meshes/wind_walker_pickup.dae

+9 -9

File diff suppressed because one or more lines are too long