 Calum
|
ece45ff967
|
Fixed map, parrot and camera.
|
2017-09-28 16:17:19 +13:00 |
|
 William Muir
|
a5eea10c87
|
Merge branch 'develop' into story1273_minimap
# Conflicts:
# src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelFactory.java
# src/main/resources/meshes/boatSTLs/parrot_features.stl
|
2017-09-28 14:41:08 +13:00 |
|
|
Calum
|
7cfad28d6b
|
Fixed parrot
|
2017-09-28 14:28:07 +13:00 |
|
|
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 |
|
|
Calum
|
3f666fa092
|
Made waka larger.
|
2017-09-28 12:44:24 +13:00 |
|
|
Calum
|
71f6b9accb
|
Fixed duplicate waka files.
#fix
|
2017-09-28 06:59:44 +13:00 |
|
|
Calum
|
caf04e1e99
|
Added a waka model.
#implement #story[1274]
|
2017-09-28 06:54:20 +13:00 |
|
|
Calum
|
0b8e2499a7
|
Fixed some internal stl faces on parrot
#fix
|
2017-09-28 03:35:28 +13:00 |
|
|
Calum
|
a266779709
|
Added new Wind Waker mesh
#implement #story[1293]
|
2017-09-28 00:24:34 +13:00 |
|
|
Calum
|
2a523a5664
|
Added a duck boat mesh.
#implement #story[1274]
|
2017-09-27 17:03:02 +13:00 |
|
 Peter Galloway
|
7197bc2bee
|
created meshes for pirate ship #story[1274]
|
2017-09-20 17:33:32 +12:00 |
|
|
Calum
|
c5d56065b6
|
Fixed cat ate a meringue sail rotation.
#fix #story[1274]
|
2017-09-20 16:42:26 +12:00 |
|
|
Calum
|
9d61a43bd7
|
Added catamaran mesh to possible boat meshes. Made catamaran the default boat.
#implement #story[1274]
|
2017-09-20 15:58:22 +12:00 |
|