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

649 Commits (f1c1fc706326b864bd03f43dc671c36b9b77baf5)

Author SHA1 Message Date
fjc40 ae9594f8c3 Removed a println and fixed some javadoc warnings.
8 years ago
fjc40 47d013612a Fix for null pointer exception when finishing race.
8 years ago
hba56 88f1a393f2 Made the info tab into an overlay
8 years ago
fjc40 24b068f249 Collision effect uses color.transparent instead of a custom transparent color.
8 years ago
fjc40 536428ce16 There was a null pointer exception related to going into/leaving third person camera and the arrow annotation.
8 years ago
fjc40 f308f5b8f3 Visualiser model thread was updating GUI instead of fx thread.
8 years ago
Connor Taylor-Brown 8d9624db96 Recovered sails smoothing
8 years ago
Connor Taylor-Brown 90c258e9e9 Reset collision tag on visualiser boat after displaying collision
8 years ago
hba56 c17900a461 Merge remote-tracking branch 'remotes/origin/master' into scoreTable
8 years ago
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
Fan-Wu Yang f541a13235 Tried to get lobby working #story[1188]
8 years ago
Joseph Gardner 1166c0a4fb Merged sounds. #story[1196]
8 years ago
fjc40 43a1fbcb64 Spectate mode can be selected by clients when they join a game.
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
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
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
Connor Taylor-Brown 83e696b79e Committed merge-related bug fixes
8 years ago
Connor Taylor-Brown 70bbc89239 Fixed merge-related bugs
8 years ago
fjc40 070654a95c Javadoc fix.
8 years ago
David Wu c750b806e0 Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77
8 years ago
fjc40 2ad947b57d The start time of the race is no longer scaled by the race speed scalar.
8 years ago
hba56 2c06a46ad2 send out to every client fix
8 years ago
David Wu 202c8d80c8 Minor fxml adjustments.
8 years ago
David Wu 42a5d8ddc4 Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77
8 years ago
hba56 5fb24307ec send out to every client fix
8 years ago
Joseph 0b3ef992bc Merge remote-tracking branch 'origin/storyD-3D' into storyD-3D
8 years ago
Joseph 253a16a664 Made the sky box use sky box planes they cannot be scaled. #story[1261]
8 years ago
Connor Taylor-Brown 0f846f31c3 Merge remote-tracking branch 'origin/storyD-3D' into storyD-3D
8 years ago
Connor Taylor-Brown 963c8a43ad Boats and marks are sized realistically in 3rd person
8 years ago
David Wu 7cea1fb11c Reworking fxml for lobby.
8 years ago
fjc40 ab96884dc6 Javadoc.
8 years ago
hba56 4adcd6322c send out to every client
8 years ago
fjc40 55402136ed Merge remote-tracking branch 'origin/master' into story_51_rounding_fix
8 years ago
Joseph 771068966e Just rotated the images to make them look like the plane is rotated properly... #story[1261]
8 years ago
fjc40 2a6085c9e8 Test fix.
8 years ago
fjc40 a1684a410c Javadoc.
8 years ago
fjc40 9fa1b9ee67 Re-enabled source id allocator check.
8 years ago
fjc40 3fa6b9200d Finished MarkRoundingSequence class. Added MarkRoundingData class.
8 years ago
Fan-Wu Yang 3a6070a645 Fixed Merge and added back some merge changes #story[1196]
8 years ago
hba56 4dcff5c009 SeaSurface files have been added to display the surface in the lobby. Surface is now drawn in the lobby
8 years ago
Fan-Wu Yang 3301798411 Fixed boats not rotating in lobby #story[1188]
8 years ago
Joseph Gardner bcc827b554 Added lights and managed to get the orientation of one of the skybox walls correct. #story[1261]
8 years ago
Connor Taylor-Brown bae428fb3f Recovered a private method used in a test
8 years ago
Connor Taylor-Brown c94e0af69c Removed remaining println statements
8 years ago
Connor Taylor-Brown 01a304efb9 Merge remote-tracking branch 'remotes/origin/master' into storyB-)
8 years ago
zwu18 b6c340614f Tutorial text disabled on actual races. #story[1261]
8 years ago
Jessica Syder 625eb62af2 Wrapped the tutorial text on the title fxml.
8 years ago