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

49 Commits (c0e00899efea7562cee3bf128284fa5b61e5cee3)

Author SHA1 Message Date
Fan-Wu Yang c582a66f9a Added new Highlight
8 years ago
Fan-Wu Yang 63fbffdbc1 lots of trying seagull stuff but translate y doesn't want to work for some stupid reason.
8 years ago
Fan-Wu Yang b48b83ab8e single mark rounding arrow now works
8 years ago
Fan-Wu Yang 967bdb394f Merged in master and realigned center of the boat #story[1306]
8 years ago
Fan-Wu Yang cd99492467 Merge branch 'master' into story1306_wind_arrow
8 years ago
Fan-Wu Yang a14307a6bf Merge branch 'master' into story1297_sails
8 years ago
fjc40 76dff8009c Removed countdown timer from lobby screen.
8 years ago
Fan-Wu Yang 6d55168c61 Added Textures to boats as well as added texture to arrow #story[1306]
8 years ago
Fan-Wu Yang 12b7d10f24 Merge branch 'master' into story1297_sails
8 years ago
fjc40 46192af628 Race now has a 10 minute delay before starting (which is increased whenever it falls below 5 minutes).
8 years ago
fjc40 da901d6e0c Merge remote-tracking branch 'origin/master' into game_start_button_1352
8 years ago
fjc40 612b4b455e Added start button for host on the ingameLobby screen.
8 years ago
Joseph 322d7b38b6 Merge remote-tracking branch 'origin/master' into story1298_boat_highlight
8 years ago
Fan-Wu Yang 2389aa361c Boats sails can luff and are now two piece. #story[1297]
8 years ago
Fan-Wu Yang 3d292f784b Users can now resee the lobby after exit and reentering, and fixed concurrent alteration issue which was stopping players from exiting the lobby.
8 years ago
Fan-Wu Yang 30087ed9bd Merge branch 'master' into newHostServer
8 years ago
Fan-Wu Yang bb0c1d1780 Merge branch 'nullptr_finish_race_arrow' into newHostServer
8 years ago
Joseph Gardner a82d3081fc Replace the class use of highlight with shockwave. #story[1298]
8 years ago
Joseph Gardner 9fbd5df626 Highlighting no longer goes over other boats. Player boat is highlighted in lobby. #story[1298]
8 years ago
fjc40 db27d673de Another fix for race xml stuff - the xml was fine, but the data sources would sometimes be overridden by empty ones, due to threading stuff.
8 years ago
hba56 d3f1e3baa4 Merge remote-tracking branch 'remotes/origin/master' into spectate_mode_basic
8 years ago
Fan-Wu Yang 928f5e31f0 Hopefully final version of Hosting #story[1188]
8 years ago
fjc40 5c58ca11ff Boats use their assigned color.
8 years ago
fjc40 eb2ed45ed2 Merge branch 'master' into spectate_mode_basic
8 years ago
hba56 c17900a461 Merge remote-tracking branch 'remotes/origin/master' into scoreTable
8 years ago
Joseph Gardner c42e25df86 Merge branch 'master' into storyD-3D
8 years ago
Joseph Gardner 14b5f4bdf1 Merge branch 'master' into storyD-3D
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
hba56 083eb5a4bc updated race view that does not use a split pane
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
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
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
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
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
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
hba56 ddc3a6ae47 boxes in lobby are now boats
8 years ago
hba56 4780354452 Errors in this commit: mock threads get interrupted
8 years ago
hba56 63e2cc1fd0 Merge remote-tracking branch 'remotes/origin/story77_lobby' into story77
8 years ago