fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,588 Commits 1 Branch 0 Tags
165c3e77abe38a876867055dd5d63e7fade54a11
Commit Graph
1588 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jessica Syder 908f31bcde Merge branches 'master' and 'zoomzoom' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into zoomzoom 2017-09-22 20:54:02 +12:00
zwu18 0b02727bf1 Set limits and more appearance changes for speedometer. #story[1311] 2017-09-22 20:33:56 +12:00
Connor Taylor Brown 49c08f5687 Merge branch 'story1298_boat_highlight' into 'master' 
Story1298 - Boat highlighting

ACs:
- Current players boat is highlighted

See merge request !56
 2017-09-22 20:22:18 +12:00
Jessica Syder 86fc911f98 Minor changes to improve look of third person view. 
#story[1312]
 2017-09-22 13:32:52 +12:00
Jessica Syder 62535720d4 Removed commented out code. 
#story[1312]
 2017-09-22 13:04:42 +12:00
Jessica Syder fa6543a713 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into zoomzoom 2017-09-22 13:00:12 +12:00
Jessica Syder 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]
 2017-09-22 12:59:44 +12:00
zwu18 e2ea6a5f03 Fixed issue with speedometer and sails interaction. #story[1311] 2017-09-22 02:40:54 +12:00
Connor Taylor-Brown 1b4b980081 Exponentially decrease speed as boat loses health 
- Boat halves in speed after 90% health loss

#story[1291]
 2017-09-22 00:49:36 +12:00
Connor Taylor-Brown 16da9e009b Cherry-picked FXML changes from Development 
#story[1291]
 2017-09-22 00:21:56 +12:00
Connor Taylor-Brown 985f784066 Removed broken stuff from FXML after merge 2017-09-21 23:41:18 +12:00
Connor Taylor-Brown dc9445a8a6 Merge branch 'master' into story1291-hp 
# Conflicts:
#	racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
 2017-09-21 23:40:46 +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 322d7b38b6 Merge remote-tracking branch 'origin/master' into story1298_boat_highlight 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
 2017-09-21 22:33:31 +12:00
Joseph Gardner 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
 2017-09-21 22:27:57 +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
Joseph 2cf0cca157 Can no longer click around the boat highlighting. #fix #story[1298] 2017-09-21 16:51:00 +12:00
Connor Taylor-Brown 5473fde731 Merge remote-tracking branch 'remotes/origin/master' into story1291-hp 2017-09-21 12:49:27 +12:00
David Wu eee0b414f8 made trackpoints cap at 50. This fixes fps issues with the minimap. #fix #story[1295] 2017-09-21 12:42:09 +12:00
Connor Taylor-Brown 6c78e5d0b5 Tomato now depletes as expected 
#story[1291]
 2017-09-21 12:10:33 +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 c9177da85c Deleted another dead line #story[1297] 2017-09-21 02:22:34 +12:00
Fan-Wu Yang ed11f7d56c forgot to removed a dead line #story[1297] 2017-09-21 02:22:04 +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
Connor Taylor-Brown 10008f5452 Depleting tomato now watches player health 
- [BUG] Tomato fills up instead of depleting

#story[1291]
 2017-09-21 01:42:53 +12:00
hba56 add1d3996d Set map colour back to a lighter colour as it didnt work as well on lower grade monitors 
#story[1195]
 2017-09-21 00:04:07 +12:00
hba56 dacaf58271 Merge remote-tracking branch 'remotes/origin/master' into minimap_test 2017-09-20 23:46:02 +12:00
David Wu 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
 2017-09-20 22:55:42 +12:00
hba56 b787b5a71b changed map to dodgerblue 2017-09-20 22:25:18 +12:00
hba56 afc42cf2ab lowered opacity 2017-09-20 22:22:07 +12:00
Fan-Wu Yang 1ffef51d7c Changed local ip detection to use regex 2017-09-20 22:07:46 +12:00
hba56 50125e0151 moved minimap to left so does not overlap with speedo 2017-09-20 22:03:22 +12:00
Fan-Wu Yang ffa1d8b0c4 Deleted Print Statement 2017-09-20 21:39:33 +12:00
Fan-Wu Yang 52271d580f CHanged ip to local ip because port forwarding may be subjective to change. 2017-09-20 21:38:49 +12:00
Fan-Wu Yang 3d292f784b Users can now resee the lobby after exit and reentering, and fixed concurrent alteration issue which was stopping players from exiting the lobby. 2017-09-20 18:46:33 +12:00
Connor Taylor-Brown b0bc7f50f2 Updated FXMLs to add depleting tomato 
- Tab view now contains health column
- BoatStateCommand now fails silently if command is received before race state is set up

#story[1291]
 2017-09-20 18:22:14 +12:00
Fan-Wu Yang fec421da00 Removed println messages 2017-09-20 15:16:32 +12:00