hba56
|
fb8f1640ac
|
Merge remote-tracking branch 'remotes/origin/master' into raceView_UI
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
# racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
|
8 years ago |
|
hba56
|
58cde8ce44
|
Merge remote-tracking branch 'remotes/origin/master' into raceView_UI
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
# racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
|
8 years ago |
|
hba56
|
7b5460abc5
|
info full screen map shows on top of hud
#story[1306]
|
8 years ago |
|
hba56
|
2ac3bad6e1
|
info table shows on top of hud
#story[1306]
|
8 years ago |
|
hba56
|
4e8f1a2b19
|
Placed the waypoint arrow in the HUD
#story[1306]
|
8 years ago |
David Wu
|
1a672e8ac8
|
Merge branch 'master' into story1292_hp_punish
|
8 years ago |
|
hba56
|
2f6fa73349
|
Merge remote-tracking branch 'remotes/origin/master' into raceView_UI
|
8 years ago |
|
hba56
|
173b4444da
|
Placed the wind arrow in the HUD
#story[1306]
|
8 years ago |
|
David Wu
|
3adc5330b4
|
Merge branch 'master' into story1292_hp_punish
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
# racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
# racevisionGame/src/main/resources/visualiser/scenes/raceView.fxml
|
8 years ago |
|
zwu18
|
416eb1e6bf
|
On death a menu will pop up telling the user he is dead. #story[1292]
|
8 years ago |
Joseph
|
d86d043992
|
Merge branch 'master' into story1299_next_mark_direction
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
# racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
|
8 years ago |
|
zwu18
|
1d95004811
|
Merge branch 'master' into story_speedometer
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
# racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
|
8 years ago |
|
David Wu
|
45eb557256
|
Displaying visual effect with imageview. #story[1292]
|
8 years ago |
|
hba56
|
ff59f7ff9c
|
Added a new hud for the race view
#story[1301]
|
8 years ago |
|
hba56
|
bb24e13387
|
Merge remote-tracking branch 'remotes/origin/master' into raceView_UI
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
# racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
|
8 years ago |
|
hba56
|
7418f7b4e6
|
adding new assets for race view hud
#story[1301]
|
8 years ago |
Connor Taylor-Brown
|
16da9e009b
|
Cherry-picked FXML changes from Development
#story[1291]
|
8 years ago |
|
Connor Taylor-Brown
|
985f784066
|
Removed broken stuff from FXML after merge
|
8 years ago |
|
Connor Taylor-Brown
|
dc9445a8a6
|
Merge branch 'master' into story1291-hp
# Conflicts:
# racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
|
8 years ago |
|
Joseph
|
4cf9b67db8
|
Merge remote-tracking branch 'origin/master' into story1299_next_mark_direction
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
|
8 years ago |
|
Joseph
|
91c442e465
|
Set up architecture for next mark arrow and did a 2d template when the camera is zoomed out. #story[1299]
|
8 years ago |
|
hba56
|
4242d05279
|
fixed issue with being unable to click through minimap
#story[1295]
|
8 years ago |
|
hba56
|
afc42cf2ab
|
lowered opacity
|
8 years ago |
|
hba56
|
50125e0151
|
moved minimap to left so does not overlap with speedo
|
8 years ago |
|
Connor Taylor-Brown
|
b0bc7f50f2
|
Updated FXMLs to add depleting tomato
- Tab view now contains health column
- BoatStateCommand now fails silently if command is received before race state is set up
#story[1291]
|
8 years ago |
|
hba56
|
f7d866144a
|
Map now only shows annotations when in full screen
#story[1295]
|
8 years ago |
|
zwu18
|
be9feff6fd
|
Layout changes to speedometer UI. #story[1311]
|
8 years ago |
|
zwu18
|
eea394372f
|
Race is now showing a speedometer in the bottom right corner. Next step is to update with speed of boat and improve appearance. #story[1311]
|
8 years ago |
|
hba56
|
731be68831
|
test for a minimap
|
8 years ago |
|
hba56
|
e0d886ffb2
|
overlay off by default
#story[1195]
|
8 years ago |
|
hba56
|
88f1a393f2
|
Made the info tab into an overlay
#story[1195]
|
8 years ago |
|
hba56
|
083eb5a4bc
|
updated race view that does not use a split pane
|
8 years ago |
|
hba56
|
87f3265640
|
pushed branch
#story[1195]
|
8 years ago |
