1611 Commits (main)
 

Author SHA1 Message Date
fjc40 43a1fbcb64 Spectate mode can be selected by clients when they join a game.
8 years ago
David Wu 913452de43 Merge branch 'master' into wind_arrow_direction_5
8 years ago
David Wu 39cfed961c Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7
8 years ago
David Wu 550180f286 Removed countdown pane.
8 years ago
Joseph Gardner 7b076f3718 Merge branch 'storyA_sounds' into storyD-3D
8 years ago
Joseph Gardner c23fcfcaa3 new skybox textures. Still need to fix two planes having a small gap between them. #story[1196]
8 years ago
hba56 083eb5a4bc updated race view that does not use a split pane
8 years ago
fjc40 b59d36f4e5 Actually fixed the wind arrow direction.
8 years ago
fjc40 afd923c9fb Revert "Appears to fix wind arrow direction."
8 years ago
hba56 87f3265640 pushed branch
8 years ago
Connor Taylor-Brown f2370485a0 RaceController can now set up collision listeners on each boat.
8 years ago
fjc40 e0278fdb85 Merge remote-tracking branch 'origin/master' into wind_arrow_direction_5
8 years ago
fjc40 8e6a720558 Appears to fix wind arrow direction.
8 years ago
David Wu e3266c3b47 Pane removed.
8 years ago
Connor Taylor-Brown e354320d74 Replaced camera tracking listeners with animation timer
8 years ago
Connor Taylor-Brown b8c4582d2a Replaced mark arrow listener with animation timer.
8 years ago
Joseph Gardner a6eea88524 Fixed collisions #fix #story[1196]
8 years ago
hba56 81a04c987b Changed the ip of the matchbrowser to that of the CI.
8 years ago
Fan-Wu Yang e4a8bd08e7 Merge branch 'story77' into 'master'
8 years ago
Fan-Wu Yang 92500e13ee Added in windangle for rotated map as it had been lost through merge. #story[1188]
8 years ago
Fan-Wu Yang 1b946b6807 Removed/commented out unecessary print messages #story[1188]
8 years ago
hba56 4c52673fc1 javadoc fixes
8 years ago
hba56 e4dbebfcac Merge remote-tracking branch 'remotes/origin/master' into story77
8 years ago
hba56 fd120edaf9 Merge remote-tracking branch 'remotes/origin/master' into story77
8 years ago
cbt24 de9f4e22eb Direction to mark arrow is now displayed relative to camera
8 years ago
Fan-Wu Yang 7b97e93d3a Merge branch 'merge_fix_story51'
8 years ago
Fan-Wu Yang 54fe37fd3a Merge branch 'story_51_rounding_fix' into 'master'
8 years ago
Connor Taylor-Brown 5f96526fcc Added "arrow" pointing to next mark on third person view
8 years ago
David Wu 22b4b66049 Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77
8 years ago
David Wu cccce9002b Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77
8 years ago
Joseph Gardner 0944e5729a Dimmed the ambient light and specular light. #story[1261]
8 years ago
hba56 00780e17e9 Merge remote-tracking branch 'remotes/origin/temp77' into story77
8 years ago
David Wu 8cc4d7741c Fixed issue where games can't be hosted if you quit as host in the lobby menu. Added more doc.#story[1188]
8 years ago
hba56 aafc0dc9db Merge remote-tracking branch 'remotes/origin/temp77' into story77
8 years ago
Fan-Wu Yang 1cbb24e9fd Merged in master #story[1185]
8 years ago
Fan-Wu Yang 3760a43cfc Merge branch 'master' into HEAD
8 years ago
fjc40 b655b3e233 Fixed merge bug, and an unrelated null pointer exception.
8 years ago
Connor Taylor-Brown e657a0cc99 Added tracking for angle between third person boat and next mark
8 years ago
fjc40 6761778dd4 Merge remote-tracking branch 'origin/master' into story_51_rounding_fix
8 years ago
David Wu 06bd637460 Added documentation. #story[1188]
8 years ago
David Wu 490aab3f8d Changes made to pre-race countdown. #story[1188]
8 years ago
Fan-Wu Yang e87173ee39 Fixed Tutorial not being able to run #story[1185]
8 years ago
hba56 079d93fc0f Merge remote-tracking branch 'remotes/origin/master' into story77
8 years ago
hba56 70ccb4cf1c Merge remote-tracking branch 'remotes/origin/master' into story77
8 years ago
David Wu f926355d1c Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77
8 years ago
David Wu 89ce8a7cc0 Pre-race countdown implementation.
8 years ago
hba56 731c0b0e61 send out to every client fix
8 years ago
fjc40 d29a47ec23 Merge remote-tracking branch 'origin/master' into story_51_rounding_fix
8 years ago
Fraser Cope d1f74dec3a Merge branch 'storyB-)' into 'master'
8 years ago
Connor Taylor-Brown 83e696b79e Committed merge-related bug fixes
8 years ago