1431 Commits (7d3ec940eb68d2372535e14afb88dda3bff41f65)
 

Author SHA1 Message Date
Jessica Syder 7d3ec940eb Merge branch 'story1297_sails' into 'master'
8 years ago
Fan-Wu Yang 980d1d7977 Merge remote-tracking branch 'origin/issue58_sails_collision_fix' into story1297_sails
8 years ago
Fan-Wu Yang a14307a6bf Merge branch 'master' into story1297_sails
8 years ago
David Wu 13e0b4bd5c Merge branch 'game_start_button_1352' into 'master'
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
Connor Taylor-Brown 3007fe1ee5 Everyone has a single email address according to mailmap
8 years ago
Connor Taylor-Brown 8e4f7e8b04 Fixed mailmap
8 years ago
Fan-Wu Yang 9da0d238c2 Removed printlns ready for DoD
8 years ago
Fan-Wu Yang 6cfb076fef Merge branch 'master' into story1297_sails
8 years ago
Joseph Gardner 7d789c04bb Fixed sails out / colliding issue. #story[1297]
8 years ago
Joseph Gardner 332722e099 Attempt to fix sails in / out colliding issue. Going to test on dev for a better visual representation. #story[1297]
8 years ago
Fan-Wu Yang 5a1dbc83b5 Merge branch 'zoomzoom' into 'master'
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
hba56 34789ce3b5 mailmap
8 years ago
Joseph Gardner 9212ec91f0 mailmap
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
Fan-Wu Yang d280c0bdae Merged master and added a few comments
8 years ago
Fan-Wu Yang 12b7d10f24 Merge branch 'master' into story1297_sails
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
Fan-Wu Yang 088e73414b Fixed small bug where the sail never stopps jittering after moving #story[1297]
8 years ago
Fan-Wu Yang 2b8ca9265f Sails now slowly spin to the correct position #story[1297]
8 years ago
Fan-Wu Yang d3a6b82031 Commit before checking out developement
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
Joseph Gardner b1657e8bfc Merge branch 'minimap_test' into 'master'
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
Fan-Wu Yang cf9acabd97 Boat sails now luff and stay when in the direction of the wind #story[1297]
8 years ago
Fan-Wu Yang c9177da85c Deleted another dead line #story[1297]
8 years ago
Fan-Wu Yang ed11f7d56c forgot to removed a dead line #story[1297]
8 years ago
Fan-Wu Yang 2389aa361c Boats sails can luff and are now two piece. #story[1297]
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
David Wu 951c3771fa Merge branch 'newHostServer' into 'master'
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