William Muir 076c4c9a40 Merge branch 'develop' into story1273_minimap ...

# Conflicts:
#	src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelFactory.java
#	src/main/resources/views/RaceView.fxml

2017-09-28 12:54:12 +13:00

..

boatSTLs

Merge branch 'develop' into story1273_minimap

2017-09-28 12:54:12 +13:00

arrow.dae

Added 3D mark arrows and cleaned up other classes.

2017-09-14 11:28:50 +12:00

barrier_pole.dae

Added 3D mark arrows and cleaned up other classes.

2017-09-14 11:28:50 +12:00

barrier_segment.dae

Added assets for the border and for gates. Drew them in correct locations.

2017-09-11 02:50:31 +12:00

bumper_pickup.dae

created new models for all pickups #story[1293]

2017-09-27 20:40:40 +13:00

finish_arrow.dae

Added 3D mark arrows and cleaned up other classes.

2017-09-14 11:28:50 +12:00

finish_line.dae

Removed rounding in GameView that caused objects to be rendered at incorrect positions.

2017-09-11 11:37:50 +12:00

finish_marker.dae

Added 3D mark arrows and cleaned up other classes.

2017-09-14 11:28:50 +12:00

gate_line.dae

Removed rounding in GameView that caused objects to be rendered at incorrect positions.

2017-09-11 11:37:50 +12:00

indicator_arrow.dae

- Fixed Merge Errors and some broken lighting

2017-09-28 02:05:47 +13:00

land_smooth.dae

Various bug fixes

2017-09-28 01:58:49 +13:00

land.dae

Changed water color to blue

2017-09-25 19:25:03 +13:00

mark_area.dae

Made continous turning the default. Added triangles to minimap. Made mark areas bigger

2017-09-28 10:12:18 +13:00

mark_pointer.stl

Changed arrow colour.

2017-09-28 12:02:09 +13:00

plain_marker.dae

Added 3D mark arrows and cleaned up other classes.

2017-09-14 11:28:50 +12:00

player_circle.stl

Changed arrow colour.

2017-09-28 12:02:09 +13:00

player_identifier.dae

Added assets to identify the player. Needs to merge with 3d player specification for code side to be implemented.

2017-09-11 22:02:21 +12:00

random_pickup.dae

Added new Wind Waker mesh

2017-09-27 23:35:51 +13:00

start_arrow.dae

Added 3D mark arrows and cleaned up other classes.

2017-09-14 11:28:50 +12:00

start_line.dae

Removed rounding in GameView that caused objects to be rendered at incorrect positions.

2017-09-11 11:37:50 +12:00

start_marker.dae

Added 3D mark arrows and cleaned up other classes.

2017-09-14 11:28:50 +12:00

torus.dae

- Added circle to boat to indicate which boat is the players and to show where the arrow is pointing.

2017-09-27 21:31:02 +13:00

trail_segment.dae

Fixed boat trials rendering abnormally

2017-09-26 01:07:02 +13:00

turning_pickup.dae

created new models for all pickups #story[1293]

2017-09-27 20:40:40 +13:00

velocity_pickup.dae

created new models for all pickups #story[1293]

2017-09-27 20:40:40 +13:00

wake.dae

Added 3D mark arrows and cleaned up other classes.

2017-09-14 11:28:50 +12:00

wind_walker_pickup.dae

Added new Wind Waker mesh

2017-09-27 23:35:51 +13:00