cbt24
de9f4e22eb
Direction to mark arrow is now displayed relative to camera
...
#story[1195]
8 years ago
Fan-Wu Yang
7b97e93d3a
Merge branch 'merge_fix_story51'
...
# Conflicts:
# racevisionGame/src/main/java/mock/app/Event.java
8 years ago
Fan-Wu Yang
54fe37fd3a
Merge branch 'story_51_rounding_fix' into 'master'
...
Story 51 rounding fix
Acceptance criteria:
- The layout must be sent over the API in a race.xml message, plus boat location messages for the marks as required, before any other boat location messages are sent.
- Each mark must be defined using boat "SourceID"s (see definition of race.xml) so their positions can be adjusted later.
- The course must meet the requirements given in the AC35 Protocol.
- The course limits should be set to clear all marks by at least several boat-lengths.
- The entire race area within the limits must be on the water.
(Work with rounding)
Tested by playing the first map with a variety of rotation angles.
See merge request !43
8 years ago
Connor Taylor-Brown
5f96526fcc
Added "arrow" pointing to next mark on third person view
...
#story[1195]
8 years ago
David Wu
22b4b66049
Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
# racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml
8 years ago
David Wu
cccce9002b
Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
# racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml
8 years ago
Joseph Gardner
0944e5729a
Dimmed the ambient light and specular light. #story[1261]
8 years ago
hba56
00780e17e9
Merge remote-tracking branch 'remotes/origin/temp77' into story77
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
# racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml
# racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml
8 years ago
David Wu
8cc4d7741c
Fixed issue where games can't be hosted if you quit as host in the lobby menu. Added more doc.#story[1188]
8 years ago
hba56
aafc0dc9db
Merge remote-tracking branch 'remotes/origin/temp77' into story77
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
# racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml
# racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml
8 years ago
Fan-Wu Yang
1cbb24e9fd
Merged in master #story[1185]
8 years ago
Fan-Wu Yang
3760a43cfc
Merge branch 'master' into HEAD
...
# Conflicts:
# racevisionGame/src/main/java/mock/app/Event.java
8 years ago
fjc40
b655b3e233
Fixed merge bug, and an unrelated null pointer exception.
8 years ago
Connor Taylor-Brown
e657a0cc99
Added tracking for angle between third person boat and next mark
...
#story[1195]
8 years ago
fjc40
6761778dd4
Merge remote-tracking branch 'origin/master' into story_51_rounding_fix
...
# Conflicts:
# racevisionGame/src/main/java/mock/app/Event.java
8 years ago
David Wu
06bd637460
Added documentation. #story[1188]
8 years ago
David Wu
490aab3f8d
Changes made to pre-race countdown. #story[1188]
8 years ago
Fan-Wu Yang
e87173ee39
Fixed Tutorial not being able to run #story[1185]
8 years ago
hba56
079d93fc0f
Merge remote-tracking branch 'remotes/origin/master' into story77
...
# Conflicts:
# racevisionGame/src/main/java/mock/app/Event.java
# racevisionGame/src/main/java/visualiser/Controllers/HostController.java
# racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
# racevisionGame/src/main/java/visualiser/Controllers/MainController.java
# racevisionGame/src/main/resources/visualiser/scenes/main.fxml
# settings/keyBindings.xml
8 years ago
hba56
70ccb4cf1c
Merge remote-tracking branch 'remotes/origin/master' into story77
...
# Conflicts:
# racevisionGame/src/main/java/mock/app/Event.java
# racevisionGame/src/main/java/visualiser/Controllers/HostController.java
# racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
# racevisionGame/src/main/java/visualiser/Controllers/MainController.java
# racevisionGame/src/main/resources/visualiser/scenes/main.fxml
# settings/keyBindings.xml
8 years ago
David Wu
f926355d1c
Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77
8 years ago
David Wu
89ce8a7cc0
Pre-race countdown implementation.
8 years ago
hba56
731c0b0e61
send out to every client fix
8 years ago
fjc40
d29a47ec23
Merge remote-tracking branch 'origin/master' into story_51_rounding_fix
...
# Conflicts:
# racevisionGame/src/main/java/mock/app/Event.java
# racevisionGame/src/main/java/mock/model/MockRace.java
# racevisionGame/src/main/java/shared/model/Constants.java
8 years ago
Fraser Cope
d1f74dec3a
Merge branch 'storyB-)' into 'master'
...
B) [V,M] As a player I would like to have the game run smoothly and have a unique game experience
Acceptance criteria:
* Boat moves smoothly when executing command
* The appearance of the game is unique and consistent
This merge request also closes issue #42 .
See merge request !42
8 years ago
Connor Taylor-Brown
83e696b79e
Committed merge-related bug fixes
8 years ago
Connor Taylor-Brown
70bbc89239
Fixed merge-related bugs
8 years ago
fjc40
070654a95c
Javadoc fix.
8 years ago
David Wu
c750b806e0
Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77
8 years ago
fjc40
2ad947b57d
The start time of the race is no longer scaled by the race speed scalar.
...
Changed the prestart time to 30 seconds (was 3 minutes).
Changed the preparatory time to 10 seconds (was 1 minute).
Phases: player list +prestart > warning > race view + preparatory + no more joining > started > finished.
8 years ago
hba56
2c06a46ad2
send out to every client fix
8 years ago
David Wu
202c8d80c8
Minor fxml adjustments.
8 years ago
David Wu
42a5d8ddc4
Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77
8 years ago
hba56
5fb24307ec
send out to every client fix
8 years ago
Joseph
0b3ef992bc
Merge remote-tracking branch 'origin/storyD-3D' into storyD-3D
8 years ago
Joseph
253a16a664
Made the sky box use sky box planes they cannot be scaled. #story[1261]
8 years ago
Connor Taylor-Brown
0f846f31c3
Merge remote-tracking branch 'origin/storyD-3D' into storyD-3D
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/layout/SkyBox.java
8 years ago
Connor Taylor-Brown
963c8a43ad
Boats and marks are sized realistically in 3rd person
...
- Changed SeaSurface to Subject3D to suppress scaling
- Cameras can now be selected through View3D interface
#story[1190]
8 years ago
David Wu
bdb68a89c0
Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77
8 years ago
David Wu
7cea1fb11c
Reworking fxml for lobby.
8 years ago
hba56
bed9f8b07a
send out to every client fix
8 years ago
fjc40
ab96884dc6
Javadoc.
8 years ago
hba56
4adcd6322c
send out to every client
8 years ago
fjc40
55402136ed
Merge remote-tracking branch 'origin/master' into story_51_rounding_fix
...
# Conflicts:
# racevisionGame/src/main/java/mock/app/Event.java
# racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java
Also added keybindings.xml to git ignore.
#story[1185]
8 years ago
Joseph
771068966e
Just rotated the images to make them look like the plane is rotated properly... #story[1261]
8 years ago
fjc40
2a6085c9e8
Test fix.
8 years ago
fjc40
a1684a410c
Javadoc.
8 years ago
fjc40
9fa1b9ee67
Re-enabled source id allocator check.
...
Re-enabled rotation of map at startup.
Changed race.xml schema so that yacht elements aren't required inside the participants element.
#story[1185]
8 years ago
fjc40
3fa6b9200d
Finished MarkRoundingSequence class. Added MarkRoundingData class.
...
RaceState has a MarkRoundingSequenceMember.
The temporary rounding line drawing in canvas uses MarkRoundingSequence.
MockRace now uses MarkRoundingSequence.
#story[1185]
8 years ago
Fan-Wu Yang
3a6070a645
Fixed Merge and added back some merge changes #story[1196]
8 years ago