 Michael Rausch
|
d223d393fa
|
Merge branch 'story1266_3d_model_factory' into NewUI_merge
|
2017-09-11 23:45:31 +12:00 |
|
 cir27
|
0197de6fe3
|
Drawing player icon assets but line segment was not added to repo some app crashes.
#implement #story[1266]
|
2017-09-11 22:19:08 +12:00 |
|
|
Calum
|
878c0e0f43
|
Added ocean asset. Moved camera to center of race.
#story[1266]
|
2017-09-11 16:24:21 +12:00 |
|
|
Michael Rausch
|
76a1a3c7a0
|
Merge remote-tracking branch 'origin/story1266_3d_model_factory' into NewUI_merge
# Conflicts:
# pom.xml
# src/main/java/seng302/App.java
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/MainServerThread.java
# src/main/java/seng302/gameServer/ServerToClientThread.java
# src/main/java/seng302/utilities/XMLGenerator.java
# src/main/java/seng302/visualiser/GameClient.java
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
# src/main/resources/views/RaceView.fxml
# src/main/resources/views/StartScreenView.fxml
|
2017-09-11 15:29:33 +12:00 |
|
|
Calum
|
1210f9342b
|
Removed rounding in GameView that caused objects to be rendered at incorrect positions.
#bug
|
2017-09-11 11:37:50 +12:00 |
|
|
Calum
|
06a4dde216
|
Ported game rendering to 3d environment for boats and markers.
#implement
|
2017-09-09 17:34:18 +12:00 |
|
|
cir27
|
c2c3c9eb53
|
Experimented with parallel camera in 3d gameview. Works ok for rendering boats in isometric view.
#test
|
2017-09-08 14:05:52 +12:00 |
|
|
cir27
|
0bf6dd9e6b
|
Added 3D window to GameView3D to begin adding assets to. Used it to refine all 3D assets implemented by ModelFactory and manually test that they work.
#implement #test
|
2017-09-08 01:50:56 +12:00 |
|