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

586 Commits (0888a743a7965564435efaf5c0f08140392618e9)

Author SHA1 Message Date
David Wu e345ecdec1 Removed sout statements.
8 years ago
Joseph Gardner f794aec4c8 boundaries are annotations.
8 years ago
Joseph Gardner 7fa2037753 Merge remote-tracking branch 'origin/storyD-3D' into storyD-3D
8 years ago
Fan-Wu Yang 2383915c78 Merged #story[1195]
8 years ago
Joseph Gardner c42e25df86 Merge branch 'master' into storyD-3D
8 years ago
Joseph Gardner 55713f14a1 Merge branch 'master' into storyD-3D
8 years ago
Fan-Wu Yang d70f556741 Changed arrow to next mark appearance #story[1195]
8 years ago
Joseph Gardner 7bea2fee73 Merge branch 'storyA_sounds' into storyD-3D
8 years ago
Joseph Gardner 14b5f4bdf1 Merge branch 'master' into storyD-3D
8 years ago
hba56 86de4e7c0c Merge remote-tracking branch 'origin/master'
8 years ago
hba56 004aebceb5 fix null pointer when playing tutorial
8 years ago
cbt24 02b4146fa3 Amended collision effect radius
8 years ago
David Wu 43ee92fb95 Created enums and bound them to zoom in, zoom out and sails toggle for key bindings so that something expected shows up for key binding descriptions when changing key bindings. #story[1197]
8 years ago
cbt24 7d58b05e38 Fixed collision not fading to zero
8 years ago
cbt24 cdc7b642db Boat now shows a fading collision effect
8 years ago
Joseph Gardner 1166c0a4fb Merged sounds. #story[1196]
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
fjc40 b59d36f4e5 Actually fixed the wind arrow direction.
8 years ago
fjc40 afd923c9fb Revert "Appears to fix wind arrow direction."
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
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 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
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