0a62c538ca
Added 3D mark arrows and cleaned up other classes.
2017-09-14 11:28:50 +12:00
d5ce61a0ff
Merge branch 'NewUI_merge' into story1266_3d_model_factory
...
# Conflicts:
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
2017-09-12 17:09:47 +12:00
71f626f57e
fixed sail rotation broken from port to 3d #story[1266]
2017-09-12 16:30:20 +12:00
bd31bae586
Changed the lobby map view to the 2D race rather than the 3D one.
...
Stripped back game view class appropriately.
#story[1245]
2017-09-12 16:08:29 +12:00
da3613fe36
Split off marker classes.
2017-09-12 14:48:30 +12:00
5dd936f8f1
Added chat functionality & timer back into the game + bug fixes
...
- Added chat back into the game
- Fixed a bug where the timer would show "race finished" when the race hadn't started
- Fixed a bug where resources weren't being deallocated when the game was closed
Tags: #story[1246]
2017-09-12 01:31:38 +12:00
d223d393fa
Merge branch 'story1266_3d_model_factory' into NewUI_merge
2017-09-11 23:45:31 +12:00
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
878c0e0f43
Added ocean asset. Moved camera to center of race.
...
#story[1266]
2017-09-11 16:24:21 +12:00
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
1210f9342b
Removed rounding in GameView that caused objects to be rendered at incorrect positions.
...
#bug
2017-09-11 11:37:50 +12:00
06a4dde216
Ported game rendering to 3d environment for boats and markers.
...
#implement
2017-09-09 17:34:18 +12:00
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
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
Calum
Peter Galloway
William Muir
Michael Rausch