michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 14:28:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
350 Commits 17 Branches 21 Tags
2d5a7a8a494cddec670cd5d8824dd1f3de68773c
Commit Graph

350 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
William Muir 2d5a7a8a49 Large tidying of RaceViewController class. Fixing updating for combo boxes 
#story[955]
 2017-05-16 15:06:01 +12:00
William Muir 51f090324a CSS on annotation selection and minor bug fixes. Changed annotation slider to only have None, important and All 
#story[955]
 2017-05-15 16:44:28 +12:00
William Muir 764ae37ce4 Gave the boatgroups a selection attribute, allowing them to be highlighted upon clicking 
Boats can be clicked on canvas or from selection drop down on the side

#story[955]
 2017-05-15 14:09:09 +12:00
Peter Galloway 85d4d63287 Merge branch 'story35_create_annotation_view' into 'develop' 
Story35 create annotation view

## Addresses issue #9 and story 35

# Change Log
* Styled application using CSS (Issue #9)
* User can select to only show important annotations using the annotation slider
* Added view to select important annotations
* Important annotations are updated in real-time

# Testing
* Unit tests in test/java/seng302/visualizer/annotations/*
* Controllers have been tested manually

# Acceptance Criteria

* There is a mechanism to chose the ‘important’ annotations while viewing a race.

* Any number of annotations (from zero to the number of annotations) can be chosen.

* If the partial annotations toggle is active, choosing an annotation makes that annotation immediately visible for all boats, and deselecting an annotation should likewise remove it from all boats.

* When the partial annotations toggle becomes active, all annotations chosen as ‘important’, and only those annotations, should be shown.

See merge request !27
 2017-05-14 22:00:02 +12:00
Michael Rausch 213d36ed56 Merge remote-tracking branch 'origin/develop' into story35_create_annotation_view 2017-05-14 21:05:48 +12:00
Michael Rausch ff6bfc9516 Important annotations are displayed correctly when updated. 
- Important annotations can be selected, the live view updates in real time
- Change local time text colour to white
- Split the important annotations state into a separate class

Tags: #story[926]
 2017-05-14 20:27:25 +12:00
Zhi You Tan 14d975dce4 Fixed a bug where clicking "watch race" before race starts will cause boats to travel in unexpected ways. 
#story[923]
 2017-05-12 17:41:47 +12:00
Michael Rausch a23bdd0c53 Added functionality to select important annotations and ui changes 
- Added CSS for the race view & welcome screen
- Added view to select important annotations
- Annotations are enabled/disabled when the user changes the important annotations

Tags: #story[926]
 2017-05-11 21:44:56 +12:00
Michael Rausch fe90a3bf13 Merge branch 'master' into story35_create_annotation_view 2017-05-11 13:43:02 +12:00
Michael Rausch 711f6f4c45 Merge branch 'master' into develop 2017-05-11 13:29:51 +12:00
Zhi You Tan 2cb09b81f8 Updated .mailmap for everyone sprint_3.2 2017-05-04 16:53:16 +12:00
Peter Galloway b529d621e9 changed course size to 720x720 sprint_3.1 2017-05-04 16:42:23 +12:00
William Muir 24667991f1 Merge on to master 
Final Push
sprint_3.0 		2017-05-04 14:39:29 +12:00
Zhi You Tan ac3f3bfd55 Added a check if race started, then start screen switches to race view automatically. 
#story[572]
 2017-05-04 14:32:06 +12:00
William Muir f2c4929656 Merge remote-tracking branch 'origin/master' 2017-05-04 14:22:49 +12:00
William Muir 4c038a823a Merge branch 'master' into develop 
# Conflicts:
#	.mailmap
 2017-05-04 14:22:20 +12:00
Alistair McIntyre 3080c1bf27 Merge remote-tracking branch 'origin/Story28_GetCorrectTimeZone' into develop 
# Conflicts:
#	src/main/java/seng302/controllers/Controller.java
 2017-05-04 14:15:05 +12:00
Alistair McIntyre 59809c39ea Began figuring out how to implement XML data in place of mock data. 
#story[820] #pair[ajm412, wmu16]
 2017-05-04 14:13:03 +12:00
Calum 9b063190ce Merge branch 'develop' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into develop 
# Conflicts:
#	src/test/java/seng302/models/MarkGroupTest.java
 2017-05-04 14:04:52 +12:00
Calum 49f2398669 Merge branch 'develop' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into develop 2017-05-04 14:01:32 +12:00
Calum d7a4d20ceb Merge branch 'develop' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into develop 
# Conflicts:
#	src/test/java/seng302/models/MarkGroupTest.java
 2017-05-04 14:01:19 +12:00
Michael Rausch 0855e268c8 Removed another test that was causing failing due CI not having disply 2017-05-04 14:01:06 +12:00
Calum 49b8d75aea Merge branch 'develop' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into develop 
# Conflicts:
#	src/test/java/seng302/models/BoatGroupTest.java
 2017-05-04 14:00:44 +12:00
Calum b1a9a7845b Merge branch 'develop' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into develop 
# Conflicts:
#	src/test/java/seng302/models/BoatGroupTest.java
 2017-05-04 14:00:24 +12:00
Michael Rausch b1e749bafb Removed test that was failing due to CI not having a display 2017-05-04 13:59:44 +12:00
Michael Rausch f6fc6c0693 Merge remote-tracking branch 'origin/develop' into develop 2017-05-04 13:53:49 +12:00
Calum ad1371bce0 Commented out tests that were causing build failures. 
Issue is related to tests failing to get the source code from our project needed to build. They run
fine when run from the IDE.
 2017-05-04 13:52:47 +12:00
Michael Rausch e77df0a5dd Changed port number and added standalone flag 
- can use -standalone to just run the server
- Changed port number as to not conflict with some web servers
 2017-05-04 13:52:36 +12:00
Zhi You Tan 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. 
#story[818]
 2017-05-04 13:50:06 +12:00
Kusal Ekanayake 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. 
#story[820]
 2017-05-04 13:29:53 +12:00
Calum a0bb7b85b4 potential fix for build failures 2017-05-04 13:26:29 +12:00
Calum fd8ed92f88 Fix for wakes on internal data 
#bug
 2017-05-04 13:20:50 +12:00
Calum c7b6261602 Merge branch 'develop' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into develop 2017-05-04 12:46:07 +12:00
Calum 3aefb14faf Added testing. 2017-05-04 12:46:01 +12:00
Michael Rausch 8521b68855 Server thread stops when window has been closed 2017-05-04 12:35:36 +12:00
Michael Rausch e37b244f45 Fixed a bug where boat statuses were being sent incorrectly 
- Boats now have an estimated time until finish
- Boat packets are being sent correctly

Tags: #story[829]
 2017-05-04 12:27:59 +12:00
Calum 7f40fb6283 Fixed bug left in last commit 2017-05-04 11:00:57 +12:00
Calum 83316f7a17 Merge branch 'develop' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into develop 
# Conflicts:
#	src/main/java/seng302/App.java
#	src/main/java/seng302/controllers/Controller.java
 2017-05-04 10:48:06 +12:00
Calum a56e55ae70 Fix for some movement on racestart issues 
#bug
 2017-05-04 10:38:04 +12:00
Zhi You Tan 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. 
#story[572]
 2017-05-04 04:16:16 +12:00
Michael Rausch 145d59df45 Removed unused imports 2017-05-04 01:18:41 +12:00
Michael Rausch 7e8c3af9ce Removed extra 'minutes' labels 2017-05-04 01:08:18 +12:00
Michael Rausch aa6ef72670 Merge remote-tracking branch 'origin/develop' into develop 2017-05-03 23:27:35 +12:00
Haoming Yin ed8781b382 Added method to check if a boat is finished the race or not. 
- updated server if all boats finish the race, then start sending race finished message.
- race simulator will terminate if all boats finish the race, and prints log.

#story[715]
 2017-05-03 22:44:25 +12:00
Michael Rausch 7a5f4e8f8c Removed minutes label from timestamp 
Tags: #story[820]
 2017-05-03 22:16:03 +12:00
Michael Rausch d992422efd Various bug fixes 
- Made canvas fill entire screen
- Made window scale to screens that aren't 1920x1080
- Changed boat speeds in mock so they aren't too fast
- Added command line options to switch server

Tags: #story[829]
 2017-05-03 21:56:51 +12:00
Haoming Yin f0d6312fa5 Fix bugs that server doesn't send boat location before and after the race. 
- server will sends boat location not only during the race, but also before the race and after all boats have finished the race.
- refactored simulator so that it runs at the begining to send boat location, and if its "isStarted" set to true, then it starts moving the boats.

#story[715]
 2017-05-02 22:51:35 +12:00
Zhi You Tan 772ece25a0 Implemented real time race clock on the start screen using data from stream. 
#story[594]
 2017-05-02 22:39:33 +12:00
Zhi You Tan d063a41ad4 Merge remote-tracking branch 'origin/wake_remake' into develop 
# Conflicts:
#	src/main/java/seng302/App.java
 2017-05-02 22:09:03 +12:00
William Muir 6d02f05f05 Quick change to stop adding course markers as they are dynamic and add them in the previous way 2017-05-02 21:51:04 +12:00