fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,417 Commits 1 Branch 0 Tags
5ebee27baa7aa4576c2143b6db9d6fc7ae71576b
Commit Graph
1417 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Joseph 5ebee27baa Merge remote-tracking branch 'origin/master' into issue61_manual_connection_fix 2017-09-26 13:11:39 +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
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 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
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 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
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
Fan-Wu Yang fec421da00 Removed println messages 2017-09-20 15:16:32 +12:00
Fan-Wu Yang 30087ed9bd Merge branch 'master' into newHostServer 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
 2017-09-20 15:14:19 +12:00
Fan-Wu Yang 3c9e520d9f Merged in null pointer issue. 2017-09-20 15:07:22 +12:00
Fan-Wu Yang bb0c1d1780 Merge branch 'nullptr_finish_race_arrow' into newHostServer 2017-09-20 15:06:20 +12:00
Fan-Wu Yang b0857debeb Merge remote-tracking branch 'origin/nullptr_finish_race_arrow' into newHostServer 2017-09-20 15:05:26 +12:00
Fan-Wu Yang b550afcca7 Merged race scaling with Http Match Discovery. 2017-09-20 15:05:08 +12:00
Fan-Wu Yang ac5423263c Merge remote-tracking branch 'origin/scale_maps_spike' into newHostServer 2017-09-20 14:29:44 +12:00
hba56 f7d866144a Map now only shows annotations when in full screen 
#story[1295]
 2017-09-19 22:08:27 +12:00
Hamish Ball ccbe3f86ea Merge branch 'spectate_mode_basic' into 'master' 
Spectate mode basic

Client can now select spectate when connecting to a race.
- The "Join game" button has been split into "Participate" and "Spectate".
- Selecting spectate should join the game, but not assign a boat.
- Spectator cannot control any boats, or have an effect on game.
- Can spectate a game even if it is full.


See merge request !49
 2017-09-19 21:23:14 +12:00
Joseph Gardner a82d3081fc Replace the class use of highlight with shockwave. #story[1298] 2017-09-19 15:43:22 +12:00
Joseph Gardner 9fbd5df626 Highlighting no longer goes over other boats. Player boat is highlighted in lobby. #story[1298] 2017-09-19 15:35:13 +12:00
Joseph Gardner cfdbf5896f Added basic highlighting to player boat. #story[1298] 2017-09-19 14:42:21 +12:00