41d09f587e
Merge branch 'master' into story_64_sails
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/gameController/Keys/ControlKey.java
# racevisionGame/src/main/java/visualiser/gameController/Keys/SailsToggleKey.java
# racevisionGame/src/main/java/visualiser/gameController/Keys/VMGKey.java
# racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java
8 years ago
ce973fecfe
Sails are displayed correctly for all wind and active boat directions.
...
- Figured out the different situations that can occur using accurate points of sail
- Mathed out the rotation angle for each situation
- Manual testing carried out by running simulations
- Manual testing carried out using pen and paper
#story[1098]
8 years ago
568458aca4
Merge branch 'story48' into 'master'
...
Story48 & issue 26
This is the merge request for story 48 (http://agilefant.cosc.canterbury.ac.nz:8080/agilefant302/editProject.action?projectId=61#fi.hut.soberit.agilefant.model.Story_1093 ) ( #29 ) and issue #26 .
A.C:
- Wind speed and direction must follow that provided by the Race Status message or messages.
- Arrow aligned with the current wind direction shown on the live race view.
- Arrow orientation adjusts within 1s when changes in the wind direction are received.
- Arrow length is proportional to wind speed.
- Wind speed in m/s (or as defined in story 17) should be easily estimated from the wind arrow.
The wind speed (TWS) should be shown as both a number and in the length of the wind arrow. The arrow length should be always long enough for TWA (wind direction) to be clear; the length should never drop below some minimum value.
This includes issue #26 as story 48 was slightly dependent on that.
Both #29 and issue #26 should be closed once this has been merged.
See merge request !20
8 years ago
ace1252c1d
Fixed sails so they behave correctly
...
- Changed sail angle calculations back
- Luffing currently displays no sail as a temporary representation of sails in
#story[1098]
8 years ago
f6cdf66bfe
Sails can be toggled on the visualiser and the rotate sails button rotates the sail visually. #story[1098]
8 years ago
7c5670f8c2
Sails are displayed on first boat in a race. Optimised imports.
...
- Implemented drawSails method
- Sail position is displayed and updated using a boat's heading
- Sails conform to 'Points of sail'
- Javadoc'd new method and tidied up existing
- Sped up track point frequency (visualiserBoat class)
- Optimised imports (any other classes changed)
- A lot of canvas drawing and sail rotating issues were discovered and eventually overcome along the way. Using a sail image to draw and rotate on the existing canvas rather than a JavaFX shape on a new canvas was the final decision.
#story[1098]
8 years ago
7feddeb49f
Merge branch 'master' into story48
8 years ago
425cc7f91f
Changed ControlKey to use BoatActionEnum instead of magic numbers.
8 years ago
851bbb4fde
Merged branch "RaceFactory" with master
8 years ago
148108a658
CommandFactory uses BoatActionEnum instead of raw ints.
...
#story[1094]
8 years ago
c83442761c
Implemented Factory for Command objects and fixed Command Pattern implementation.
...
- Commands now have standard 0-parameter execute method
- Commands are created by CommandFactory
#story[1094]
8 years ago
40a3ed1bb0
Boats now store whether autoVMG is on or off, boat speed scales off their bearing relative to the TWA. #story[1094]
8 years ago
2e325d5177
Added WindGeneratorTest.
8 years ago
e4999a3c93
Added a light variant of the arrow image.
...
nightMode.css loads this instead of the regular dark arrow.
ResizableRaceCanvas doesn't cache the race boundary background, as it was unneccessary and stopped the canvas from being transparent.
#story[1093]
8 years ago
2a5d0938ff
Merge branch 'story48' into Development
8 years ago
c8621a7be5
Merge branch 'RaceFactory' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into RaceFactory
8 years ago
d9679c1497
Build failing due to junit even though junit passes all tests. Commented out VMGCommand and TackGybeCommand content.
8 years ago
2672c2b13b
Separated RaceLogic from MockRace
...
- MockRace satisfies refactor requirement for RaceState
- VisualiserRace directly implements Runnable to remove method from MockRace
#story[1094]
8 years ago
b581b01a44
Merge branch 'RaceFactory' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into RaceFactory
...
# Conflicts:
# racevisionGame/src/main/java/mock/model/MockRace.java
8 years ago
ad61dc6bce
Implemented runCommand method in VMGCommand and TackGybeCommand classes. Both classes currently rely on the MockRace class so changes will be required when MockRace is refactored.
...
#story[1097]
8 years ago
0466292bd0
Partially removed VMG optimisation, separated server-specific functionality
...
from MockRace into RaceServer.
#story[1094]
8 years ago
7fc1347377
Created class TackGybeCommand which implements the CommandFactory interface.
...
#story[1097]
8 years ago
e1905e9e36
javadoc fix.
8 years ago
9889a474ee
Added ArrowController. This is the controller for arrow.fxml.
...
Removed arrow control stuff from ResizableRaceCanvas.
Added a wind speed label to arrow.fxml. Also created an outer GridPane to lay things out.
#story[1093]
8 years ago
b258e94a54
Merged wind generator into this branch. #story[1094]
8 years ago
577a1d1b5a
Merge remote-tracking branch 'origin/RaceFactory' into RaceFactory
...
# Conflicts:
# racevisionGame/src/main/java/mock/model/MockRace.java
8 years ago
fba256113a
Merged wind generator into this branch. #story[1094]
8 years ago
51bbdf9a50
Merge branch 'issue_26_wind' into RaceFactory
...
# Conflicts:
# racevisionGame/src/main/java/mock/model/MockRace.java
# racevisionGame/src/main/java/shared/model/Race.java
# racevisionGame/src/main/java/visualiser/model/VisualiserRace.java
8 years ago
ed12ff659d
mock:
...
Moved wind generation logic and state into the WindGenerator class.
MockRace initialises this, and calls it to update wind.
8 years ago
9249e74e3a
Merge remote-tracking branch 'origin/RaceFactory' into RaceFactory
...
# Conflicts:
# racevisionGame/src/main/java/mock/model/MockRace.java
# racevisionGame/src/main/java/mock/model/RaceState.java
8 years ago
a4592a10e6
Removed boundary checking logic to clean up MockRace before split
...
story[1094]
8 years ago
81eeca3533
Split wind off from Race and made it its own class. Deleted dnfChance as it is no longer used.
8 years ago
775c32ca92
Made new branch for command architecture.
8 years ago
a87879eaa9
Made new branch for command architecture.
8 years ago
99f3310d8b
Created a setWind(bearing, knots) in Race, which updates the Wind with new values.
...
MockRace now uses Wind.
VisualiserRace now uses Wind.
#story[1093]
9 years ago
5af3053537
Added shared.model.Wind class.
...
shared.model.Race now uses Wind. It is wrapped in Property<>.
#story[1093]
9 years ago
f2932e8bae
New branch created for development.
9 years ago
a8701d8a1f
Merge branch 'css' into 'master'
...
CSS merge into master branch
See merge request !18
9 years ago
442920f9f6
DOD, and added javadocs/fixed javadocs #story[1087]
9 years ago
9eaf24e699
Fixed title screen having whitespace on different screen resolutions.
...
- Title screen has no white space on edges
- Main controller now anchors title to corners of main window
#story[1087] #pair[fjc40, jam339]
9 years ago
402df18b71
Merge remote-tracking branch 'remotes/origin/master' into css
9 years ago
7966ac41fb
Merge branch 'cbt-multi-controller' into 'master'
...
Cbt multi controller
Covers stories 4 and 6.
See merge request !17
9 years ago
669b8167cd
Merge branch 'cbt-multi-controller' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into cbt-multi-controller
9 years ago
1b5926007c
Visualiser ConnectionController:
...
Clicking the host button doesn't create more than one server.
9 years ago
67c7c88b32
Print statements now print off the actual key action. #story[1089]
9 years ago
f91f7055de
Visualiser RaceController:
...
event.consume() is required to stop the keyboard event from propogating to other controls.
9 years ago
92b8b7b77f
moved the tm symbol
...
#story[1087]
9 years ago
2b8b334486
Updated host to show the hosted address and port. Fixed css issue with lobby text field.
...
#story[1087]
9 years ago
f4eb03e79e
Merge remote-tracking branch 'origin/css' into css
9 years ago
85347c169d
You can now resize all windows other than the title screen
...
#story[1087]
9 years ago
Joseph
Jessica Syder
David Wu
fjc40
Connor Taylor-Brown
Fan-Wu Yang
hba56