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

719 Commits (3adc5330b466a7d3ca831a00f333c94741502d52)

Author SHA1 Message Date
zwu18 e2ea6a5f03 Fixed issue with speedometer and sails interaction. #story[1311]
8 years ago
Connor Taylor-Brown 1b4b980081 Exponentially decrease speed as boat loses health
8 years ago
Connor Taylor-Brown 16da9e009b Cherry-picked FXML changes from Development
8 years ago
Connor Taylor-Brown 985f784066 Removed broken stuff from FXML after merge
8 years ago
Connor Taylor-Brown dc9445a8a6 Merge branch 'master' into story1291-hp
8 years ago
Joseph 322d7b38b6 Merge remote-tracking branch 'origin/master' into story1298_boat_highlight
8 years ago
hba56 4242d05279 fixed issue with being unable to click through minimap
8 years ago
Joseph 2cf0cca157 Can no longer click around the boat highlighting. #fix #story[1298]
8 years ago
Connor Taylor-Brown 5473fde731 Merge remote-tracking branch 'remotes/origin/master' into story1291-hp
8 years ago
David Wu eee0b414f8 made trackpoints cap at 50. This fixes fps issues with the minimap. #fix #story[1295]
8 years ago
Connor Taylor-Brown 6c78e5d0b5 Tomato now depletes as expected
8 years ago
Fan-Wu Yang cf9acabd97 Boat sails now luff and stay when in the direction of the wind #story[1297]
8 years ago
Fan-Wu Yang c9177da85c Deleted another dead line #story[1297]
8 years ago
Fan-Wu Yang ed11f7d56c forgot to removed a dead line #story[1297]
8 years ago
Fan-Wu Yang 2389aa361c Boats sails can luff and are now two piece. #story[1297]
8 years ago
Connor Taylor-Brown 10008f5452 Depleting tomato now watches player health
8 years ago
hba56 add1d3996d Set map colour back to a lighter colour as it didnt work as well on lower grade monitors
8 years ago
hba56 dacaf58271 Merge remote-tracking branch 'remotes/origin/master' into minimap_test
8 years ago
hba56 b787b5a71b changed map to dodgerblue
8 years ago
hba56 afc42cf2ab lowered opacity
8 years ago
Fan-Wu Yang 1ffef51d7c Changed local ip detection to use regex
8 years ago
hba56 50125e0151 moved minimap to left so does not overlap with speedo
8 years ago
Fan-Wu Yang ffa1d8b0c4 Deleted Print Statement
8 years ago
Fan-Wu Yang 52271d580f CHanged ip to local ip because port forwarding may be subjective to change.
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
Connor Taylor-Brown b0bc7f50f2 Updated FXMLs to add depleting tomato
8 years ago
Fan-Wu Yang fec421da00 Removed println messages
8 years ago
Fan-Wu Yang 30087ed9bd Merge branch 'master' into newHostServer
8 years ago
Fan-Wu Yang 3c9e520d9f Merged in null pointer issue.
8 years ago
Fan-Wu Yang bb0c1d1780 Merge branch 'nullptr_finish_race_arrow' into newHostServer
8 years ago
Fan-Wu Yang b0857debeb Merge remote-tracking branch 'origin/nullptr_finish_race_arrow' into newHostServer
8 years ago
Fan-Wu Yang b550afcca7 Merged race scaling with Http Match Discovery.
8 years ago
Connor Taylor-Brown 23040ecff4 Created separate listeners for all boats' and player boat health
8 years ago
Fan-Wu Yang ac5423263c Merge remote-tracking branch 'origin/scale_maps_spike' into newHostServer
8 years ago
Connor Taylor-Brown 0d89574c1f RaceViewController listens to health changes on the local player's boat
8 years ago
Connor Taylor-Brown 7eb59cdcfc Allowed fractional health deductions per frame
8 years ago
Connor Taylor-Brown 50d5dd02a2 BoatState message can be received from mock by visualiser
8 years ago
Connor Taylor-Brown a295728e89 Created encoder and decoder for BoatState messages (HP packets)
8 years ago
hba56 f7d866144a Map now only shows annotations when in full screen
8 years ago
zwu18 4132b6733b Fixed small display error with current position. #story[1311]
8 years ago
zwu18 051811b97d Merge branch 'master' into story_speedometer
8 years ago
zwu18 be9feff6fd Layout changes to speedometer UI. #story[1311]
8 years ago
zwu18 201b9f0051 Linked users boat speed up with speedometer UI. #story[1311]
8 years ago
zwu18 eea394372f Race is now showing a speedometer in the bottom right corner. Next step is to update with speed of boat and improve appearance. #story[1311]
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
Joseph Gardner cfdbf5896f Added basic highlighting to player boat. #story[1298]
8 years ago
Joseph Gardner 3ca62e6c2b Added basic highlighting to player boat. #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
Fan-Wu Yang f7da497743 Resizing maps to time taking now works #story[1323]
8 years ago
fjc40 424cd63c59 Should fix the race xml issues where boats get unassigned sometimes.
8 years ago
fjc40 acd99f58cd Merge remote-tracking branch 'origin/master' into nullptr_finish_race_arrow
8 years ago
hba56 f3f60acac6 resize map
8 years ago
hba56 731be68831 test for a minimap
8 years ago
Fan-Wu Yang 9d1145b298 Changed back to CI IP to test on CI
8 years ago
fjc40 75c15d492e There was a null pointer exception when finishing the race, as the finish leg doesn't have compound marks.
8 years ago
fjc40 eacbe8d8ea Merge remote-tracking branch 'origin/master' into boat_movement_smooth
8 years ago
Fan-Wu Yang 0348b0c642 Merged in master
8 years ago
Fan-Wu Yang c91c4e5d7c Merge branch 'master' into network_on_VPS
8 years ago
Fan-Wu Yang 4970f52c3a Merge remote-tracking branch 'origin/master' into network_on_VPS
8 years ago
Fan-Wu Yang 34a803f92e More changes
8 years ago
Fan-Wu Yang 22e9db473e Removed test that took a manditory socket
8 years ago
fjc40 2c92102b2a Changed GraphCoordinate to use double instead of int.
8 years ago
fjc40 191f249bfb Speed scale is 2, rather than 10.
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 e0d886ffb2 overlay off by default
8 years ago
hba56 3131d67cf2 Merge remote-tracking branch 'remotes/origin/master' into scoreTable
8 years ago
fjc40 ae9594f8c3 Removed a println and fixed some javadoc warnings.
8 years ago
fjc40 47d013612a Fix for null pointer exception when finishing race.
8 years ago
hba56 88f1a393f2 Made the info tab into an overlay
8 years ago
fjc40 24b068f249 Collision effect uses color.transparent instead of a custom transparent color.
8 years ago
fjc40 536428ce16 There was a null pointer exception related to going into/leaving third person camera and the arrow annotation.
8 years ago
fjc40 f308f5b8f3 Visualiser model thread was updating GUI instead of fx thread.
8 years ago
Connor Taylor-Brown 8d9624db96 Recovered sails smoothing
8 years ago
Connor Taylor-Brown 90c258e9e9 Reset collision tag on visualiser boat after displaying collision
8 years ago
hba56 c17900a461 Merge remote-tracking branch 'remotes/origin/master' into scoreTable
8 years ago
David Wu e345ecdec1 Removed sout statements.
8 years ago
Joseph Gardner f794aec4c8 boundaries are annotations.
8 years ago
Joseph Gardner 7fa2037753 Merge remote-tracking branch 'origin/storyD-3D' into storyD-3D
8 years ago
Fan-Wu Yang 2383915c78 Merged #story[1195]
8 years ago
Joseph Gardner c42e25df86 Merge branch 'master' into storyD-3D
8 years ago
Joseph Gardner 55713f14a1 Merge branch 'master' into storyD-3D
8 years ago
Fan-Wu Yang d70f556741 Changed arrow to next mark appearance #story[1195]
8 years ago
Joseph Gardner 7bea2fee73 Merge branch 'storyA_sounds' into storyD-3D
8 years ago
Joseph Gardner 14b5f4bdf1 Merge branch 'master' into storyD-3D
8 years ago
hba56 86de4e7c0c Merge remote-tracking branch 'origin/master'
8 years ago
hba56 004aebceb5 fix null pointer when playing tutorial
8 years ago
cbt24 02b4146fa3 Amended collision effect radius
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
cbt24 7d58b05e38 Fixed collision not fading to zero
8 years ago
cbt24 cdc7b642db Boat now shows a fading collision effect
8 years ago
Fan-Wu Yang f541a13235 Tried to get lobby working #story[1188]
8 years ago
Joseph Gardner 1166c0a4fb Merged sounds. #story[1196]
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
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