fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,576 Commits 1 Branch 0 Tags
f46f9b9bf51c6708b1a5f4af3524a8f6b947d16b
Commit Graph
1576 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Fan-Wu Yang a14307a6bf Merge branch 'master' into story1297_sails 2017-09-26 00:23:38 +13:00
David Wu 13e0b4bd5c Merge branch 'game_start_button_1352' into 'master' 
Game start button 1352

AC's:
- Host can start a race on button press
- The race doesn't start until start button is pressed.
- Non-hosts can't start the race.



See merge request !58
 2017-09-25 23:53:03 +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
Connor Taylor-Brown 3007fe1ee5 Everyone has a single email address according to mailmap 2017-09-25 16:57:13 +13:00
Connor Taylor-Brown 8e4f7e8b04 Fixed mailmap 2017-09-25 16:45:15 +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 7d789c04bb Fixed sails out / colliding issue. #story[1297] 2017-09-25 14:07:29 +13:00
Joseph Gardner 332722e099 Attempt to fix sails in / out colliding issue. Going to test on dev for a better visual representation. #story[1297] 2017-09-25 13:48:03 +13:00
Joseph Gardner f9f5cfef7d Chanegd next mark arrow to fit with new UI. #story[1299] 2017-09-25 13:11:09 +13:00
Fan-Wu Yang 5a1dbc83b5 Merge branch 'zoomzoom' into 'master' 
Zoomzoom

As a player I want to see a natural zoom motion  

AC's:  
-Upper limit of camera will always reset to the centre of the race  
-Camera motion doesn't snap and will move smoothly  

Note: it 'snaps' when returning to the original view when not following a boat, as intended (think google maps), but each zoom key press is not 'snapped'.

See merge request !57
 2017-09-25 12:37:50 +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
hba56 34789ce3b5 mailmap 2017-09-25 12:15:41 +13:00
Joseph Gardner 327c052b1d Merge remote-tracking branch 'origin/master' into story1299_next_mark_direction 2017-09-25 12:15:10 +13:00
Joseph Gardner 9212ec91f0 mailmap 2017-09-25 11:58:42 +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
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
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] 2017-09-25 02:15:09 +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
Connor Taylor-Brown 4f229ad01c Implemented basic 3D start screen with no background race 
#story[1301]
 2017-09-25 00:56:21 +13:00
Connor Taylor-Brown 51413257b2 Modified title screen to use View3D with skybox and ambient lighting 
#story[1301]
 2017-09-25 00:23:46 +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
David Wu 45b2f0b6db Created more fire instances. #story[1292] 2017-09-24 22:50:12 +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
David Wu 1070842ada Fire is now rotated and standing up-write. Found problem with fire not being directly on the boat. #story[1292] 2017-09-24 22:05:37 +13:00
David Wu 4f838a3598 Fire follows boat. TODO: rotate fire. #story[1292] 2017-09-24 21:37:15 +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
David Wu c527ad0c52 Forgot to add image file. #story[1292] 2017-09-24 18:58:49 +13:00
David Wu 45eb557256 Displaying visual effect with imageview. #story[1292] 2017-09-24 18:58:19 +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
Fan-Wu Yang 2b8ca9265f Sails now slowly spin to the correct position #story[1297] 2017-09-23 23:36:21 +12: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
hba56 c43633f197 Merge branch 'master' into raceView_UI 2017-09-23 18:37:12 +12:00
zwu18 67779eb9ad Same changes to dev. #story[1311] 2017-09-23 00:38:33 +12:00
zwu18 64ae01113a Added delay for position update. This fixes fps issue. #story[1311] 2017-09-22 22:15:28 +12:00
Fan-Wu Yang d3a6b82031 Commit before checking out developement 2017-09-22 21:39:48 +12:00
zwu18 1946bfd658 Added audio indication when the user boat is low on hp. Audio rate changes when hp is critically low. #story[1292] 2017-09-22 21:19:35 +12:00