fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
846 Commits 1 Branch 0 Tags
7d4f1cd92536bec6983ee015d13fdc371c727b3b
Commit Graph
143 Commits
Author SHA1 Message Date
Joseph Gardner 7d4f1cd925 Fixed first key press not working. #story[1098] 2017-08-14 12:41:21 +12:00
Jessica Syder 0558629dc6 Added luffing sails image. 
- Created transparent gif of luffing sail
- Displayed image when sail is luffing
- Repositioned luffing sail

#story[1098]
 2017-08-14 10:42:28 +12:00
Joseph Gardner d8628b4289 Boats now start the race with sails out. #story[1098] 2017-08-10 13:25:57 +12:00
Joseph Gardner 20302496f0 Made SailsInCommand and SailsOutCommand one class. #story[1098] 2017-08-10 13:14:58 +12:00
Jessica Syder 321dcde72f Implemented luffing sail without image (yet). 
- Added sailsLuff image property
- Displayed luffing sail in correct position and angle

#story[1098]
 2017-08-10 12:49:00 +12:00
Joseph Gardner 1a7152f54e Boats stop when the sails are out. Merged dev. #story[1098] 2017-08-10 12:32:05 +12:00
Joseph Gardner 1302769a50 Merge branch 'Development' into story_64_sails 
# Conflicts:
#	racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java
#	racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java
#	racevisionGame/src/test/java/mock/model/MockBoatTest.java
 2017-08-10 11:56:09 +12:00
Joseph e23f20753d Merged master. Added commands for sails in and out. Added logic to stop boat from moving when sails are out. Testing if the boat stops with sails out is blocked until command factory is merged. #story[1098] 2017-08-10 09:42:59 +12:00
Joseph 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
 2017-08-10 08:58:43 +12:00
hba56 74f04a13f8 Merge remote-tracking branch 'origin/Development' into Development 2017-08-09 23:27:04 +12:00
hba56 e53d72f24b compound marks now can give the mark they have that needs to be rounded this is used to draw the line around the correct mark 
#story[1101]
 2017-08-09 23:25:42 +12:00
Connor Taylor-Brown da9915174c Merge branch 'master' into Development 2017-08-09 23:05:07 +12:00
Connor Taylor-Brown 638413da1a Merge remote-tracking branch 'remotes/origin/story63' into Development 2017-08-09 22:46:26 +12:00
Jessica Syder 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]
 2017-08-09 21:48:17 +12:00
Connor Taylor-Brown e021dd328d Changed CompositeCommand stack to queue 
#story[1096]
 2017-08-08 23:56:59 +12:00
hba56 e2605c3c7c Merge remote-tracking branch 'remotes/origin/story68' into Development 2017-08-08 23:29:57 +12:00
hba56 bb75806781 Cleaned up line to be in a shippable shape 
#story[1101]
 2017-08-08 23:23:46 +12:00
hba56 22722286ef all paths now join up 
#story[1087]
 2017-08-08 14:47:11 +12:00
zwu18 53c9192130 Merge branch 'CommandFactory' into Development 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java
 2017-08-08 02:52:29 +12:00
hba56 ef3f468b19 arrows displayed for each leg 
#story[1101]
 2017-08-08 00:02:07 +12:00
Jessica Syder 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]
 2017-08-07 17:40:21 +12:00
cbt24 2920b6cf23 Removed build-breaking code from MockRace 
#story[1096]
 2017-08-07 16:47:25 +12:00
Connor Taylor-Brown 8ee4e84236 Merge remote-tracking branch 'remotes/origin/story63' into Development 
# Conflicts:
#	racevisionGame/src/main/java/mock/model/MockBoat.java
#	racevisionGame/src/main/java/mock/model/MockRace.java
 2017-08-07 15:02:13 +12:00
Joseph Gardner f6cdf66bfe Sails can be toggled on the visualiser and the rotate sails button rotates the sail visually. #story[1098] 2017-08-07 15:01:16 +12:00
Connor Taylor-Brown dad4fa57c6 Fixed WindCommand not updating downwind command when moving upwind. 
#story[1096]
 2017-08-07 14:51:32 +12:00
