hba56
|
05d9eeae01
|
Merge remote-tracking branch 'remotes/origin/master' into ac35_map_boundary
|
8 years ago |
|
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 |
fjc40
|
5d9b574378
|
Zooming in while in birds eye no longer clips through sea surface.
Zooming with mouse wheel is the same speed as zooming with keyboard.
|
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 |
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 |
Joseph Gardner
|
6e913d6c45
|
Merge remote-tracking branch 'origin/third-person-default' into story1299_next_mark_direction
|
8 years ago |
Connor Taylor-Brown
|
73bffb35e3
|
Removed stutter
|
8 years ago |
|
hba56
|
173b4444da
|
Placed the wind arrow in the HUD
#story[1306]
|
8 years ago |
|
hba56
|
fc267a6a49
|
Merge remote-tracking branch 'remotes/origin/master' into raceView_UI
# Conflicts:
# racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
|
8 years ago |
|
Connor Taylor-Brown
|
d6b0fec6d3
|
Start race in third person by default
- Third person zoom limit has been lowered
- Next mark highlighting and arrow only follows player boat
|
8 years ago |
|
David Wu
|
48e7b6970c
|
Merged master in. Added documentation. #story[1292]
|
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
|
699df2e775
|
Using new arrow / arrow textures. Made sails not clickable.
|
8 years ago |
|
zwu18
|
1b8fa59f0e
|
Having 0 hp now removes the boat from being an active boat. #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
|
ba82328c42
|
Removed souts for speedometer. #story[1311]
|
8 years ago |
|
zwu18
|
f4001e0ae3
|
Added visual display when boat dies. Added sound when boat dies. #story[1311]
|
8 years ago |
|
zwu18
|
11d6d3a880
|
Documentation added. Master merged. #story[1311]
|
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 |
|
zwu18
|
e53d7d894b
|
Warning sound added. Sound synced with visual display. #story[1292]
|
8 years ago |
Fan-Wu Yang
|
a1b6de5638
|
Merge branch 'master' into story1306_wind_arrow
|
8 years ago |
|
Fan-Wu Yang
|
eca921cb11
|
Removed println's ready for DoD
|
8 years ago |
|
Fan-Wu Yang
|
6d55168c61
|
Added Textures to boats as well as added texture to arrow #story[1306]
|
8 years ago |
|
Fan-Wu Yang
|
45ba3ae6ac
|
Added 3D wind arrow and it also rotates #story[1306]
|
8 years ago |
|
David Wu
|
3a966fa6b8
|
Reworked visual displays for low hp boats. There is now a warning indication under boats that drop below 20hp. TODO: Create sfx and different display when boat is in critical hp/dead. #story[1292]
|
8 years ago |
|
Fan-Wu Yang
|
d280c0bdae
|
Merged master and added a few comments
|
8 years ago |
|
Fan-Wu Yang
|
12b7d10f24
|
Merge branch 'master' into story1297_sails
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
|
8 years ago |
|
David Wu
|
45b2f0b6db
|
Created more fire instances. #story[1292]
|
8 years ago |
|
David Wu
|
1070842ada
|
Fire is now rotated and standing up-write. Found problem with fire not being directly on the boat. #story[1292]
|
8 years ago |
|
David Wu
|
4f838a3598
|
Fire follows boat. TODO: rotate fire. #story[1292]
|
8 years ago |
|
David Wu
|
c527ad0c52
|
Forgot to add image file. #story[1292]
|
8 years ago |
|
David Wu
|
45eb557256
|
Displaying visual effect with imageview. #story[1292]
|
8 years ago |
|
Joseph
|
bf6282c697
|
3D arrow added for zoomed view. Shows relative direction to mark. #story[1299]
|
8 years ago |
|
Fan-Wu Yang
|
088e73414b
|
Fixed small bug where the sail never stopps jittering after moving #story[1297]
|
8 years ago |
|
Fan-Wu Yang
|
2b8ca9265f
|
Sails now slowly spin to the correct position #story[1297]
|
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
|
c43633f197
|
Merge branch 'master' into raceView_UI
|
8 years ago |
|
zwu18
|
67779eb9ad
|
Same changes to dev. #story[1311]
|
8 years ago |
|
zwu18
|
64ae01113a
|
Added delay for position update. This fixes fps issue. #story[1311]
|
8 years ago |
|
Fan-Wu Yang
|
d3a6b82031
|
Commit before checking out developement
|
8 years ago |
|
zwu18
|
1946bfd658
|
Added audio indication when the user boat is low on hp. Audio rate changes when hp is critically low. #story[1292]
|
8 years ago |
Jessica Syder
|
908f31bcde
|
Merge branches 'master' and 'zoomzoom' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into zoomzoom
|
8 years ago |
|
zwu18
|
0b02727bf1
|
Set limits and more appearance changes for speedometer. #story[1311]
|
8 years ago |
|
Connor Taylor Brown
|
49c08f5687
|
Merge branch 'story1298_boat_highlight' into 'master'
Story1298 - Boat highlighting
ACs:
- Current players boat is highlighted
See merge request !56
|
8 years ago |
|
Jessica Syder
|
62535720d4
|
Removed commented out code.
#story[1312]
|
8 years ago |
