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

640 Commits (4242d05279fabb485f55685a9f38ab1661c8780b)

Author SHA1 Message Date
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
Jessica Syder b808056567 Host boat isnt disappearing anymore (I think).
8 years ago
Jessica Syder e664619a81 Tutorial is played with tutorial map.
8 years ago
Connor Taylor-Brown fbd124e602 Merge branch 'master' into storyB-)
8 years ago
hba56 e3ddb272c0 Merge remote-tracking branch 'remotes/origin/master' into story77
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
Connor Taylor-Brown d90b161d01 Merge branch 'master' into storyA_sounds
8 years ago
Joseph 49cd19e1a8 Made and textured a skybox, still needs to be fixed on two sides. #story[1261]
8 years ago
Jessica Syder 0cb008cef7 Removed a couple of old canvas lines.
8 years ago
Jessica Syder 9bc36ba544 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
8 years ago
Jessica Syder c30391ef23 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
8 years ago
zwu18 1a9f24a3ba Forgot to hide race.fxml :P #story[1189]
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
Fan-Wu Yang 2cda5ea70d Lobby no longer glitches out when a person disconnects and reconnects without restarting the program #story[1188]
8 years ago
Connor Taylor-Brown 5e35cd4195 Removed empty java files
8 years ago
Fan-Wu Yang 54a9140f31 lobby listener is added and removed so that the program doesn't drasticaly slow down when the lobby is connected to multiple times #story[1188]
8 years ago
Jessica Syder 669a303e9b Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
8 years ago
Jessica Syder 108643b59d Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
8 years ago
Fan-Wu Yang df04cdf87c Boats are now visualy removed when they leave the lobby.
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
Fan-Wu Yang d92410b9b4 Fixed XML Issue where sometimes the last boat would not display itself #story[1188]
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
David Wu c97706d86e Merge branch 'master' into story70
8 years ago
fjc40 346aa148ef Added some debug statements, and WIP MarkRoundingSequence class.
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 08ca42f786 Wrote some missing java docs #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
David Wu 28ec4b9246 Merge branch 'master' into story70
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
hba56 ddc3a6ae47 boxes in lobby are now boats
8 years ago
hba56 e5d8a4028d Merge remote-tracking branch 'remotes/origin/master' into story77
8 years ago
hba56 ae8fa312a3 removed sout and added a longer startup time. Also fixed race xmls to remove set boats
8 years ago
hba56 ea1594a839 Merge remote-tracking branch 'remotes/origin/master' into Story_76
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
Jessica Syder 14aaf26b73 Merge branch 'story40-zoom' into 'master'
8 years ago
Jessica Syder 1ed7ccf146 Minor changes preparing to merge in 3D
8 years ago
Connor Taylor-Brown 93883ee8b7 Added more descriptive documentation to new classes and functionality
8 years ago
Jessica Syder 0dff85006a Changes to code to use new controller structure.
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
hba56 5e516b0508 re added the standard race
8 years ago
Jessica Syder a5050b8ea8 Adding back lost changes and finishing splitting last controllers.
8 years ago
hba56 4c2ab9cc9a Merge branch 'master' into story77
8 years ago
Connor Taylor-Brown 0c9e55093c Set lobby anchor pane to invisible to allow races to start
8 years ago
Jessica Syder a5d3434a70 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
8 years ago
hba56 4780354452 Errors in this commit: mock threads get interrupted
8 years ago
Connor Taylor-Brown b034a452b6 Fixed problem with race pane registering non-control keys
8 years ago
Joseph Gardner 2868f921e2 Only one angular command can be active at a time. Only one velocity command can be active at a time. #story[1196]
8 years ago
Connor Taylor-Brown 68f434b6b6 Bound zooming action to zoom keys
8 years ago
Joseph Gardner df624a8437 Angular movement when auto vmg is pressed is smoothed. #story[1196]
8 years ago
Connor Taylor-Brown 1efec06bdc View3D can untrack objects and zoom in different modes
8 years ago
Joseph Gardner d2c8ccd98e Course image for a type M2 course has been made. #story[1193]
8 years ago
fjc40 ec82e65ae7 Fixed javadocs in xml creation classes.
8 years ago
hba56 63e2cc1fd0 Merge remote-tracking branch 'remotes/origin/story77_lobby' into story77
8 years ago
Joseph Gardner 3157ac88b5 Course layout for a type M2 course has been made. #story[1193]
8 years ago
Connor Taylor-Brown 23eabed3ff View3D tracks selected boat at fixed distance, pitch, and relative yaw
8 years ago
Connor Taylor-Brown b59eca1a8b Added Subject3D selection to View3D
8 years ago
hba56 a494eb4a6d games are now added on the correct port
8 years ago
hba56 d3ddff8bf1 host game start button added margins
8 years ago
zwu18 64ed1f9aa6 Improved map layout image. #story[1193]
8 years ago
Connor Taylor-Brown 54baf4f884 Added scroll-wheel zooming
8 years ago
Jessica Syder a2b3ba44c0 RaceController scene separating
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
Jessica Syder 9f3cc53a63 Finished Arrow, Title and StartController scene splitting
8 years ago
David Wu 55cfda33d0 Merge branch 'Story_76' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into Story_76
8 years ago
David Wu 002cccd5a0 Reworked iMapLayout as race would either take too long or too short. Added temporary image for iMapLayout. Will be reworked when I have time. #story[1193]
8 years ago
Fan-Wu Yang 18a689b110 Changed a constant to be using the one in the constants file (prepartory start time) and temporarily made it so that the race can start in 3 seconds. #story[1261]
8 years ago
hba56 e82c59a8a4 New css for the host game window
8 years ago
hba56 cbfcd3aa0d Images
8 years ago
cbt24 8c7345a30d Documented command classes
8 years ago
cbt24 a6db06a82c Boats now reverse smoothly when colliding
8 years ago
cbt24 9cba3934ea Sails command now applies acceleration to boat
8 years ago
cbt24 eba70ab2d4 Sails command now listens to race to check if goal velocity is met
8 years ago
cbt24 b62344261a Merge remote-tracking branch 'remotes/origin/master' into storyB-)
8 years ago
cbt24 844b48a81a Resolved issue #42 - "putting sails out changes boat bearing to face target gate"
8 years ago
Connor Taylor-Brown e3e61e5b28 Merge remote-tracking branch 'remotes/origin/master' into storyD-3D
8 years ago
hba56 dfd3cb96f3 removed System.out.println
8 years ago
Fan-Wu Yang ae1526c457 Merge branch 'master' into vmg_fix
8 years ago
Fan-Wu Yang 7024cac426 Rotated image of arrow direction #story[1187]
8 years ago
Fan-Wu Yang 8eee282977 Merge branch 'wind_(story53)' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into wind_(story53)
8 years ago
hba56 0886a60911 arrow Flip
8 years ago
hba56 86f495a551 javaDoc
8 years ago
Fan-Wu Yang 5bb8ba44b8 Fixed Javadoc and also made some variables private #story[1187]
8 years ago
Fan-Wu Yang 2382585c15 Fixed Javadoc and also made some variables private #story[1187]
8 years ago
Joseph Gardner 00cedf4d4d TackGybeCommand now smooths the rotation of the boat. #story[1196]
8 years ago
hba56 4ec2a50d20 Image Scales
8 years ago
Connor Taylor-Brown d89186d8bf Finished playable 3D race with first person camera
8 years ago
hba56 4eac3ea8b5 Updated the HostGame now has images for the maps and the map can be picked
8 years ago
hba56 9560486248 Merge branch 'Story_76' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into Story_76
8 years ago
hba56 6b9c041c6b Merge remote-tracking branch 'remotes/origin/master' into wind_(story53)
8 years ago
hba56 dbd4703e74 javadoc fix
8 years ago
Fan-Wu Yang 06517b7b47 Tidied up code
8 years ago
Fan-Wu Yang d602c1ec6f VMG is now working and fixed, however, it feels a bit odd #story[1182]
8 years ago
David Wu b22c5c5cd6 Created xml for new course layout. Marks and such are all added. Need to set up boundary when I have time. #story[1193]
8 years ago
Fan-Wu Yang 7331ad1a20 VMG now works however some little bug in the interpolation in some quadrant that is making the speed all the same in the quadrant #story[1182]
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
David Wu 8b5a5506e7 Boat collisions now play a sound when user collides and a quieter sound when others collide. #story[1195]
8 years ago
Fan-Wu Yang 7aaa880f40 VMG now works with some edge cases issues #story[1182]
8 years ago