Joseph Gardner
|
08c097f153
|
Merge remote-tracking branch 'origin/issue61_manual_connection_fix' into story1299_next_mark_direction
|
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 |
|
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 |
|
Joseph Gardner
|
26e2035ea2
|
Changed 3d arrow to point downwards #story[1299]
|
8 years ago |
|
Joseph
|
569204b771
|
New skin for 2d next mark arrow. #story[1299]
|
8 years ago |
|
Joseph
|
699df2e775
|
Using new arrow / arrow textures. Made sails not clickable.
|
8 years ago |
|
Joseph
|
affbb69029
|
Merge remote-tracking branch 'origin/story1299_next_mark_direction' into story1299_next_mark_direction
|
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
|
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 |
Fan-Wu Yang
|
967bdb394f
|
Merged in master and realigned center of the boat #story[1306]
|
8 years ago |
|
Fan-Wu Yang
|
cd99492467
|
Merge branch 'master' into story1306_wind_arrow
# Conflicts:
# racevisionGame/src/main/java/visualiser/layout/Assets3D.java
|
8 years ago |
|
Joseph
|
3f04485b78
|
Added manual connections works while also receiving available games from the server. #story[1352]
|
8 years ago |
|
Joseph
|
5ebee27baa
|
Merge remote-tracking branch 'origin/master' into issue61_manual_connection_fix
|
8 years ago |
|
Fan-Wu Yang
|
980d1d7977
|
Merge remote-tracking branch 'origin/issue58_sails_collision_fix' into story1297_sails
|
8 years ago |
|
Fan-Wu Yang
|
a14307a6bf
|
Merge branch 'master' into story1297_sails
|
8 years ago |
fjc40
|
76dff8009c
|
Removed countdown timer from lobby screen.
|
8 years ago |
|
fjc40
|
9763150e85
|
Merge remote-tracking branch 'origin/master' into game_start_button_1352
|
8 years ago |
|
Fan-Wu Yang
|
9da0d238c2
|
Removed printlns ready for DoD
|
8 years ago |
|
Joseph Gardner
|
44268cc30b
|
Fixed not being able to add custom connections. Still need to test if it works with the http match browser (can't test it atm. #story[1352]
|
8 years ago |
|
Fan-Wu Yang
|
6cfb076fef
|
Merge branch 'master' into story1297_sails
|
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 |
|
Joseph Gardner
|
7d789c04bb
|
Fixed sails out / colliding issue. #story[1297]
|
8 years ago |
|
Joseph Gardner
|
332722e099
|
Attempt to fix sails in / out colliding issue. Going to test on dev for a better visual representation. #story[1297]
|
8 years ago |
|
Joseph Gardner
|
f9f5cfef7d
|
Chanegd next mark arrow to fit with new UI. #story[1299]
|
8 years ago |
Jessica Syder
|
915d61b9f3
|
Map can be zoomed out in birds eye view only to a specified distance.
#story[1312]
|
8 years ago |
|
Jessica Syder
|
ab49d62c0d
|
Map can be zoomed in / out at all times.
- map can be zoomed when object is not selected
#story[1312]
|
8 years ago |
|
Joseph Gardner
|
327c052b1d
|
Merge remote-tracking branch 'origin/master' into story1299_next_mark_direction
|
8 years ago |
|
fjc40
|
20702f352b
|
Lobby start button is hidden/disabled by default, to avoid it being visible to non-host clients for a split seconds while loading screen.
|
8 years ago |
|
Jessica Syder
|
e64e6ddbdb
|
Boat scaling is correct.
- scaling changes as a user zooms in or out to
- 3rd person view defaults to life size scale
#story[1312]
|
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 |
|
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 |
|
fjc40
|
46192af628
|
Race now has a 10 minute delay before starting (which is increased whenever it falls below 5 minutes).
The start button (visible to host) starts the race in whatever the prepatory time is.
#story[1352]
|
8 years ago |
|
fjc40
|
da901d6e0c
|
Merge remote-tracking branch 'origin/master' into game_start_button_1352
|
8 years ago |
|
fjc40
|
612b4b455e
|
Added start button for host on the ingameLobby screen.
#story[1352]
|
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 |
|
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 |
|
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
|
86fc911f98
|
Minor changes to improve look of third person view.
#story[1312]
|
8 years ago |
