fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 91c442e465 Set up architecture for next mark arrow and did a 2d template when the camera is zoomed out. #story[1299] Joseph 2017-09-21 22:25:39 +12:00
  • 4242d05279 fixed issue with being unable to click through minimap #story[1295] hba56 2017-09-21 20:34:21 +12:00
  • 2cf0cca157 Can no longer click around the boat highlighting. #fix #story[1298] Joseph 2017-09-21 16:51:00 +12:00
  • 5473fde731 Merge remote-tracking branch 'remotes/origin/master' into story1291-hp Connor Taylor-Brown 2017-09-21 12:49:27 +12:00
  • eee0b414f8 made trackpoints cap at 50. This fixes fps issues with the minimap. #fix #story[1295] David Wu 2017-09-21 12:42:09 +12:00
  • 6c78e5d0b5 Tomato now depletes as expected Connor Taylor-Brown 2017-09-21 12:10:33 +12:00
  • cf9acabd97 Boat sails now luff and stay when in the direction of the wind #story[1297] Fan-Wu Yang 2017-09-21 02:35:01 +12:00
  • c9177da85c Deleted another dead line #story[1297] Fan-Wu Yang 2017-09-21 02:22:34 +12:00
  • ed11f7d56c forgot to removed a dead line #story[1297] Fan-Wu Yang 2017-09-21 02:22:04 +12:00
  • 2389aa361c Boats sails can luff and are now two piece. #story[1297] Fan-Wu Yang 2017-09-21 02:21:02 +12:00
  • 10008f5452 Depleting tomato now watches player health - [BUG] Tomato fills up instead of depleting Connor Taylor-Brown 2017-09-21 01:42:53 +12:00
  • add1d3996d Set map colour back to a lighter colour as it didnt work as well on lower grade monitors #story[1195] hba56 2017-09-21 00:04:07 +12:00
  • dacaf58271 Merge remote-tracking branch 'remotes/origin/master' into minimap_test hba56 2017-09-20 23:46:02 +12:00
  • 951c3771fa Merge branch 'newHostServer' into 'master' David Wu 2017-09-20 22:55:42 +12:00
  • b787b5a71b changed map to dodgerblue hba56 2017-09-20 22:25:18 +12:00
  • afc42cf2ab lowered opacity hba56 2017-09-20 22:22:07 +12:00
  • 1ffef51d7c Changed local ip detection to use regex Fan-Wu Yang 2017-09-20 22:07:46 +12:00
  • 50125e0151 moved minimap to left so does not overlap with speedo hba56 2017-09-20 22:03:22 +12:00
  • ffa1d8b0c4 Deleted Print Statement Fan-Wu Yang 2017-09-20 21:39:33 +12:00
  • 52271d580f CHanged ip to local ip because port forwarding may be subjective to change. Fan-Wu Yang 2017-09-20 21:38:49 +12:00
  • 3d292f784b Users can now resee the lobby after exit and reentering, and fixed concurrent alteration issue which was stopping players from exiting the lobby. Fan-Wu Yang 2017-09-20 18:46:33 +12:00
  • b0bc7f50f2 Updated FXMLs to add depleting tomato - Tab view now contains health column - BoatStateCommand now fails silently if command is received before race state is set up Connor Taylor-Brown 2017-09-20 18:22:14 +12:00
  • fec421da00 Removed println messages Fan-Wu Yang 2017-09-20 15:16:32 +12:00
  • 30087ed9bd Merge branch 'master' into newHostServer Fan-Wu Yang 2017-09-20 15:14:19 +12:00
  • 3c9e520d9f Merged in null pointer issue. Fan-Wu Yang 2017-09-20 15:07:22 +12:00
  • bb0c1d1780 Merge branch 'nullptr_finish_race_arrow' into newHostServer Fan-Wu Yang 2017-09-20 15:06:20 +12:00
  • b0857debeb Merge remote-tracking branch 'origin/nullptr_finish_race_arrow' into newHostServer Fan-Wu Yang 2017-09-20 15:05:26 +12:00
  • b550afcca7 Merged race scaling with Http Match Discovery. Fan-Wu Yang 2017-09-20 15:05:08 +12:00
  • 23040ecff4 Created separate listeners for all boats' and player boat health Connor Taylor-Brown 2017-09-20 14:34:22 +12:00
  • ac5423263c Merge remote-tracking branch 'origin/scale_maps_spike' into newHostServer Fan-Wu Yang 2017-09-20 14:29:44 +12:00
  • 0d89574c1f RaceViewController listens to health changes on the local player's boat Connor Taylor-Brown 2017-09-20 14:29:31 +12:00
  • 7eb59cdcfc Allowed fractional health deductions per frame - Fixed boundary penalty system Connor Taylor-Brown 2017-09-20 14:18:39 +12:00
  • 50d5dd02a2 BoatState message can be received from mock by visualiser - Basic penalties have been made for out of bounds and collisions - RaceServer packages and sends BoatState messages for each boat - ServerConnection routes BoatState messages instead of dropping by default - VisualiserRaceCommandFactory produces BoatStateCommands Connor Taylor-Brown 2017-09-20 14:07:50 +12:00
  • a295728e89 Created encoder and decoder for BoatState messages (HP packets) - Added new MessageType.BOATSTATE enum to support new message type - Modified EncoderFactory and DecoderFactory to support new enum - Verify that original and decoded messages match Connor Taylor-Brown 2017-09-20 00:52:06 +12:00
  • f7d866144a Map now only shows annotations when in full screen #story[1295] hba56 2017-09-19 22:08:27 +12:00
  • 4132b6733b Fixed small display error with current position. #story[1311] zwu18 2017-09-19 21:55:38 +12:00
  • 051811b97d Merge branch 'master' into story_speedometer zwu18 2017-09-19 21:45:00 +12:00
  • be9feff6fd Layout changes to speedometer UI. #story[1311] zwu18 2017-09-19 21:39:40 +12:00
  • ccbe3f86ea Merge branch 'spectate_mode_basic' into 'master' Hamish Ball 2017-09-19 21:23:14 +12:00
  • 201b9f0051 Linked users boat speed up with speedometer UI. #story[1311] zwu18 2017-09-19 21:10:48 +12:00
  • 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] zwu18 2017-09-19 18:23:45 +12:00
  • a82d3081fc Replace the class use of highlight with shockwave. #story[1298] Joseph Gardner 2017-09-19 15:43:22 +12:00
  • 9fbd5df626 Highlighting no longer goes over other boats. Player boat is highlighted in lobby. #story[1298] Joseph Gardner 2017-09-19 15:35:13 +12:00
  • cfdbf5896f Added basic highlighting to player boat. #story[1298] Joseph Gardner 2017-09-19 14:42:21 +12:00
  • 3ca62e6c2b Added basic highlighting to player boat. #story[1298] Joseph Gardner 2017-09-19 14:39:25 +12:00
  • 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. fjc40 2017-09-19 13:38:07 +12:00
  • d3f1e3baa4 Merge remote-tracking branch 'remotes/origin/master' into spectate_mode_basic hba56 2017-09-19 12:38:51 +12:00
  • 928f5e31f0 Hopefully final version of Hosting #story[1188] Fan-Wu Yang 2017-09-19 02:15:34 +12:00
  • f7da497743 Resizing maps to time taking now works #story[1323] Fan-Wu Yang 2017-09-18 18:22:20 +12:00
  • 424cd63c59 Should fix the race xml issues where boats get unassigned sometimes. This removes the static raceServer stuff. The Race/Boat/Regatta XML commands only execute if they contain newer data (it checks the sequence number). fjc40 2017-09-18 12:44:10 +12:00
  • acd99f58cd Merge remote-tracking branch 'origin/master' into nullptr_finish_race_arrow fjc40 2017-09-18 12:03:15 +12:00
  • f3f60acac6 resize map hba56 2017-09-18 10:44:34 +12:00
  • 731be68831 test for a minimap hba56 2017-09-18 10:22:01 +12:00
  • 9d1145b298 Changed back to CI IP to test on CI Fan-Wu Yang 2017-09-18 02:03:25 +12:00
  • 75c15d492e There was a null pointer exception when finishing the race, as the finish leg doesn't have compound marks. fjc40 2017-09-15 11:24:55 +12:00
  • 11a50b6f09 Merge branch 'boat_movement_smooth' into 'master' Fraser Cope 2017-09-15 10:04:00 +12:00
  • eacbe8d8ea Merge remote-tracking branch 'origin/master' into boat_movement_smooth fjc40 2017-09-15 09:04:42 +12:00
  • d660cd9e78 Merge branch 'network_on_VPS' into 'master' Fan-Wu Yang 2017-09-15 02:59:14 +12:00
  • 0348b0c642 Merged in master Fan-Wu Yang 2017-09-15 02:50:06 +12:00
  • c91c4e5d7c Merge branch 'master' into network_on_VPS Fan-Wu Yang 2017-09-15 02:47:50 +12:00
  • 4970f52c3a Merge remote-tracking branch 'origin/master' into network_on_VPS Fan-Wu Yang 2017-09-15 02:45:56 +12:00
  • 34a803f92e More changes Fan-Wu Yang 2017-09-15 02:39:47 +12:00
  • 22e9db473e Removed test that took a manditory socket Fan-Wu Yang 2017-09-15 02:28:09 +12:00
  • 2c92102b2a Changed GraphCoordinate to use double instead of int. This results in waaaaay smoother movement. Boats no longer jump around. fjc40 2017-09-15 01:34:32 +12:00
  • 97aa917403 Merge branch 'boat_color_and_speed' into 'master' Hamish Ball 2017-09-15 01:25:07 +12:00
  • 191f249bfb Speed scale is 2, rather than 10. Server simulates frames every 16ms rather than 50ms. fjc40 2017-09-15 01:00:26 +12:00
  • 5c58ca11ff Boats use their assigned color. Boat name is displayed in lobby instead of source ID. fjc40 2017-09-15 00:59:43 +12:00
  • eb2ed45ed2 Merge branch 'master' into spectate_mode_basic fjc40 2017-09-15 00:46:07 +12:00
  • a6aeab5ee3 Merge branch 'scoreTable' into 'master' Fraser Cope 2017-09-15 00:39:48 +12:00
  • e0d886ffb2 overlay off by default #story[1195] hba56 2017-09-14 23:53:13 +12:00
  • 3131d67cf2 Merge remote-tracking branch 'remotes/origin/master' into scoreTable hba56 2017-09-14 23:50:29 +12:00
  • 94b5f06ede Merge branch 'issue55-collision' into 'master' Fraser Cope 2017-09-14 23:47:28 +12:00
  • ae9594f8c3 Removed a println and fixed some javadoc warnings. fjc40 2017-09-14 23:46:54 +12:00
  • 47d013612a Fix for null pointer exception when finishing race. fjc40 2017-09-14 23:40:52 +12:00
  • 88f1a393f2 Made the info tab into an overlay #story[1195] hba56 2017-09-14 23:40:02 +12:00
  • 24b068f249 Collision effect uses color.transparent instead of a custom transparent color. fjc40 2017-09-14 23:33:23 +12:00
  • 536428ce16 There was a null pointer exception related to going into/leaving third person camera and the arrow annotation. fjc40 2017-09-14 23:11:52 +12:00
  • f308f5b8f3 Visualiser model thread was updating GUI instead of fx thread. fjc40 2017-09-14 23:08:58 +12:00
  • 8d9624db96 Recovered sails smoothing - Boat default position is now overridden only by collision command - Sails command overrides boat velocity Connor Taylor-Brown 2017-09-14 23:01:29 +12:00
  • 90c258e9e9 Reset collision tag on visualiser boat after displaying collision - Modified View3D to index subjects rather than shapes by source ID - Enforced one collision per boat on server to reduce rendering load - Changed collision radius to less than bounce radius - Fixed game-breaking null command bug Connor Taylor-Brown 2017-09-14 22:36:18 +12:00
  • c17900a461 Merge remote-tracking branch 'remotes/origin/master' into scoreTable hba56 2017-09-14 22:25:33 +12:00
  • 0888a743a7 Merge branch 'storyD-3D' into 'master' Hamish Ball 2017-09-14 16:57:17 +12:00
  • e345ecdec1 Removed sout statements. David Wu 2017-09-14 16:52:45 +12:00
  • f794aec4c8 boundaries are annotations. Joseph Gardner 2017-09-14 16:43:42 +12:00
  • 7fa2037753 Merge remote-tracking branch 'origin/storyD-3D' into storyD-3D Joseph Gardner 2017-09-14 16:42:39 +12:00
  • 2383915c78 Merged #story[1195] Fan-Wu Yang 2017-09-14 16:42:23 +12:00
  • c42e25df86 Merge branch 'master' into storyD-3D Joseph Gardner 2017-09-14 16:39:55 +12:00
  • 55713f14a1 Merge branch 'master' into storyD-3D Joseph Gardner 2017-09-14 16:37:58 +12:00
  • d70f556741 Changed arrow to next mark appearance #story[1195] Fan-Wu Yang 2017-09-14 16:36:17 +12:00
  • 7bea2fee73 Merge branch 'storyA_sounds' into storyD-3D Joseph Gardner 2017-09-14 16:36:05 +12:00
  • 14b5f4bdf1 Merge branch 'master' into storyD-3D Joseph Gardner 2017-09-14 16:34:28 +12:00
  • 86de4e7c0c Merge remote-tracking branch 'origin/master' hba56 2017-09-14 16:27:54 +12:00
  • 004aebceb5 fix null pointer when playing tutorial hba56 2017-09-14 16:27:36 +12:00
  • 02b4146fa3 Amended collision effect radius cbt24 2017-09-14 16:24:14 +12:00
  • 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] David Wu 2017-09-14 16:23:56 +12:00
  • 7d58b05e38 Fixed collision not fading to zero cbt24 2017-09-14 16:23:21 +12:00
  • cdc7b642db Boat now shows a fading collision effect cbt24 2017-09-14 16:22:04 +12:00
  • f541a13235 Tried to get lobby working #story[1188] Fan-Wu Yang 2017-09-14 15:54:48 +12:00
  • 4cb0948aaf Merge branch 'wind_arrow_direction_5' into 'master' David Wu 2017-09-14 14:45:51 +12:00
  • 1166c0a4fb Merged sounds. #story[1196] Joseph Gardner 2017-09-14 14:37:53 +12:00