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

280 Commits (490aab3f8dac52cae89ee5e1c8375f3631bc2471)

Author SHA1 Message Date
David Wu 490aab3f8d Changes made to pre-race countdown. #story[1188]
8 years ago
David Wu 89ce8a7cc0 Pre-race countdown implementation.
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
hba56 2c06a46ad2 send out to every client fix
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
David Wu 7cea1fb11c Reworking fxml for lobby.
8 years ago
hba56 4adcd6322c send out to every client
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
hba56 e3ddb272c0 Merge remote-tracking branch 'remotes/origin/master' into story77
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
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
Fan-Wu Yang df04cdf87c Boats are now visualy removed when they leave the lobby.
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
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
David Wu 28ec4b9246 Merge branch 'master' into story70
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 ea1594a839 Merge remote-tracking branch 'remotes/origin/master' into Story_76
8 years ago
Connor Taylor-Brown 93883ee8b7 Added more descriptive documentation to new classes and functionality
8 years ago
hba56 4c2ab9cc9a Merge branch 'master' into story77
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
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
Joseph Gardner d2c8ccd98e Course image for a type M2 course has been made. #story[1193]
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
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
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
Connor Taylor-Brown e3e61e5b28 Merge remote-tracking branch 'remotes/origin/master' into storyD-3D
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
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 6b9c041c6b Merge remote-tracking branch 'remotes/origin/master' into wind_(story53)
8 years ago
hba56 dbd4703e74 javadoc fix
8 years ago
cbt24 19f4d0fc06 Added marks back to the race view
8 years ago