1367 Commits (6c78e5d0b534530b7d0ba21ff162a1d40ac8b87f)
 

Author SHA1 Message Date
Connor Taylor-Brown 6c78e5d0b5 Tomato now depletes as expected
8 years ago
Connor Taylor-Brown 10008f5452 Depleting tomato now watches player health
8 years ago
Connor Taylor-Brown b0bc7f50f2 Updated FXMLs to add depleting tomato
8 years ago
Connor Taylor-Brown 23040ecff4 Created separate listeners for all boats' and player boat health
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
Hamish Ball ccbe3f86ea Merge branch 'spectate_mode_basic' into 'master'
8 years ago
hba56 d3f1e3baa4 Merge remote-tracking branch 'remotes/origin/master' into spectate_mode_basic
8 years ago
Fan-Wu Yang 9d1145b298 Changed back to CI IP to test on CI
8 years ago
Fraser Cope 11a50b6f09 Merge branch 'boat_movement_smooth' into 'master'
8 years ago
fjc40 eacbe8d8ea Merge remote-tracking branch 'origin/master' into boat_movement_smooth
8 years ago
Fan-Wu Yang d660cd9e78 Merge branch 'network_on_VPS' into 'master'
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
Hamish Ball 97aa917403 Merge branch 'boat_color_and_speed' into 'master'
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
Fraser Cope a6aeab5ee3 Merge branch 'scoreTable' into 'master'
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
Fraser Cope 94b5f06ede Merge branch 'issue55-collision' into 'master'
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
Hamish Ball 0888a743a7 Merge branch 'storyD-3D' into 'master'
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