fanwuyang
/
SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1418 Commits
1 Branch
0 Tags
227 MiB
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '3f04485b78'
${ noResults }
Commit Graph

664 Commits (3f04485b78cc2ad131ad53c6ec13018424c00feb)

Author SHA1 Message Date
Joseph 3f04485b78 Added manual connections works while also receiving available games from the server. #story[1352]
8 years ago
Joseph 5ebee27baa Merge remote-tracking branch 'origin/master' into issue61_manual_connection_fix
8 years ago
fjc40 76dff8009c Removed countdown timer from lobby screen.
8 years ago
fjc40 9763150e85 Merge remote-tracking branch 'origin/master' into game_start_button_1352
8 years ago
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]
8 years ago
Jessica Syder 915d61b9f3 Map can be zoomed out in birds eye view only to a specified distance.
8 years ago
Jessica Syder ab49d62c0d Map can be zoomed in / out at all times.
8 years ago
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.
8 years ago
Jessica Syder e64e6ddbdb Boat scaling is correct.
8 years ago
fjc40 46192af628 Race now has a 10 minute delay before starting (which is increased whenever it falls below 5 minutes).
8 years ago
fjc40 da901d6e0c Merge remote-tracking branch 'origin/master' into game_start_button_1352
8 years ago
fjc40 612b4b455e Added start button for host on the ingameLobby screen.
8 years ago
Jessica Syder 908f31bcde Merge branches 'master' and 'zoomzoom' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into zoomzoom
8 years ago
Connor Taylor Brown 49c08f5687 Merge branch 'story1298_boat_highlight' into 'master'
8 years ago
Jessica Syder 86fc911f98 Minor changes to improve look of third person view.
8 years ago
Jessica Syder 62535720d4 Removed commented out code.
8 years ago
Jessica Syder fa6543a713 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into zoomzoom
8 years ago
Jessica Syder 1ecd2dd7b6 Zooming motion is more natural.
8 years ago
Joseph 322d7b38b6 Merge remote-tracking branch 'origin/master' into story1298_boat_highlight
8 years ago
hba56 4242d05279 fixed issue with being unable to click through minimap
8 years ago
Joseph 2cf0cca157 Can no longer click around the boat highlighting. #fix #story[1298]
8 years ago
David Wu eee0b414f8 made trackpoints cap at 50. This fixes fps issues with the minimap. #fix #story[1295]
8 years ago
hba56 add1d3996d Set map colour back to a lighter colour as it didnt work as well on lower grade monitors
8 years ago
hba56 dacaf58271 Merge remote-tracking branch 'remotes/origin/master' into minimap_test
8 years ago
hba56 b787b5a71b changed map to dodgerblue
8 years ago
hba56 afc42cf2ab lowered opacity
8 years ago
Fan-Wu Yang 1ffef51d7c Changed local ip detection to use regex
8 years ago
hba56 50125e0151 moved minimap to left so does not overlap with speedo
8 years ago
Fan-Wu Yang ffa1d8b0c4 Deleted Print Statement
8 years ago
Fan-Wu Yang 52271d580f CHanged ip to local ip because port forwarding may be subjective to change.
8 years ago
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.
8 years ago
Fan-Wu Yang fec421da00 Removed println messages
8 years ago
Fan-Wu Yang 30087ed9bd Merge branch 'master' into newHostServer
8 years ago
Fan-Wu Yang 3c9e520d9f Merged in null pointer issue.
8 years ago
Fan-Wu Yang bb0c1d1780 Merge branch 'nullptr_finish_race_arrow' into newHostServer
8 years ago
Fan-Wu Yang b0857debeb Merge remote-tracking branch 'origin/nullptr_finish_race_arrow' into newHostServer
8 years ago
Fan-Wu Yang b550afcca7 Merged race scaling with Http Match Discovery.
8 years ago
Fan-Wu Yang ac5423263c Merge remote-tracking branch 'origin/scale_maps_spike' into newHostServer
8 years ago
hba56 f7d866144a Map now only shows annotations when in full screen
8 years ago
Joseph Gardner a82d3081fc Replace the class use of highlight with shockwave. #story[1298]
8 years ago
Joseph Gardner 9fbd5df626 Highlighting no longer goes over other boats. Player boat is highlighted in lobby. #story[1298]
8 years ago
Joseph Gardner cfdbf5896f Added basic highlighting to player boat. #story[1298]
8 years ago
Joseph Gardner 3ca62e6c2b Added basic highlighting to player boat. #story[1298]
8 years ago
fjc40 db27d673de Another fix for race xml stuff - the xml was fine, but the data sources would sometimes be overridden by empty ones, due to threading stuff.
8 years ago
hba56 d3f1e3baa4 Merge remote-tracking branch 'remotes/origin/master' into spectate_mode_basic
8 years ago
Fan-Wu Yang 928f5e31f0 Hopefully final version of Hosting #story[1188]
8 years ago
Fan-Wu Yang f7da497743 Resizing maps to time taking now works #story[1323]
8 years ago
fjc40 424cd63c59 Should fix the race xml issues where boats get unassigned sometimes.
8 years ago
fjc40 acd99f58cd Merge remote-tracking branch 'origin/master' into nullptr_finish_race_arrow
8 years ago
hba56 f3f60acac6 resize map
8 years ago