fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,436 Commits 1 Branch 0 Tags
cd994924672e69d889ecf67e09c0bbff426aae52
Commit Graph
1436 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jessica Syder 7d3ec940eb Merge branch 'story1297_sails' into 'master' 
Story1297 sails && sails in and out collision issue

ACs:
 + Boats stop / slow after colliding when their sails are out
 + Boats with sails out and are slowing down can still collide
 + Visual representation of the sails
 + Sails are angled to depending on the wind

See merge request !60
 2017-09-26 14:43:18 +13:00
Fan-Wu Yang 980d1d7977 Merge remote-tracking branch 'origin/issue58_sails_collision_fix' into story1297_sails 2017-09-26 00:24:05 +13:00
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
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
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 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
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
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
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
Fan-Wu Yang d3a6b82031 Commit before checking out developement 2017-09-22 21:39:48 +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
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
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
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
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
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
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