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

Commit Graph

  • c74cc26bf1 Merged with master and changed View3D default background - Removed sparkline from RaceController Connor Taylor-Brown 2017-09-05 12:17:55 +12:00
  • b8c99be201 Merge branch 'master' into storyD-3D Connor Taylor-Brown 2017-09-05 00:17:22 +12:00
  • 4a0d04d7ab Created new abstract Controller class with load methods. Jessica Syder 2017-09-04 23:10:25 +12:00
  • 971a061499 View3D within RaceController now tracks boat heading - Race leaves lobby on Warning status for development - Latest subject added is used as camera pivot cbt24 2017-09-04 18:51:37 +12:00
  • 1073113589 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit Jessica Syder 2017-09-04 15:31:52 +12:00
  • 28d27a7b2b Merge branch 'C_keybindings' into 'master' Hamish Ball 2017-09-04 15:27:36 +12:00
  • 8287fbf6ba Updated the HostGame window to support maps #story[1193] hba56 2017-09-04 15:05:31 +12:00
  • 71dcc8ee6c Added POlar Linear Interpolation #story[1186] Fan-Wu Yang 2017-09-04 14:17:13 +12:00
  • 8c1eded926 Boat collision packets are now sent. Command class created for boat collision. Currently prints out message depending on if user crashed or someone else crashed. #story[1195] David Wu 2017-09-04 14:06:38 +12:00
  • 35c595adf8 Merge branches 'master' and 'storyD-3D' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into storyD-3D Jessica Syder 2017-09-04 14:00:20 +12:00
  • addaaf0de3 Merge remote-tracking branch 'remotes/origin/master' into C_keybindings Jessica Syder 2017-09-04 13:23:55 +12:00
  • e8977eb0c4 Merge branch '77_racexml_updates' into 'master' Jessica Syder 2017-09-04 13:14:09 +12:00
  • 85eb66d508 Keybindings can be saved and loaded, and work when Jar'd! Jessica Syder 2017-09-04 12:30:01 +12:00
  • 361856ea1d Updated timescale. fjc40 2017-09-04 11:38:45 +12:00
  • dd1cb89b66 Merge remote-tracking branch 'origin/master' into 77_racexml_updates fjc40 2017-09-04 11:28:21 +12:00
  • f1c07bca46 Linked table to show games from received packets. #story[1188] Joseph 2017-09-04 09:53:26 +12:00
  • f8e1a539c2 Linked table to show games from received packets. #story[1188] Joseph 2017-09-04 09:46:13 +12:00
  • 0ee448e17d Created wrapper for controlling the position and heading of rendered 3D models. - Updated View3D to use Subject3D wrappers instead of Shape3D - Fixed HostController for the new architecture - Made position and heading observable in VisualiserBoat - Attached listeners to each VisualiserBoat in RaceController Connor Taylor-Brown 2017-09-04 01:27:29 +12:00
  • 368bb8ddb3 Changed reporting plugin settings and specified central repository Connor Taylor-Brown 2017-09-03 23:35:18 +12:00
  • cd685ae467 Added sound effect files for button clicks and mark rounding and linked them up to application. Collision audio is added too but not linked up. #story[1195] zwu18 2017-09-03 21:22:26 +12:00
  • cfa6fc37e0 User modified keybindings are persistently saved Jessica Syder 2017-09-03 20:44:27 +12:00
  • df03cc5a66 Merge branch 'story86-3D' into 'master' Fraser Cope 2017-09-03 17:10:14 +12:00
  • e3cbb6d482 Start game button actually starts the game. fjc40 2017-09-03 16:39:59 +12:00
  • ac891fa91c Fixed tests. fjc40 2017-09-02 01:03:47 +12:00
  • 16bf57e333 javadoc fixes. fjc40 2017-09-02 00:45:08 +12:00
  • 8c76d6c26e Added boats.xml schema. RaceServer now creates an XMLMessage when the race's BoatDataSource changes. #story[1188] fjc40 2017-09-02 00:34:41 +12:00
  • 298fcd03dc Added regatta schema. RaceServer now creates an XMLMessage when the race's RegattaDataSource changes. #story[1188] fjc40 2017-09-02 00:33:09 +12:00
  • ec58f0c847 Participants can now join during the warning period as well. Added RaceDataSourceToXML. RaceServer now create an XMLMessage when the race's RaceDataSource changes. #story[1188] fjc40 2017-09-02 00:27:44 +12:00
  • 34cfe48df0 Got VMG quad detection working, however, the speeds are completley wrong. #story[1186] Fan-Wu Yang 2017-09-01 20:30:28 +12:00
  • abf325e5ea Passing a mark will now play a sound. Currently using placeholder sound so will ned to change. #story[1195] David Wu 2017-09-01 19:30:27 +12:00
  • 66699a4660 Added a draft for a new Course layout #story[1193] hba56 2017-09-01 14:31:01 +12:00
  • 3fdfbd83e0 User can save, reset or cancel. Jessica Syder 2017-09-01 14:29:18 +12:00
  • c3be9665ac Added button press sounds for hosting a game, entering lobby list and entering host menu. #story[1195] David Wu 2017-09-01 14:10:01 +12:00
  • 086206a623 Controls button in title screen now opens the key mapping menu. #story[1197] David Wu 2017-09-01 13:44:09 +12:00
  • 65b960f725 Background of title now changes colour depending on day mode and night mode. Sun image also changes. This is so that the tutorial label is more visible during night mode. #story[1189] David Wu 2017-09-01 13:28:05 +12:00
  • ec5bc9c6aa Wind now will occasionally back and veer (in some games, takes ~20min for full 180 degree rotation) #story[1188] hba56 2017-09-01 13:19:59 +12:00
  • ea029baf22 Tutorial option in title screen will now created a game with tutorial xmls. Host game will now created a game with the race xml instead of tutorial xml as well. Made changes to tutorial label in title. #story[1189] David Wu 2017-09-01 12:28:09 +12:00
  • 5676d435b0 hosts now send info then wait rather than wait then send #story[1188] hba56 2017-09-01 12:20:48 +12:00
  • 42ac733d72 Flush match table on a scheduled rate. Connor Taylor-Brown 2017-09-01 11:57:24 +12:00
  • 9156bde8af Moved XML message creation to RaceServer instead of ConnectionAcceptor. RaceServer does not currently generate new XMLMessages - NYI. Added a sequence number to RaceDataSource - this is used to indicate that the data source has been modified. #story[1188] fjc40 2017-09-01 01:19:17 +12:00
  • d0eebcdb2f SourceIdAllocator now allocates from the BoatDataSource and RaceDataSource exposed by MockRace, instead of having its own source IDs. Can only allocate ids during PRESTART period. RaceLogic now calls MockRace.initialiseBoats() after the prestart period has finished. MockRace create a VisualiserBoat when a source ID is allocated. MockOutput now sends updated XML messages during the race, instead of only at the start. #story[1188] fjc40 2017-09-01 01:14:43 +12:00
  • 716a99aac7 Reset to default button is now functional. Jessica Syder 2017-08-31 22:58:35 +12:00
  • 3e720a9e16 Modified key bindings can be saved to use in a race. Jessica Syder 2017-08-31 22:47:57 +12:00
  • 278fb65852 Pressing ESC cancels the selected command's key from being replaced Jessica Syder 2017-08-31 22:39:19 +12:00
  • ce47b0d813 When a new key is bound other commands bound to this key are removed Jessica Syder 2017-08-31 22:28:55 +12:00
  • 2188ddc3a3 Fixed errors in making the keybinding replaceable. Jessica Syder 2017-08-31 21:59:28 +12:00
  • 3176e76c8c MockRace: Now uses RaceState as its base class, rather than Race. This aligns it with VisualiserRace. RaceState contains the shared race state between the client and server, and stores most of its data in RaceDataSource etc..., instead of maintaining its own copy. Moved collider registry member to MockRace. fjc40 2017-08-31 21:06:13 +12:00
  • c7af4f2eb7 Made changes to tutorial xmls. Linked button in title menu to start up a race on mouse click. Will need to make it so it starts the tutorial on click. #story[1189] zwu18 2017-08-31 19:54:22 +12:00
  • 9a5d20bdf2 Added new polar function, currently it does not distinguish between up wind and downwind and doesn't find it in the correct quadrant #story[1186] Fan-Wu Yang 2017-08-31 17:39:17 +12:00
  • 2f8daf757a Added scheduled match list broadcast to MatchBrowser - Changed MatchTable to map ClientAddress to HostGame - Send match list as HostedGamesRequest to multicast address (239.0.0.1:4941) cbt24 2017-08-31 17:34:02 +12:00
  • d1c0797db7 hosting a game now continues to send out the info of the race #story[1188] hba56 2017-08-31 15:06:43 +12:00
  • 8250226bde Key bindings can be updated with any key. Jessica Syder 2017-08-31 15:00:37 +12:00
  • a1fa09962a matching table now stores the correct ip of the hosts #story[1188] hba56 2017-08-31 13:55:16 +12:00
  • 9161f69547 updating match table to store ip and port of clients and hosts #story[1188] hba56 2017-08-31 13:45:04 +12:00
  • 0de7780020 Changed wind speed to be non-linear. #story[1187] Joseph 2017-08-31 12:26:30 +12:00
  • 3cc806dc45 Returned rotation to boat in lobby Connor Taylor-Brown 2017-08-31 01:06:33 +12:00
  • fb7bf572d8 Changed View3D add-remove interface to an ObservableList Connor Taylor-Brown 2017-08-31 00:59:36 +12:00
  • b6e56d815c ResizableRaceCanvas no longer depends on VisualiserRaceEvent Connor Taylor-Brown 2017-08-30 18:52:29 +12:00
  • ad0e26e882 Created scene to view/update current key bindings. Jessica Syder 2017-08-30 17:16:15 +12:00
  • c2fd5c9bae Changed box to boat mesh - Mesh needs to be rotated -90 degrees on X - STL file has been added to assets Connor Taylor-Brown 2017-08-30 15:49:20 +12:00
  • 960b1213fb fix so that test pass #story[1188] hba56 2017-08-30 15:31:28 +12:00
  • 83f756d7d8 packets can now be sent from client to match server #story[1188] hba56 2017-08-30 15:26:54 +12:00
  • cc66d63096 Removed unused shapes list from View3D Connor Taylor-Brown 2017-08-30 15:18:08 +12:00
  • bb7eb7cb44 Added adapter interface for PerspectiveCamera frustum and transformations in View3D. - Tested interface while initialising HostController Connor Taylor-Brown 2017-08-30 15:05:08 +12:00
  • 86f1a608e4 Created xml for tutorial that contains start and finish line. TODO: Add gate/mark. #story[1189] David Wu 2017-08-30 14:51:56 +12:00
  • e04f199fc7 Merge branch 'story86-3D' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story86-3D Connor Taylor-Brown 2017-08-30 13:57:35 +12:00
  • e7164d8a78 View3D perspective camera is now operational Connor Taylor-Brown 2017-08-30 13:57:15 +12:00
  • 4910d2712c Changed STL Importers Version #story[1191] Fan-Wu Yang 2017-08-30 13:56:57 +12:00
  • 23d58dc809 Created UI option in the start menu to play a practice game. #story[1189] David Wu 2017-08-30 13:26:18 +12:00
  • 921e0999b8 Testing if dependency for stl works this time #story[1191] Fan-Wu Yang 2017-08-30 13:01:37 +12:00
  • 0927e62ea3 Changed dependency to see if it will pass the CI runner #story[1191] Fan-Wu Yang 2017-08-30 12:46:05 +12:00
  • b2bd4fdc1c network interface hba56 2017-08-30 12:13:17 +12:00
  • 028428da2c Fixed fxml issues due to merge. Added pane centering for panes. #story[1188] David Wu 2017-08-30 12:04:17 +12:00
  • d2f0c1105a Merged 3d branch. Added 3d item to one of the player pane. #story[1188] David Wu 2017-08-30 11:52:45 +12:00
  • b724a814b1 Merge branch 'story86-3D' into story77_lobby David Wu 2017-08-30 11:46:00 +12:00
  • d65ce1a897 Merge branch 'story77' into story77_lobby David Wu 2017-08-30 11:40:19 +12:00
  • 88782182d7 Player panes and spectator list now call method on click. Will later be used for players to choose whether they want to play or spectate. #story[1188] David Wu 2017-08-30 11:39:41 +12:00
  • cf838f2072 Added View3D control for rendering 3D shapes under a PerspectiveCamera, which is not currently working. Connor Taylor-Brown 2017-08-30 01:30:05 +12:00
  • d630788a14 Merge remote-tracking branch 'remotes/origin/story77_lobby' into story86-3D Connor Taylor-Brown 2017-08-29 22:55:07 +12:00
  • 43ec179d79 Merge branch 'story86-3D' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story86-3D Fan-Wu Yang 2017-08-29 20:36:15 +12:00
  • ea41c64c34 Added dependency for stl converter #story[1191] Fan-Wu Yang 2017-08-29 20:36:08 +12:00
  • 7df181c759 Minor changes to new lobby fxml. #story[1188] David Wu 2017-08-29 19:08:22 +12:00
  • 892320db5f Added javadoc and extra files to push David Wu 2017-08-29 19:03:34 +12:00
  • 0621e1bdb1 Finished up lobby menu. Set split pane to not change size on resize. Disabled divider on split pane. Added quit button and start button (start only prints to terminal for now). Panes are now wrapped in an anchor pane to fix resizing issues. TODO: Will be working on making a nicer background animation. David Wu 2017-08-29 19:02:02 +12:00
  • b0f7c5e734 Wind speed changes depending on where the wind direction is. #story[1187] Joseph Gardner 2017-08-29 15:53:41 +12:00
  • ca0a3f2a8b encoders and decoders for the hosted games request message with datatype and test #story[1188] hba56 2017-08-29 15:28:03 +12:00
  • c63403d1de Created new lobby menu. Working on animated background for menu. David Wu 2017-08-29 15:11:09 +12:00
  • d0ba7b93e0 Wind oscillates, replaces random wind with shifting wind. #story[1187] Joseph Gardner 2017-08-29 14:40:52 +12:00
  • cb8e81a7b2 encoders and decoders for the host game message with datatype and test #story[1188] hba56 2017-08-29 14:38:42 +12:00
  • 1b1b0a4591 Added floating test cube in title screen initialiser cbt24 2017-08-29 14:38:27 +12:00
  • 0be5b731c3 Merge branch 'master' into wind_(story53) Joseph Gardner 2017-08-29 13:22:15 +12:00
  • 12e2ae9c01 Started implementing wind oscillation. #story[1187] Joseph Gardner 2017-08-29 13:21:34 +12:00
  • 5b6b0a9978 added the new program for holding known games #stroy[1188] hba56 2017-08-29 12:57:19 +12:00
  • 64e96a1b8b Class for shifting wind. #story[1187] Joseph Gardner 2017-08-29 12:14:28 +12:00
  • 7086af6057 Merge branch 'demo_6_no_rotation' into 'master' Hamish Ball 2017-08-29 11:16:47 +12:00
  • eb980c436e Wind arrow now points in the direction the wind is blowing, as per P.O feedback (again....). fjc40 2017-08-18 22:58:47 +12:00
  • a9fde95b39 Updated maven version to 2.0. Added a dedicatedServer module. Removed Visualiser module. Removed mock module. Removed network module. Fixed weird exception non-handling that appeared for some reason. fjc40 2017-08-18 22:55:50 +12:00
  • 0d2be85d17 Brought over long/latitude fix from "rounding_line_visible_hack" branch. fjc40 2017-08-18 21:58:31 +12:00
  • b886cb426f guide line last leg fix hba56 2017-08-17 22:38:31 +12:00
  • 666c7b029f Disabled map rotation - temp fix for the demo. Set race to use 3 boat race.xml file. fjc40 2017-08-17 22:26:56 +12:00