fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,487 Commits 1 Branch 0 Tags
4e8f1a2b19df1e48f3ee4db77511192bfe53f915
Commit Graph
205 Commits
Author SHA1 Message Date
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 13f3f595d2 Merge remote-tracking branch 'origin/master' into story1299_next_mark_direction 2017-09-27 12:52:50 +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
Joseph 569204b771 New skin for 2d next mark arrow. #story[1299] 2017-09-27 00:36:05 +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
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 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
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
Joseph Gardner f9f5cfef7d Chanegd next mark arrow to fit with new UI. #story[1299] 2017-09-25 13:11:09 +13:00
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. 2017-09-25 11:56:55 +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 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 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
hba56 ff59f7ff9c Added a new hud for the race view 
#story[1301]
 2017-09-23 22:38:27 +12:00
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
 2017-09-23 22:35:22 +12:00
hba56 7418f7b4e6 adding new assets for race view hud 
#story[1301]
 2017-09-23 18:58:54 +12:00
Joseph 4cf9b67db8 Merge remote-tracking branch 'origin/master' into story1299_next_mark_direction 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
 2017-09-21 22:44:30 +12:00
Joseph 91c442e465 Set up architecture for next mark arrow and did a 2d template when the camera is zoomed out. #story[1299] 2017-09-21 22:25:39 +12:00
hba56 4242d05279 fixed issue with being unable to click through minimap 
#story[1295]
 2017-09-21 20:34:21 +12:00
Fan-Wu Yang cf9acabd97 Boat sails now luff and stay when in the direction of the wind #story[1297] 2017-09-21 02:35:01 +12:00
Fan-Wu Yang 2389aa361c Boats sails can luff and are now two piece. #story[1297] 2017-09-21 02:21:02 +12:00
hba56 dacaf58271 Merge remote-tracking branch 'remotes/origin/master' into minimap_test 2017-09-20 23:46:02 +12:00
hba56 afc42cf2ab lowered opacity 2017-09-20 22:22:07 +12:00
hba56 50125e0151 moved minimap to left so does not overlap with speedo 2017-09-20 22:03:22 +12:00
hba56 f7d866144a Map now only shows annotations when in full screen 
#story[1295]
 2017-09-19 22:08:27 +12:00
zwu18 051811b97d Merge branch 'master' into story_speedometer 2017-09-19 21:45:00 +12:00
zwu18 be9feff6fd Layout changes to speedometer UI. #story[1311] 2017-09-19 21:39:40 +12:00
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] 2017-09-19 18:23:45 +12:00
hba56 731be68831 test for a minimap 2017-09-18 10:22:01 +12:00
fjc40 eb2ed45ed2 Merge branch 'master' into spectate_mode_basic 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
 2017-09-15 00:46:07 +12:00
hba56 e0d886ffb2 overlay off by default 
#story[1195]
 2017-09-14 23:53:13 +12:00
hba56 88f1a393f2 Made the info tab into an overlay 
#story[1195]
 2017-09-14 23:40:02 +12:00
hba56 c17900a461 Merge remote-tracking branch 'remotes/origin/master' into scoreTable 2017-09-14 22:25:33 +12:00
Fan-Wu Yang 2383915c78 Merged #story[1195] 2017-09-14 16:42:23 +12:00
Fan-Wu Yang d70f556741 Changed arrow to next mark appearance #story[1195] 2017-09-14 16:36:17 +12:00
Joseph Gardner 14b5f4bdf1 Merge branch 'master' into storyD-3D 
# Conflicts:
#	.gitignore
#	racevisionGame/src/main/java/mock/model/RaceServer.java
#	racevisionGame/src/main/java/mock/model/collider/Collider.java
#	racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java
#	racevisionGame/src/main/java/shared/model/Boat.java
#	racevisionGame/src/main/java/shared/model/Mark.java
#	racevisionGame/src/main/java/visualiser/Controllers/HostController.java
#	racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
#	racevisionGame/src/main/java/visualiser/Controllers/MainController.java
#	racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
#	racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
#	racevisionGame/src/main/java/visualiser/layout/Plane3D.java
#	racevisionGame/src/main/java/visualiser/layout/SeaSurface.java
#	racevisionGame/src/main/java/visualiser/layout/View3D.java
#	racevisionGame/src/main/java/visualiser/utils/PerlinNoiseGenerator.java
#	racevisionGame/src/main/resources/visualiser/scenes/title.fxml
 2017-09-14 16:34:28 +12:00
fjc40 43a1fbcb64 Spectate mode can be selected by clients when they join a game. 
#story[1194]
 2017-09-14 14:33:21 +12:00