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

  • 51f090324a CSS on annotation selection and minor bug fixes. Changed annotation slider to only have None, important and All William Muir 2017-05-15 16:44:28 +12:00
  • 335540ff4a Merge branch 'story36_elapsed_time' into 'develop' Michael Rausch 2017-05-15 16:33:21 +12:00
  • 5fa47ff65b Implemented elapsed time since last mark on annotation. Zhi You Tan 2017-05-15 16:31:04 +12:00
  • 3a1c1a5e43 Merge remote-tracking branch 'origin/develop' into story36_elapsed_time Zhi You Tan 2017-05-15 15:54:44 +12:00
  • 4c7f530458 Merge branch 'story33_add_estimated_time_annotation' into 'develop' Michael Rausch 2017-05-15 15:50:46 +12:00
  • 2e914a7704 Fixed estimate time to next mark to match acceptance criteria which is countdown in minutes and seconds. Zhi You Tan 2017-05-15 15:49:21 +12:00
  • 8fbb9d6d4e Added/improved documentation Calum 2017-05-15 15:36:18 +12:00
  • 23bc643c91 Removed some unused functions and imports caused by code refactor. Calum 2017-05-15 15:20:21 +12:00
  • c4fe116267 MarkGroups refactored to be independent of BoatGroups as their functionality has diverged. Calum 2017-05-15 15:17:54 +12:00
  • 081d7e3dcb Fixed the parsing of bytes being off by one byte in the stream parser fr the race status packet. Kusal Ekanayake 2017-05-15 14:52:57 +12:00
  • 764ae37ce4 Gave the boatgroups a selection attribute, allowing them to be highlighted upon clicking William Muir 2017-05-15 14:09:09 +12:00
  • e62a609b6b Prepared StreamParser.java, BoatGroup.java, Yacht.java for leg timer annotation (story 36) Zhi You Tan 2017-05-15 13:47:30 +12:00
  • 4b1a4aae87 Added unit tests for Mercator projection class. Haoming Yin 2017-05-15 13:23:04 +12:00
  • ccda5f2a2e changing branch name #story[923] Peter Galloway 2017-05-15 12:40:11 +12:00
  • 3fd8b1b855 Created Mercator projection to convert between Geo location and planar projection point. Haoming Yin 2017-05-15 12:24:36 +12:00
  • 94d1982670 Shifted the canvas to the back of the window when updated. Kusal Ekanayake 2017-05-15 10:46:28 +12:00
  • 39efafc75f Fixed Annotation.java, ImportantAnnotationController.java, RaceViewController.java to include estimate time to next mark after merge Zhi You Tan 2017-05-15 10:36:20 +12:00
  • afe0c9f1a6 Merge branch 'develop' into Story47CourseLimits Kusal Ekanayake 2017-05-15 10:33:22 +12:00
  • 04b105d74b Merge branch 'develop' into story33_add_estimated_time_annotation Zhi You Tan 2017-05-15 10:19:58 +12:00
  • 1ab6351d48 Fixed estimated time to next mark (annotation) to update correctly Zhi You Tan 2017-05-15 10:11:19 +12:00
  • 9c348df5a5 Merge branch 'merge_request_test' into 'master' Michael Rausch 2017-05-15 01:28:57 +12:00
  • 256ec046fc adjusted givePointsXY to try and use the marks from the XML parser, stopped partway as the marks from the XML parser and the standard marks need to be merged before this can be fixed properly #story[923] Peter Galloway 2017-05-14 22:12:16 +12:00
  • 85d4d63287 Merge branch 'story35_create_annotation_view' into 'develop' Peter Galloway 2017-05-14 22:00:02 +12:00
  • 213d36ed56 Merge remote-tracking branch 'origin/develop' into story35_create_annotation_view Michael Rausch 2017-05-14 21:05:48 +12:00
  • ff6bfc9516 Important annotations are displayed correctly when updated. Michael Rausch 2017-05-14 20:27:25 +12:00
  • ae5678482b changed package "parsers" to be called "stream" #story[923] Peter Galloway 2017-05-14 20:26:49 +12:00
  • 63514cfafb deleted duplicated packet type class #story[923] Peter Galloway 2017-05-14 20:20:14 +12:00
  • 03ca60f2e1 deleted a whole bunch of legacy code, primarily the old controllers and old parsers #story[923] Peter Galloway 2017-05-14 20:12:35 +12:00
  • 89ef6e5277 Wake calculation now changed to be based off of the separation between wakes. Calum 2017-05-14 17:24:15 +12:00
  • 47880d09bc Implemented estimated time to next mark. Added checkbox for estimated time to next mark. To be fix: change from long to human readable time, update time every second Zhi You Tan 2017-05-12 20:04:09 +12:00
  • 5472765b95 Removed unused methods in RaceViewController.java Zhi You Tan 2017-05-12 18:24:28 +12:00
  • 14d975dce4 Fixed a bug where clicking "watch race" before race starts will cause boats to travel in unexpected ways. Zhi You Tan 2017-05-12 17:41:47 +12:00
  • a23bdd0c53 Added functionality to select important annotations and ui changes Michael Rausch 2017-05-11 21:42:29 +12:00
  • b0d8c3db0a Merge remote-tracking branch 'origin/develop' into develop cir27 2017-05-11 16:40:50 +12:00
  • 4a75c062ce Making the course limits change when a new xml packet is received.. #story[889] Kusal Ekanayake 2017-05-11 15:49:49 +12:00
  • fe90a3bf13 Merge branch 'master' into story35_create_annotation_view Michael Rausch 2017-05-11 13:43:02 +12:00
  • 711f6f4c45 Merge branch 'master' into develop Michael Rausch 2017-05-11 13:29:51 +12:00
  • 8fa7829a3c Created a canvas map class to fetch map image from google Haoming Yin 2017-05-10 20:52:46 +12:00
  • 6d7697a0eb commented out the problematic buffering functionality #story[923] Peter Galloway 2017-05-10 13:58:10 +12:00
  • cdd80af27b Added .codeclimate.yml for static code analysis Michael Rausch 2017-05-10 11:56:18 +12:00
  • 2cb09b81f8 Updated .mailmap for everyone sprint_3.2 Zhi You Tan 2017-05-04 16:53:16 +12:00
  • b529d621e9 changed course size to 720x720 sprint_3.1 Peter Galloway 2017-05-04 16:42:23 +12:00
  • 24667991f1 Merge on to master sprint_3.0 William Muir 2017-05-04 14:39:29 +12:00
  • ac3f3bfd55 Added a check if race started, then start screen switches to race view automatically. Zhi You Tan 2017-05-04 14:32:06 +12:00
  • f2c4929656 Merge remote-tracking branch 'origin/master' William Muir 2017-05-04 14:22:49 +12:00
  • 4c038a823a Merge branch 'master' into develop William Muir 2017-05-04 14:22:20 +12:00
  • 3080c1bf27 Merge remote-tracking branch 'origin/Story28_GetCorrectTimeZone' into develop Alistair McIntyre 2017-05-04 14:15:05 +12:00
  • 59809c39ea Began figuring out how to implement XML data in place of mock data. #story[820] #pair[ajm412, wmu16] Alistair McIntyre 2017-05-04 14:13:03 +12:00
  • 9b063190ce Merge branch 'develop' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into develop Calum 2017-05-04 14:04:52 +12:00
  • 49f2398669 Merge branch 'develop' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into develop Calum 2017-05-04 14:01:32 +12:00
  • d7a4d20ceb Merge branch 'develop' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into develop Calum 2017-05-04 14:01:19 +12:00
  • 0855e268c8 Removed another test that was causing failing due CI not having disply Michael Rausch 2017-05-04 14:01:06 +12:00
  • 49b8d75aea Merge branch 'develop' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into develop Calum 2017-05-04 14:00:44 +12:00
  • b1a9a7845b Merge branch 'develop' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into develop Calum 2017-05-04 14:00:24 +12:00
  • b1e749bafb Removed test that was failing due to CI not having a display Michael Rausch 2017-05-04 13:59:44 +12:00
  • f6fc6c0693 Merge remote-tracking branch 'origin/develop' into develop Michael Rausch 2017-05-04 13:53:49 +12:00
  • ad1371bce0 Commented out tests that were causing build failures. Calum 2017-05-04 13:52:47 +12:00
  • e77df0a5dd Changed port number and added standalone flag Michael Rausch 2017-05-04 13:52:36 +12:00
  • 6935bd514e Reimplemented race position in the race view. Removed Boat class and Yacht class is replaced completely. Race position "-" shows properly on start screen. Removed BoatTest and TeamsParserTest. Fixed estimated time till finish on server. Zhi You Tan 2017-05-04 13:50:06 +12:00
  • a4cc5f222c Refactored course boundary to be a shade rather than a line and made the stream parser and stream receiver exit gracefully before the app closes. Kusal Ekanayake 2017-05-04 13:29:53 +12:00
  • a0bb7b85b4 potential fix for build failures Calum 2017-05-04 13:26:29 +12:00
  • fd8ed92f88 Fix for wakes on internal data Calum 2017-05-04 13:20:50 +12:00
  • c7b6261602 Merge branch 'develop' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into develop Calum 2017-05-04 12:46:07 +12:00
  • 3aefb14faf Added testing. Calum 2017-05-04 12:46:01 +12:00
  • 8521b68855 Server thread stops when window has been closed Michael Rausch 2017-05-04 12:35:36 +12:00
  • e37b244f45 Fixed a bug where boat statuses were being sent incorrectly Michael Rausch 2017-05-04 12:27:59 +12:00
  • 7f40fb6283 Fixed bug left in last commit Calum 2017-05-04 11:00:57 +12:00
  • 83316f7a17 Merge branch 'develop' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into develop Calum 2017-05-04 10:48:06 +12:00
  • a56e55ae70 Fix for some movement on racestart issues Calum 2017-05-04 10:38:04 +12:00
  • 07234ee33a Updated start screen team list to show position in race. Created Yacht class to replace Boat class. Removed Boat class from XMLParser. Removed unused BoatParser.java. Zhi You Tan 2017-05-04 04:16:16 +12:00
  • 145d59df45 Removed unused imports Michael Rausch 2017-05-04 01:18:41 +12:00
  • 7e8c3af9ce Removed extra 'minutes' labels Michael Rausch 2017-05-04 01:08:18 +12:00
  • aa6ef72670 Merge remote-tracking branch 'origin/develop' into develop Michael Rausch 2017-05-03 23:27:35 +12:00
  • ed8781b382 Added method to check if a boat is finished the race or not. Haoming Yin 2017-05-03 22:44:25 +12:00
  • 7a5f4e8f8c Removed minutes label from timestamp Michael Rausch 2017-05-03 22:16:03 +12:00
  • d992422efd Various bug fixes Michael Rausch 2017-05-03 21:56:51 +12:00
  • f0d6312fa5 Fix bugs that server doesn't send boat location before and after the race. Haoming Yin 2017-05-02 22:51:35 +12:00
  • 772ece25a0 Implemented real time race clock on the start screen using data from stream. Zhi You Tan 2017-05-02 22:39:33 +12:00
  • d063a41ad4 Merge remote-tracking branch 'origin/wake_remake' into develop Zhi You Tan 2017-05-02 22:09:03 +12:00
  • 6d02f05f05 Quick change to stop adding course markers as they are dynamic and add them in the previous way William Muir 2017-05-02 21:51:04 +12:00
  • 3a72409fb8 Merge remote-tracking branch 'origin/develop' into develop cir27 2017-05-02 21:50:30 +12:00
  • b3a89279d6 Quick change to stop adding course markers as they are dynamic and add them in the previous way William Muir 2017-05-02 21:31:38 +12:00
  • 4432ba26e5 Merge remote-tracking branch 'origin/develop' into develop William Muir 2017-05-02 21:12:22 +12:00
  • fe824a8f71 Finished implementing drawing of border from XML William Muir 2017-05-02 21:05:53 +12:00
  • 8233b75e05 Fixed the start screen team list after merging. Team list shows boats competing in event again. Zhi You Tan 2017-05-02 18:52:31 +12:00
  • 3af15b2b95 Updated wind direction on race view controller so it responds to the stream. Zhi You Tan 2017-05-02 18:02:44 +12:00
  • fd092bb7e1 Merge remote-tracking branch 'origin/develop' into develop cir27 2017-05-02 16:41:49 +12:00
  • 9c60521d00 Merge branch 'develop' of C:\Users\CJIRWIN\Documents\team-13 with conflicts. cir27 2017-05-02 16:41:40 +12:00
  • a4dfcca302 Fixed a boat bearing bug. Haoming Yin 2017-05-02 14:51:44 +12:00
  • 04ce6f6103 Removed white behind fps counter Kusal Ekanayake 2017-05-02 14:18:40 +12:00
  • 178af141f0 Refactoring and documentation #story[820] Kusal Ekanayake 2017-05-02 14:08:25 +12:00
  • c5c2d4375d Changed the canvas controller to read marks from the XML as received from the server (PROTOTYPE) William Muir 2017-05-01 23:10:15 +12:00
  • 3aa183042f Merge remote-tracking branch 'origin/wake_remake' into wake_remake William Muir 2017-05-01 22:00:15 +12:00
  • 944755fde1 Merge branch 'wake_remake' of /home/cosc/student/wmu16/Documents/300/SENG302/team-13 with conflicts. William Muir 2017-05-01 22:00:12 +12:00
  • cd78c35bf6 Merge remote-tracking branch 'origin/wake_remake' into wake_remake Peter 2017-05-01 20:37:58 +12:00
  • f8d003002b fixing error from merge #story[820] Peter Galloway 2017-05-01 20:37:26 +12:00
  • 56fab768f3 fixing error from merge #story[820] Peter Galloway 2017-05-01 20:37:26 +12:00
  • c92744f21c Merge branch 'wake_remake' into develop Peter Galloway 2017-05-01 20:35:15 +12:00
  • 1f71fd1967 Merge branch 'wake_remake' into Story30b_correcting_boat_movement Peter Galloway 2017-05-01 20:33:09 +12:00
  • 33ae7beeb4 merging with wake remake #story[820] Peter Galloway 2017-05-01 20:09:51 +12:00