Connor Taylor-Brown 55798447ab Cherry-picked CommandFactory connection between ControllerServer and RaceLogic. 
#story[1096]
 2017-08-07 14:25:30 +12:00
Connor Taylor-Brown e76de1cbf9 Added test for WindCommand 
#story[1096]
 2017-08-07 14:13:14 +12:00
hba56 62752c142a building blocks for drawing the race line around the course 
#story[1087]
 2017-08-07 12:47:55 +12:00
hba56 747c31b948 Merge remote-tracking branch 'remotes/origin/story68' into Development 2017-08-07 12:29:56 +12:00
hba56 4195d41814 removed outdated comments 
#story[1087]
 2017-08-07 12:28:44 +12:00
Jessica Syder 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]
 2017-08-07 12:20:52 +12:00
hba56 950a801d16 rounding fix for the xml 
#story[1087]
 2017-08-07 12:16:37 +12:00
Joseph Gardner 0bf2c6106b Boat updating speed after key press has been fixed. #fix #story[1094] 2017-08-07 12:03:34 +12:00
zwu18 ddaa2623ca Added tests for TackGybeCommand class. 
#Story[1097]
 2017-08-07 02:56:24 +12:00
zwu18 a388989827 Reworked TackGybeCommand. Current boat in race will now tack and gybe when control is pressed. 
#Story[1097]
 2017-08-06 16:38:44 +12:00
zwu18 18f14c7542 VMGCommand now toggles autoVMG on and off. Linked up observer and observable so the current boat can now be controlled. Fixed autoVMG not working. 
#Story[1097]
 2017-08-06 16:12:53 +12:00
zwu18 dab0f2b402 Merge branch 'story63' into CommandFactory 
# Conflicts:
#	racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java
 2017-08-06 14:54:21 +12:00
zwu18 074e2e590b VMGCommand now toggles autoVMG on and off. Linked up observer and observable so the current boat can now be controlled. 
#Story[1097]
 2017-08-06 14:48:46 +12:00
zwu18 3d417c3a40 Merge branch 'story63' into CommandFactory 
# Conflicts:
#	racevisionGame/src/main/java/mock/model/MockRace.java
#	racevisionGame/src/main/java/mock/model/RaceLogic.java
#	racevisionGame/src/main/java/mock/model/RaceState.java
#	racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java
#	racevisionGame/src/main/java/mock/model/commandFactory/VMGCommand.java
#	racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java
 2017-08-06 13:48:41 +12:00
fjc40 7feddeb49f Merge branch 'master' into story48 2017-08-05 15:23:33 +12:00
Connor Taylor-Brown 554f8a2a0f Added WindCommand and multiple command execution to RaceLogic 
- Dispatch commands with CompositeCommand
- Single WindCommand handles upwind and downwind logic
- Changed key bindings as Mac lacks PgUp PgDn
- ControllerServer is observable, RaceLogic updates CompositeCommand as observer
 2017-08-04 23:08:07 +12:00
hba56 0b74acadff rounding checks are now done by port or starboard side depending on what the compound marks type is 
#story[1101]
 2017-08-04 22:19:07 +12:00
hba56 db1efab225 rounding checks are now done by port or starboard side depending on what the compound marks type is 
#story[1101]
 2017-08-04 22:17:17 +12:00
hba56 be8b0e672d Updated the xml reader to pull in the rounding type of the compound marks and set each mark with that value 
#story[1101]
 2017-08-04 22:01:21 +12:00
Connor Taylor-Brown 425cc7f91f Changed ControlKey to use BoatActionEnum instead of magic numbers. 2017-08-04 21:27:53 +12:00
zwu18 14ce5fcaff Made changes to TackGybeCommand and VMGCommand classes to fit pattern layout. 
#Story[1097]
 2017-08-04 03:56:55 +12:00
zwu18 6e699f7037 Merge branch 'RaceFactory' into CommandFactory 2017-08-04 03:00:31 +12:00
Connor Taylor-Brown 851bbb4fde Merged branch "RaceFactory" with master 2017-08-03 23:03:15 +12:00
fjc40 148108a658 CommandFactory uses BoatActionEnum instead of raw ints. 
#story[1094]
 2017-08-03 21:11:25 +12:00
Connor Taylor-Brown 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]
 2017-08-03 17:54:03 +12:00