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

87 Commits (7b076f37186464ed8a4b3f60bed229cf085b0c41)

Author SHA1 Message Date
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
cbt24 de9f4e22eb Direction to mark arrow is now displayed relative to camera
8 years ago
Connor Taylor-Brown 5f96526fcc Added "arrow" pointing to next mark on third person view
8 years ago
Joseph Gardner 0944e5729a Dimmed the ambient light and specular light. #story[1261]
8 years ago
Connor Taylor-Brown e657a0cc99 Added tracking for angle between third person boat and next mark
8 years ago
Connor Taylor-Brown 70bbc89239 Fixed merge-related bugs
8 years ago
Connor Taylor-Brown 963c8a43ad Boats and marks are sized realistically in 3rd person
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 59bd22c2aa Fixed mark rounding
8 years ago
Connor Taylor-Brown 0f316afb3c Added colour indication to next mark
8 years ago
Joseph 7a8ea7fea7 Made seasurface overlay to enable skybox to be smaller. #story[1261]
8 years ago
Connor Taylor-Brown b902b05e5e Wrote possible fix for issue #50 (Composite command tries to remove non-existent element)
8 years ago
Joseph 49cd19e1a8 Made and textured a skybox, still needs to be fixed on two sides. #story[1261]
8 years ago
zwu18 fc9a4898d6 Made changes based on DoD review. Class documentation and commenting added. Removed annotation features. Removed sout commands. #story[1189]
8 years ago
Joseph Gardner 0da6931f8f Have structure for skybox, still need to play around with it a bit more to make it fit. #story[1261]
8 years ago
David Wu b976186c7d Merged current master in. Made changes to classes so tutorial again due to merge. #story[1189]
8 years ago
Fan-Wu Yang ae75bb86d3 Resized models to a similar size of the collision detectors. #story[1261]
8 years ago
Fan-Wu Yang 9ac9c25923 Made sea surface look like a sea surface which is randomly generated each time, size may need to be altered a bit else it will cause the program to slow #story[1261]
8 years ago
David Wu c6594a0e20 Tutorial text now displays on screen when in tutorial. #story[1189]
8 years ago
David Wu 9a96131a33 Fixed issue where wind arrow, accordion, time, etc. were not being displayed. Fixed issue where zooming would crash when done outside of tutorial. #story[1189]
8 years ago
David Wu bad6422ca9 Implemented tutorial for zooming as it was left out from the last commit. Refactored updating tutorial state. #story[1189]
8 years ago
David Wu d2d5ae62eb Tutorial states implemented and working. Game currently prints to terminal the "tutorial text". Next step is to create display on application for these text. Game ends when tutorial ends. Fixed game not loading xml issue. #story[1189]
8 years ago
Fan-Wu Yang a7eefca13a Work in progress, the perlin noise is now generated, however, a good colour should be selected as well as using a subject3d instead of a imageview #story[1261]
8 years ago
Fan-Wu Yang e2b868d815 Added boundaries to the map, which are drawn by the race #story[1261]
8 years ago
cbt24 70f4a00d12 Scaled down marks and boats to make 3rd person view more realistic
8 years ago
cbt24 2508b847b8 Merge branch 'master' into storyD-3D
8 years ago
cbt24 643f145407 Added mark radius 3D annotation to improve bird's eye visibility
8 years ago
Connor Taylor-Brown 93883ee8b7 Added more descriptive documentation to new classes and functionality
8 years ago
Fan-Wu Yang e149255240 Tried to get multiple boats working but.... it's not #story[1196]
8 years ago
Fan-Wu Yang 5bc382304b Created and linked up bouy to race, and added keybindings to git ignore #story[1196]
8 years ago
Connor Taylor-Brown b034a452b6 Fixed problem with race pane registering non-control keys
8 years ago
Connor Taylor-Brown 68f434b6b6 Bound zooming action to zoom keys
8 years ago
Connor Taylor-Brown 1efec06bdc View3D can untrack objects and zoom in different modes
8 years ago
Connor Taylor-Brown b59eca1a8b Added Subject3D selection to View3D
8 years ago
Connor Taylor-Brown 54baf4f884 Added scroll-wheel zooming
8 years ago
Fan-Wu Yang 7bad0e53ff The boat is now viewable in top down view (60 degrees for isometric) and the race is playable #story[1261]
8 years ago
Connor Taylor-Brown d89186d8bf Finished playable 3D race with first person camera
8 years ago
cbt24 19f4d0fc06 Added marks back to the race view
8 years ago
cbt24 05a0614246 Boats now rotate correctly in position rather than about the origin
8 years ago
cbt24 3ecf203cba Recovered stable rotation of the player's boat
8 years ago
Connor Taylor-Brown c74cc26bf1 Merged with master and changed View3D default background
8 years ago
Connor Taylor-Brown b8c99be201 Merge branch 'master' into storyD-3D
8 years ago
cbt24 971a061499 View3D within RaceController now tracks boat heading
8 years ago
Jessica Syder addaaf0de3 Merge remote-tracking branch 'remotes/origin/master' into C_keybindings
8 years ago
Connor Taylor-Brown 0ee448e17d Created wrapper for controlling the position and heading of rendered 3D models.
8 years ago
Jessica Syder 2188ddc3a3 Fixed errors in making the keybinding replaceable.
8 years ago
Connor Taylor-Brown b6e56d815c ResizableRaceCanvas no longer depends on VisualiserRaceEvent
8 years ago
David Wu 5234cdea66 Merge branch 'master' into new_issue#19
8 years ago
David Wu 598275591f Updated javadoc.
8 years ago