Connor Taylor-Brown
7474de9816
Created foundation classes and interfaces for collision architecture.
...
- Added Collider interface
- Added Collision class
- Added ColliderRegistry class
#story[1100]
8 years ago
Connor Taylor-Brown
3cf0cf2ee0
Merge branch 'master' into story63
8 years ago
Connor Taylor-Brown
e021dd328d
Changed CompositeCommand stack to queue
...
#story[1096]
8 years ago
Connor Taylor-Brown
dad4fa57c6
Fixed WindCommand not updating downwind command when moving upwind.
...
#story[1096]
8 years ago
Connor Taylor-Brown
55798447ab
Cherry-picked CommandFactory connection between ControllerServer and RaceLogic.
...
#story[1096]
8 years ago
Connor Taylor-Brown
e76de1cbf9
Added test for WindCommand
...
#story[1096]
8 years ago
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
8 years ago
Connor Taylor-Brown
425cc7f91f
Changed ControlKey to use BoatActionEnum instead of magic numbers.
8 years ago
Connor Taylor-Brown
851bbb4fde
Merged branch "RaceFactory" with master
8 years ago
fjc40
148108a658
CommandFactory uses BoatActionEnum instead of raw ints.
...
#story[1094]
8 years ago
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]
8 years ago
Joseph Gardner
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
Connor Taylor-Brown
c8621a7be5
Merge branch 'RaceFactory' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into RaceFactory
8 years ago
zwu18
d9679c1497
Build failing due to junit even though junit passes all tests. Commented out VMGCommand and TackGybeCommand content.
8 years ago
Connor Taylor-Brown
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
zwu18
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
zwu18
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
Connor Taylor-Brown
0466292bd0
Partially removed VMG optimisation, separated server-specific functionality
...
from MockRace into RaceServer.
#story[1094]
8 years ago
zwu18
7fc1347377
Created class TackGybeCommand which implements the CommandFactory interface.
...
#story[1097]
8 years ago
Joseph Gardner
b258e94a54
Merged wind generator into this branch. #story[1094]
8 years ago
Joseph Gardner
577a1d1b5a
Merge remote-tracking branch 'origin/RaceFactory' into RaceFactory
...
# Conflicts:
# racevisionGame/src/main/java/mock/model/MockRace.java
8 years ago
Joseph Gardner
fba256113a
Merged wind generator into this branch. #story[1094]
8 years ago
Joseph Gardner
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
fjc40
ed12ff659d
mock:
...
Moved wind generation logic and state into the WindGenerator class.
MockRace initialises this, and calls it to update wind.
8 years ago
cbt24
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
cbt24
a4592a10e6
Removed boundary checking logic to clean up MockRace before split
...
story[1094]
8 years ago
Joseph Gardner
81eeca3533
Split wind off from Race and made it its own class. Deleted dnfChance as it is no longer used.
8 years ago
Joseph Gardner
775c32ca92
Made new branch for command architecture.
8 years ago
Joseph Gardner
a87879eaa9
Made new branch for command architecture.
8 years ago
fjc40
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]
8 years ago
fjc40
5af3053537
Added shared.model.Wind class.
...
shared.model.Race now uses Wind. It is wrapped in Property<>.
#story[1093]
8 years ago
David Wu
f2932e8bae
New branch created for development.
9 years ago
Fan-Wu Yang
a8701d8a1f
Merge branch 'css' into 'master'
...
CSS merge into master branch
See merge request !18
9 years ago
Fan-Wu Yang
442920f9f6
DOD, and added javadocs/fixed javadocs #story[1087]
9 years ago
Jessica Syder
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
Jessica Syder
402df18b71
Merge remote-tracking branch 'remotes/origin/master' into css
9 years ago
Fraser Cope
7966ac41fb
Merge branch 'cbt-multi-controller' into 'master'
...
Cbt multi controller
Covers stories 4 and 6.
See merge request !17
9 years ago
fjc40
669b8167cd
Merge branch 'cbt-multi-controller' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into cbt-multi-controller
9 years ago
fjc40
1b5926007c
Visualiser ConnectionController:
...
Clicking the host button doesn't create more than one server.
9 years ago
Joseph Gardner
67c7c88b32
Print statements now print off the actual key action. #story[1089]
9 years ago
fjc40
f91f7055de
Visualiser RaceController:
...
event.consume() is required to stop the keyboard event from propogating to other controls.
9 years ago
hba56
92b8b7b77f
moved the tm symbol
...
#story[1087]
9 years ago
David Wu
2b8b334486
Updated host to show the hosted address and port. Fixed css issue with lobby text field.
...
#story[1087]
9 years ago
hba56
f4eb03e79e
Merge remote-tracking branch 'origin/css' into css
9 years ago
hba56
85347c169d
You can now resize all windows other than the title screen
...
#story[1087]
9 years ago
David Wu
28e6709890
Merge remote-tracking branch 'origin/css' into css
...
# Conflicts:
# racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml
9 years ago
David Wu
90f9ec2b98
Changed host menu. Will update soon.
...
#story[1087]
9 years ago
Joseph Gardner
6492ba89ab
Merging main features into story 6. App now sends and receives key strokes. #story[1007, 1089]
9 years ago
Joseph Gardner
0ea7fb8c84
Merging main features into story 6. App now sends and receives key strokes. #story[1007, 1089]
9 years ago
hba56
59058da09c
textfields now show better colour that contrasts more
...
#story[1087]
9 years ago