028428da2c
Fixed fxml issues due to merge. Added pane centering for panes. #story[1188]
9 years ago
d2f0c1105a
Merged 3d branch. Added 3d item to one of the player pane. #story[1188]
9 years ago
b724a814b1
Merge branch 'story86-3D' into story77_lobby
...
# Conflicts:
# racevisionGame/src/main/resources/visualiser/scenes/hostlobby.fxml
9 years ago
d65ce1a897
Merge branch 'story77' into story77_lobby
9 years ago
88782182d7
Player panes and spectator list now call method on click. Will later be used for players to choose whether they want to play or spectate. #story[1188]
9 years ago
cf838f2072
Added View3D control for rendering 3D shapes under a PerspectiveCamera, which is not currently working.
...
#story[1196]
9 years ago
d630788a14
Merge remote-tracking branch 'remotes/origin/story77_lobby' into story86-3D
9 years ago
43ec179d79
Merge branch 'story86-3D' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story86-3D
9 years ago
ea41c64c34
Added dependency for stl converter #story[1191]
9 years ago
7df181c759
Minor changes to new lobby fxml. #story[1188]
9 years ago
892320db5f
Added javadoc and extra files to push
9 years ago
0621e1bdb1
Finished up lobby menu. Set split pane to not change size on resize. Disabled divider on split pane. Added quit button and start button (start only prints to terminal for now). Panes are now wrapped in an anchor pane to fix resizing issues. TODO: Will be working on making a nicer background animation.
9 years ago
ca0a3f2a8b
encoders and decoders for the hosted games request message with datatype and test
...
#story[1188]
9 years ago
c63403d1de
Created new lobby menu. Working on animated background for menu.
9 years ago
cb8e81a7b2
encoders and decoders for the host game message with datatype and test
...
#story[1188]
9 years ago
1b1b0a4591
Added floating test cube in title screen initialiser
...
#story[1191]
9 years ago
eb980c436e
Wind arrow now points in the direction the wind is blowing, as per P.O feedback (again....).
9 years ago
a9fde95b39
Updated maven version to 2.0.
...
Added a dedicatedServer module.
Removed Visualiser module.
Removed mock module.
Removed network module.
Fixed weird exception non-handling that appeared for some reason.
9 years ago
0d2be85d17
Brought over long/latitude fix from "rounding_line_visible_hack" branch.
9 years ago
b886cb426f
guide line last leg fix
9 years ago
666c7b029f
Disabled map rotation - temp fix for the demo.
...
Set race to use 3 boat race.xml file.
9 years ago
37095bfc6c
Merged master into branch.
9 years ago
5234cdea66
Merge branch 'master' into new_issue#19
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
9 years ago
598275591f
Updated javadoc.
9 years ago
5ba6f52669
fixed autovmg.
9 years ago
79add59375
Unresizable control screen.
9 years ago
f1ef75fb81
Merge branch 'master' into new_issue#19
9 years ago
03dd937713
Change fxml stuff. Added back to menu buttons.
9 years ago
dcd1df2999
Merged master.
9 years ago
014b78f166
Merge branch 'master' into story_64_sails
9 years ago
83b0c0a6b4
Fixed issue using File from java.io.File which did not like maven
9 years ago
9f813ab7aa
Merged in development.
9 years ago
e26fb73627
Merged master.
9 years ago
288979be3b
Merge branch 'Development' into new_issue#19
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/RaceController.java
# racevisionGame/src/main/java/visualiser/app/App.java
9 years ago
d41e52766b
Merge branch 'master' into story_64_sails
...
# Conflicts:
# racevisionGame/src/main/java/mock/model/MockRace.java
# racevisionGame/src/main/java/visualiser/Controllers/ConnectionController.java
# racevisionGame/src/main/java/visualiser/model/VisualiserBoat.java
9 years ago
09eaf6d968
Merged master.
9 years ago
37fe7389ff
Rounding marks works.
9 years ago
5a188f0582
Merge branch 'master' into new_issue#19
9 years ago
d2f9bfedcb
Merge branch 'issue_18_track_alpha' into 'master'
...
Issue 18 track alpha
This should resolve #18 .
Track point system is now a line, and updated more frequently.
Line fades over time.
The boat wake is also longer, and has a black dot at the end.
See merge request !28
9 years ago
610aa96241
Merge branch 'MapWindRotation' into 'master'
...
Map wind rotation
Note: we'd like to generate a realistic course layout, that can vary from race to race (but not within a race, for now.) The generated layout must be sent through the API in the format given by the race.xml section of the AC35 Streaming Data Interface Specification. The AC35 Protocol (sections 31.4 and 31.5) specifies the requirements for a course:
* First leg of the course (from start line to first mark) must be a reaching leg
* Next legs are windward/leeward, and boats complete either two or three laps of this section
* Final leg to finish line may be a reaching leg
* A boat should take around 25 minutes to complete the course in the wind conditions at the start of the race (AC35 protocol, section 31.5)
You should assume that the windward/leeward marks and start/finish lines are always compounds of two marks.
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.
See merge request !22
9 years ago
2edb6b5249
Merge branch 'issue#40' into 'master'
...
Issue#40
See merge request !30
9 years ago
c08bafa566
Fixed most of issue #19 with new master?
9 years ago
2656efcb4d
Marks are a bit darker.
...
Wake no longer has circle at end.
9 years ago
2e9c6fe593
Merged most recent master in, #story[1092]
9 years ago
02ab0e8a00
added javadoc
9 years ago
3cf50c56f8
added a refresh for the info table so no new values are shown when the game is in full screen
9 years ago
a50d460222
Merged master.
9 years ago
0f58270c10
Merge branch 'master' into issue_18_track_alpha
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/model/VisualiserRaceState.java
9 years ago
7546c65893
Merge branch 'master' into MapWindRotation
...
# Conflicts:
# racevisionGame/src/main/java/shared/model/CompoundMark.java
# racevisionGame/src/main/java/shared/model/Mark.java
9 years ago
20c9870fea
Merge branch 'master' into story_64_sails
...
# Conflicts:
# racevisionGame/src/main/java/shared/model/Boat.java
# racevisionGame/src/main/java/visualiser/Commands/VisualiserRaceCommands/BoatLocationCommand.java
9 years ago
David Wu
Connor Taylor-Brown
Fan-Wu Yang
hba56
fjc40
Joseph Gardner