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

319 Commits (86de4e7c0c0c030e84449806849ae8e4ca7a944a)

Author SHA1 Message Date
hba56 86de4e7c0c Merge remote-tracking branch 'origin/master'
8 years ago
hba56 004aebceb5 fix null pointer when playing tutorial
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
David Wu 550180f286 Removed countdown pane.
8 years ago
fjc40 afd923c9fb Revert "Appears to fix wind arrow direction."
8 years ago
fjc40 8e6a720558 Appears to fix wind arrow direction.
8 years ago
hba56 81a04c987b Changed the ip of the matchbrowser to that of the CI.
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
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
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
David Wu 06bd637460 Added documentation. #story[1188]
8 years ago
David Wu 490aab3f8d Changes made to pre-race countdown. #story[1188]
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 89ce8a7cc0 Pre-race countdown implementation.
8 years ago
fjc40 d29a47ec23 Merge remote-tracking branch 'origin/master' into story_51_rounding_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
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
fjc40 55402136ed Merge remote-tracking branch 'origin/master' into story_51_rounding_fix
8 years ago
fjc40 3fa6b9200d Finished MarkRoundingSequence class. Added MarkRoundingData class.
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
Connor Taylor-Brown c94e0af69c Removed remaining println statements
8 years ago
zwu18 b6c340614f Tutorial text disabled on actual races. #story[1261]
8 years ago
Jessica Syder e664619a81 Tutorial is played with tutorial map.
8 years ago
hba56 e3ddb272c0 Merge remote-tracking branch 'remotes/origin/master' into story77
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 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
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
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
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