fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,489 Commits 1 Branch 0 Tags
7b5460abc5e55220e80c265cd41b33ff852dddea
Commit Graph
500 Commits
Author SHA1 Message Date
hba56 7b5460abc5 info full screen map shows on top of hud 
#story[1306]
 2017-09-27 14:17:22 +13:00
hba56 2ac3bad6e1 info table shows on top of hud 
#story[1306]
 2017-09-27 13:54:02 +13:00
hba56 4e8f1a2b19 Placed the waypoint arrow in the HUD 
#story[1306]
 2017-09-27 13:39:27 +13:00
hba56 2f6fa73349 Merge remote-tracking branch 'remotes/origin/master' into raceView_UI 2017-09-27 13:21:41 +13:00
Joseph Gardner 7ac181f33d Fixed null pointer when race finishes #story[1299] 2017-09-27 13:08:29 +13:00
Joseph Gardner 13f3f595d2 Merge remote-tracking branch 'origin/master' into story1299_next_mark_direction 2017-09-27 12:52:50 +13:00
Joseph Gardner 08c097f153 Merge remote-tracking branch 'origin/issue61_manual_connection_fix' into story1299_next_mark_direction 2017-09-27 12:38:40 +13:00
Joseph Gardner 6e913d6c45 Merge remote-tracking branch 'origin/third-person-default' into story1299_next_mark_direction 2017-09-27 12:38:29 +13:00
Connor Taylor-Brown 73bffb35e3 Removed stutter 2017-09-27 12:15:13 +13:00
Joseph Gardner ea1170a48e Merge remote-tracking branch 'origin/master' into raceLength 2017-09-27 12:05:09 +13:00
hba56 173b4444da Placed the wind arrow in the HUD 
#story[1306]
 2017-09-27 12:04:56 +13:00
hba56 fc267a6a49 Merge remote-tracking branch 'remotes/origin/master' into raceView_UI 
# Conflicts:
#	racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
 2017-09-27 12:04:03 +13:00
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
 2017-09-27 12:02:56 +13:00
Joseph Gardner 26e2035ea2 Changed 3d arrow to point downwards #story[1299] 2017-09-27 11:39:12 +13:00
Joseph 699df2e775 Using new arrow / arrow textures. Made sails not clickable. 2017-09-26 18:30:29 +13:00
Joseph affbb69029 Merge remote-tracking branch 'origin/story1299_next_mark_direction' into story1299_next_mark_direction 2017-09-26 17:54:49 +13:00
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
 2017-09-26 17:53:46 +13:00
zwu18 ba82328c42 Removed souts for speedometer. #story[1311] 2017-09-26 17:09:00 +13:00
Fan-Wu Yang 1ca276ec62 Fixed some issue after merge as well as set the minimum race time to 2 minutes. #story[1323] 2017-09-26 16:48:23 +13:00
Fan-Wu Yang d599df3901 Merge branch 'master' into raceLength 
# Conflicts:
#	racevisionGame/src/main/java/mock/app/Event.java
 2017-09-26 16:40:03 +13:00
zwu18 11d6d3a880 Documentation added. Master merged. #story[1311] 2017-09-26 16:20:48 +13:00
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
 2017-09-26 16:11:14 +13:00
Fan-Wu Yang 967bdb394f Merged in master and realigned center of the boat #story[1306] 2017-09-26 15:21:30 +13:00
Fan-Wu Yang cd99492467 Merge branch 'master' into story1306_wind_arrow 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/layout/Assets3D.java
 2017-09-26 15:04:02 +13:00
Joseph 3f04485b78 Added manual connections works while also receiving available games from the server. #story[1352] 2017-09-26 13:16:09 +13:00
Joseph 5ebee27baa Merge remote-tracking branch 'origin/master' into issue61_manual_connection_fix 2017-09-26 13:11:39 +13:00
Fan-Wu Yang a14307a6bf Merge branch 'master' into story1297_sails 2017-09-26 00:23:38 +13:00
fjc40 76dff8009c Removed countdown timer from lobby screen. 2017-09-25 23:48:00 +13:00
fjc40 9763150e85 Merge remote-tracking branch 'origin/master' into game_start_button_1352 2017-09-25 22:39:29 +13:00
Fan-Wu Yang 9da0d238c2 Removed printlns ready for DoD 2017-09-25 15:33:33 +13:00
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] 2017-09-25 15:30:49 +13:00
Fan-Wu Yang 6cfb076fef Merge branch 'master' into story1297_sails 2017-09-25 15:30:18 +13:00
Fan-Wu Yang a1b6de5638 Merge branch 'master' into story1306_wind_arrow 2017-09-25 15:29:04 +13:00
Fan-Wu Yang eca921cb11 Removed println's ready for DoD 2017-09-25 15:28:37 +13:00
Joseph Gardner f9f5cfef7d Chanegd next mark arrow to fit with new UI. #story[1299] 2017-09-25 13:11:09 +13:00
Jessica Syder 915d61b9f3 Map can be zoomed out in birds eye view only to a specified distance. 
#story[1312]
 2017-09-25 12:35:46 +13:00
Jessica Syder ab49d62c0d Map can be zoomed in / out at all times. 
- map can be zoomed when object is not selected

#story[1312]
 2017-09-25 12:17:37 +13:00
Joseph Gardner 327c052b1d Merge remote-tracking branch 'origin/master' into story1299_next_mark_direction 2017-09-25 12:15:10 +13:00
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]
 2017-09-25 11:41:42 +13:00
Fan-Wu Yang 6d55168c61 Added Textures to boats as well as added texture to arrow #story[1306] 2017-09-25 03:31:38 +13:00
Fan-Wu Yang 45ba3ae6ac Added 3D wind arrow and it also rotates #story[1306] 2017-09-25 02:35:52 +13:00
Fan-Wu Yang d280c0bdae Merged master and added a few comments 2017-09-25 01:44:31 +13:00
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
 2017-09-25 01:43:23 +13:00
Jessica Syder 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]
 2017-09-24 22:56:14 +13:00
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]
 2017-09-24 22:15:11 +13:00
fjc40 da901d6e0c Merge remote-tracking branch 'origin/master' into game_start_button_1352 2017-09-24 20:01:15 +13:00
fjc40 612b4b455e Added start button for host on the ingameLobby screen. 
#story[1352]
 2017-09-24 19:59:56 +13:00
Jessica Syder 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]
 2017-09-24 17:59:36 +13:00
Joseph bf6282c697 3D arrow added for zoomed view. Shows relative direction to mark. #story[1299] 2017-09-24 17:28:13 +13:00
Fan-Wu Yang 088e73414b Fixed small bug where the sail never stopps jittering after moving #story[1297] 2017-09-24 00:36:35 +12:00