michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 06:18:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Commit Graph

  • a6c9156ae5 Changed Main-Class in pom.xml to our new main class Michael Rausch 2017-03-17 10:26:09 +13:00
  • 121f996a43 created config, teams xml file, and teamsParser class Haoming Yin 2017-03-17 01:04:10 +13:00
  • 44d4f25413 Implemented Color Enum & boat will call function from enum to get next color. Using static colour cycling for now. Ryan Tan 2017-03-17 00:57:50 +13:00
  • 16abfcffda Created course parser as a subclass of file parser Haoming Yin 2017-03-17 00:54:43 +13:00
  • e7ba9d962d Deleted and modified previous sprint parser to cater the sprint2’s new requirement Haoming Yin 2017-03-17 00:53:08 +13:00
  • b7631c0b46 Create unit test for course parser, and modified course xml file Haoming Yin 2017-03-17 00:51:16 +13:00
  • 0039703f03 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 Michael Rausch 2017-03-16 20:50:41 +13:00
  • d439c9673f removed intellij files #chore Michael Rausch 2017-03-16 20:50:27 +13:00
  • f255b0ea6d Add intellij file type to .gitignore. Haoming Yin 2017-03-16 20:47:55 +13:00
  • 9d01ed8eb3 Merge branch 'refactor-events-to-update-boat-positions' into 'master' Michael Rausch 2017-03-16 20:30:48 +13:00
  • 94e4e853c3 Removed Legs from the race, using coordinates instead Michael Rausch 2017-03-16 20:29:17 +13:00
  • ffa39e6a9c Changed size of canvas to 720 x 360 Ryan Tan 2017-03-16 17:40:31 +13:00
  • 9e4ae60885 Added a function to draw boat on canvas Ryan Tan 2017-03-16 17:25:17 +13:00
  • 2cd4366d07 added course xml file #story[378] Peter 2017-03-16 17:15:45 +13:00
  • 11c5e1e9ba Added gate mark and refactored marker to mark #story[378] Peter 2017-03-16 16:11:48 +13:00
  • 550812d8e1 Currently displaying basic javafx window with canvas. Also changed the file structure a bit. At this point the javafx is not tied to the old code in any way #story[377] Peter 2017-03-15 18:16:43 +13:00
  • 9ca5f5e7fd Updated design decision file in doc. sprint_1.2 Haoming Yin 2017-03-09 16:22:40 +13:00
  • abc5df7837 Added unit for boat velocity sprint_1.1 Haoming Yin 2017-03-09 15:00:48 +13:00
  • debe2c0cca Fixed documentation for FileParserTest and LegTest Haoming Yin 2017-03-09 14:52:13 +13:00
  • cfa851b968 Added user manual Michael Rausch 2017-03-09 12:54:37 +13:00
  • 37f4b55b04 Merge branch 'read_config_from_args' into 'master' Michael Rausch 2017-03-09 12:42:53 +13:00
  • c1aa38c1b0 Added ability to pass the config file as a command line argument Michael Rausch 2017-03-09 12:41:44 +13:00
  • 260bf06219 Merge branch 'make-tests' into 'master' Michael Rausch 2017-03-09 12:23:23 +13:00
  • 8d85557e10 Added tests Michael Rausch 2017-03-09 12:22:38 +13:00
  • d33a88d313 Added docstrings to classes Tags: #docs Michael Rausch 2017-03-08 23:02:45 +13:00
  • d3b71c21e5 Merge branch 'format-and-doc' Michael Rausch 2017-03-08 22:57:59 +13:00
  • d10c6a54f5 Added and fixed docstrings Tags: #docs Michael Rausch 2017-03-08 22:53:22 +13:00
  • 0a86dde7e4 Fixed docstrings Michael Rausch 2017-03-08 22:31:05 +13:00
  • ae80b434f6 Added and fixed docstrings Michael Rausch 2017-03-08 22:25:52 +13:00
  • 2d7ee975af Added docstrings for Marker class sprint_1.0 Michael Rausch 2017-03-08 14:56:28 +13:00
  • b0cd7c8c08 Reformatted doctring and import statements Haoming Yin 2017-03-08 14:45:06 +13:00
  • 27f9776de8 Fixed typo Michael Rausch 2017-03-08 14:28:51 +13:00
  • 245fbc75c2 Fixed file parser test Haoming Yin 2017-03-08 14:25:41 +13:00
  • 0efb18b04d Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 Michael Rausch 2017-03-08 14:20:38 +13:00
  • 05a2c441b3 Merge branch 'fix-headings' Michael Rausch 2017-03-08 14:20:10 +13:00
  • 16b58dcbaf Fixed conflict Michael Rausch 2017-03-08 14:19:54 +13:00
  • 0ab2e7881f Fixed fileParser in order to read time scale in decimal Haoming Yin 2017-03-08 14:13:23 +13:00
  • 92556fffca Fixed incorrect headings and velocity display location Michael Rausch 2017-03-08 14:11:09 +13:00
  • 2adf39ee43 Merge remote-tracking branch 'origin/master' Haoming Yin 2017-03-08 13:33:22 +13:00
  • 2b464d16f9 Fixed some bugs /#pair[hyi25, mra106] Haoming Yin 2017-03-08 13:31:44 +13:00
  • 4a0776fcda Merge branch 'add-speed-to-starting-list' into 'master' Michael Rausch 2017-03-08 13:29:13 +13:00
  • bc6762d2dd Moved boat velocity to starting list Michael Rausch 2017-03-08 13:28:00 +13:00
  • 88167773dd Merge branch 'story-7' into 'master' Michael Rausch 2017-03-08 12:34:27 +13:00
  • ab1445f1c2 Race events now display the boats heading and direction Michael Rausch 2017-03-08 12:31:31 +13:00
  • 76faa53222 Merge branch 'calculate-time' into 'master' Haoming Yin 2017-03-07 21:33:12 +13:00
  • 78dea7daac Added function to generate events for race Haoming Yin 2017-03-07 21:30:48 +13:00
  • 17fbb1212d Added Event class and junit test Haoming Yin 2017-03-07 20:30:23 +13:00
  • a3c1630e2e Updated boat class constructor Haoming Yin 2017-03-07 20:28:45 +13:00
  • 5c362245a4 Added velocity related methods into Boat class. Haoming Yin 2017-03-07 19:34:37 +13:00
  • 6ce9674e64 Added method to calculate distance travelled given velocity Haoming Yin 2017-03-07 00:25:10 +13:00
  • da896cddfd Merge branch 'update-app-to-read-team' into 'master' Haoming Yin 2017-03-06 22:23:45 +13:00
  • f2c2f84b4c Updated App class to read team names Haoming Yin 2017-03-06 22:17:38 +13:00
  • 8284d32e23 Merge branch 'set-config-file' into 'master' Haoming Yin 2017-03-06 21:54:06 +13:00
  • 0e562a38e2 Merge branch 'update-parser' into 'master' Haoming Yin 2017-03-06 21:51:02 +13:00
  • 85b8047229 Updated FileParser to read team name, boat velocity, and race size. Haoming Yin 2017-03-06 21:44:31 +13:00
  • c9b0942e07 Updated unit test for future FileParser Haoming Yin 2017-03-06 21:39:53 +13:00
  • 90aed14ddc Updated test file for unit test Haoming Yin 2017-03-06 21:38:25 +13:00
  • fd2b473a7e Merge branch 'story-4' into 'master' Michael Rausch 2017-03-06 19:39:54 +13:00
  • 9b1d90d2bf Added a class for the marker, and added documentation Michael Rausch 2017-03-06 19:31:25 +13:00
  • 8c0cc67ae3 Add tests for the Leg class Michael Rausch 2017-03-06 19:29:47 +13:00
  • 33efe57ba4 Added updated config file within team name, velocity and race-size. Haoming Yin 2017-03-06 18:40:39 +13:00
  • 9453307fd4 Implemented leg class and added legs to the race Michael Rausch 2017-03-06 17:56:07 +13:00
  • 597c1ae955 Merge branch 'use-config-file-to-load-boats' into 'master' Michael Rausch 2017-03-06 12:10:17 +13:00
  • 764aac4b7c Added method to create the race with names from the config file Michael Rausch 2017-03-06 12:07:21 +13:00
  • 075395919c Merge branch 'file-parser' into 'master' Haoming Yin 2017-03-06 11:07:25 +13:00
  • c197083d7c Created FileParser class Haoming Yin 2017-03-05 21:41:50 +13:00
  • b9b3409591 Added tests for FileParser class, as well as test files Haoming Yin 2017-03-05 21:21:22 +13:00
  • 62fe8a3e01 Added Json-simple dependency to Maven Haoming Yin 2017-03-05 18:01:37 +13:00
  • e6d899f7b1 Fixed a test for the Race class Michael Rausch 2017-03-04 19:34:36 +13:00
  • c1cc4f8b69 Merge branch 'story1-team-names' into 'master' Michael Rausch 2017-03-04 19:32:33 +13:00
  • 1b345d4747 Added tests for the Race class Michael Rausch 2017-03-04 19:30:00 +13:00
  • 5492ace1a3 Display the boats competing in the race Michael Rausch 2017-03-04 19:13:01 +13:00
  • d4deedcf6b Merge branch 'create-race-class' into 'master' Michael Rausch 2017-03-03 18:44:14 +13:00
  • 6702d24fd5 Display the order the boats finished in Michael Rausch 2017-03-03 18:39:15 +13:00
  • 4b2141190d Added tests for the Race class #test Michael Rausch 2017-03-03 18:23:24 +13:00
  • 33994bd3e4 Implemented 'Race' class Michael Rausch 2017-03-03 18:06:51 +13:00
  • 45eec5a288 Added personal email address to .mailmap Michael Rausch 2017-03-03 16:32:37 +13:00
  • c72ec1b923 Merge branch 'create-team-class' into 'master' Michael Rausch 2017-03-03 16:24:07 +13:00
  • 527afdb4a9 Created boat class & tests Michael Rausch 2017-03-03 16:22:31 +13:00
  • 7ef64ad7a0 Moved CI runner set-up instructions to student guide. SENG302 2017-02-03 00:22:39 +13:00
  • fea7c98874 Added .mailmap file (includes basic info for students) SENG302 2016-07-31 14:50:37 +12:00
  • bf3a0eb713 update maven pom SENG302 2016-03-02 12:57:45 +13:00
  • 9649f67863 initial commit SENG302 2016-02-29 07:35:27 +13:00