45ba3ae6ac
Added 3D wind arrow and it also rotates #story[1306]
8 years ago
d280c0bdae
Merged master and added a few comments
8 years ago
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
f1c1fc7063
Race length is affected by slider value.
...
- modified constructor of a race event to take in a scale value
- race is scaled according to minutes selected on the slider
- applied minimal css styling
- playing around with more styling options
- bug exists with 1 minute races, to be fixed
#story[1323]
8 years ago
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
da901d6e0c
Merge remote-tracking branch 'origin/master' into game_start_button_1352
8 years ago
612b4b455e
Added start button for host on the ingameLobby screen.
...
#story[1352]
8 years ago
819cdc49ab
Created a slider on the Host Game screen.
...
- slider has min and max minutes
- a label is updated as the slider is moved
- the value of the slider selection is saved
- slider resizes appropriately with the window
#story[1323]
8 years ago
bf6282c697
3D arrow added for zoomed view. Shows relative direction to mark. #story[1299]
8 years ago
088e73414b
Fixed small bug where the sail never stopps jittering after moving #story[1297]
8 years ago
2b8ca9265f
Sails now slowly spin to the correct position #story[1297]
8 years ago
67779eb9ad
Same changes to dev. #story[1311]
8 years ago
64ae01113a
Added delay for position update. This fixes fps issue. #story[1311]
8 years ago
d3a6b82031
Commit before checking out developement
8 years ago
908f31bcde
Merge branches 'master' and 'zoomzoom' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into zoomzoom
8 years ago
0b02727bf1
Set limits and more appearance changes for speedometer. #story[1311]
8 years ago
49c08f5687
Merge branch 'story1298_boat_highlight' into 'master'
...
Story1298 - Boat highlighting
ACs:
- Current players boat is highlighted
See merge request !56
8 years ago
86fc911f98
Minor changes to improve look of third person view.
...
#story[1312]
8 years ago
62535720d4
Removed commented out code.
...
#story[1312]
8 years ago
fa6543a713
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into zoomzoom
8 years ago
1ecd2dd7b6
Zooming motion is more natural.
...
- added limits for zoom in, zoom out and when to change to birds eye
- zooming smoothed by adjusting pitch each zoom
- when zoom out limit is reached, view returns to original
#story[1312]
8 years ago
e2ea6a5f03
Fixed issue with speedometer and sails interaction. #story[1311]
8 years ago
4cf9b67db8
Merge remote-tracking branch 'origin/master' into story1299_next_mark_direction
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
8 years ago
322d7b38b6
Merge remote-tracking branch 'origin/master' into story1298_boat_highlight
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
8 years ago
b1657e8bfc
Merge branch 'minimap_test' into 'master'
...
Minimap
AC's:
-Minimap of current map with player boats is shown
-Boats and marks are shown on the minimap
-Minimap can be minimized and maximised
-Some annotations displayed on maximised minimap
See merge request !55
8 years ago
91c442e465
Set up architecture for next mark arrow and did a 2d template when the camera is zoomed out. #story[1299]
8 years ago
4242d05279
fixed issue with being unable to click through minimap
...
#story[1295]
8 years ago
2cf0cca157
Can no longer click around the boat highlighting. #fix #story[1298]
8 years ago
eee0b414f8
made trackpoints cap at 50. This fixes fps issues with the minimap. #fix #story[1295]
8 years ago
cf9acabd97
Boat sails now luff and stay when in the direction of the wind #story[1297]
8 years ago
c9177da85c
Deleted another dead line #story[1297]
8 years ago
ed11f7d56c
forgot to removed a dead line #story[1297]
8 years ago
2389aa361c
Boats sails can luff and are now two piece. #story[1297]
8 years ago
add1d3996d
Set map colour back to a lighter colour as it didnt work as well on lower grade monitors
...
#story[1195]
8 years ago
dacaf58271
Merge remote-tracking branch 'remotes/origin/master' into minimap_test
8 years ago
951c3771fa
Merge branch 'newHostServer' into 'master'
...
Nullptr finish race arrow + race xml issues + Host Discovery + Scaling Race
Acceptance Criteria:
When a game starts I should see it reflected in the host lobby within 5 seconds.
When a game ends it should not remain in the host lobby for more than 5 seconds.
Changing the windspeed and the milliseconds value on Event.java line 124 should make the race larger or smaller.
This should fix the race xml issues where the player didn't have a boat / last player joining not seeing their boat. Somehow the client was receiving xml files out of order, and it didn't check the order, so it would use race xml file 1, then replace it with race xml file 0, which was out of date.
See merge request !54
8 years ago
b787b5a71b
changed map to dodgerblue
8 years ago
afc42cf2ab
lowered opacity
8 years ago
1ffef51d7c
Changed local ip detection to use regex
8 years ago
50125e0151
moved minimap to left so does not overlap with speedo
8 years ago
ffa1d8b0c4
Deleted Print Statement
8 years ago
52271d580f
CHanged ip to local ip because port forwarding may be subjective to change.
8 years ago
3d292f784b
Users can now resee the lobby after exit and reentering, and fixed concurrent alteration issue which was stopping players from exiting the lobby.
8 years ago
fec421da00
Removed println messages
8 years ago
30087ed9bd
Merge branch 'master' into newHostServer
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
8 years ago
3c9e520d9f
Merged in null pointer issue.
8 years ago
bb0c1d1780
Merge branch 'nullptr_finish_race_arrow' into newHostServer
8 years ago
b0857debeb
Merge remote-tracking branch 'origin/nullptr_finish_race_arrow' into newHostServer
8 years ago
b550afcca7
Merged race scaling with Http Match Discovery.
8 years ago
ac5423263c
Merge remote-tracking branch 'origin/scale_maps_spike' into newHostServer
8 years ago
Fan-Wu Yang
Jessica Syder
fjc40
Joseph
zwu18
Connor Taylor Brown
hba56