4910d2712c
Changed STL Importers Version #story[1191]
8 years ago
23d58dc809
Created UI option in the start menu to play a practice game. #story[1189]
8 years ago
921e0999b8
Testing if dependency for stl works this time #story[1191]
8 years ago
0927e62ea3
Changed dependency to see if it will pass the CI runner #story[1191]
8 years ago
b2bd4fdc1c
network interface
8 years ago
028428da2c
Fixed fxml issues due to merge. Added pane centering for panes. #story[1188]
8 years ago
d2f0c1105a
Merged 3d branch. Added 3d item to one of the player pane. #story[1188]
8 years ago
b724a814b1
Merge branch 'story86-3D' into story77_lobby
...
# Conflicts:
# racevisionGame/src/main/resources/visualiser/scenes/hostlobby.fxml
8 years ago
d65ce1a897
Merge branch 'story77' into story77_lobby
8 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]
8 years ago
cf838f2072
Added View3D control for rendering 3D shapes under a PerspectiveCamera, which is not currently working.
...
#story[1196]
8 years ago
d630788a14
Merge remote-tracking branch 'remotes/origin/story77_lobby' into story86-3D
8 years ago
43ec179d79
Merge branch 'story86-3D' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story86-3D
8 years ago
ea41c64c34
Added dependency for stl converter #story[1191]
8 years ago
7df181c759
Minor changes to new lobby fxml. #story[1188]
8 years ago
892320db5f
Added javadoc and extra files to push
8 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.
8 years ago
b0f7c5e734
Wind speed changes depending on where the wind direction is. #story[1187]
8 years ago
ca0a3f2a8b
encoders and decoders for the hosted games request message with datatype and test
...
#story[1188]
8 years ago
c63403d1de
Created new lobby menu. Working on animated background for menu.
8 years ago
d0ba7b93e0
Wind oscillates, replaces random wind with shifting wind. #story[1187]
8 years ago
cb8e81a7b2
encoders and decoders for the host game message with datatype and test
...
#story[1188]
8 years ago
1b1b0a4591
Added floating test cube in title screen initialiser
...
#story[1191]
8 years ago
0be5b731c3
Merge branch 'master' into wind_(story53)
8 years ago
12e2ae9c01
Started implementing wind oscillation. #story[1187]
8 years ago
5b6b0a9978
added the new program for holding known games
...
#stroy[1188]
8 years ago
64e96a1b8b
Class for shifting wind. #story[1187]
8 years ago
7086af6057
Merge branch 'demo_6_no_rotation' into 'master'
...
Removed old modules & fixed wind arrow direction
This branch removes the old modules (visualiser, network, mock), and adds a new one - dedicatedServer.
It also fixes the wind arrow direction as pointed out by P.O during the demo.
Changed the maven version number to 2.0.
This branch also has the map rotation disabled until we get rotation+rounding working together.
See merge request !32
8 years ago
eb980c436e
Wind arrow now points in the direction the wind is blowing, as per P.O feedback (again....).
8 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.
8 years ago
0d2be85d17
Brought over long/latitude fix from "rounding_line_visible_hack" branch.
8 years ago
b886cb426f
guide line last leg fix
8 years ago
666c7b029f
Disabled map rotation - temp fix for the demo.
...
Set race to use 3 boat race.xml file.
8 years ago
27e8cddd94
Merge branch 'new_issue#19' into 'master'
...
New issue#19
See merge request !31
8 years ago
37095bfc6c
Merged master into branch.
8 years ago
5234cdea66
Merge branch 'master' into new_issue#19
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
8 years ago
0490237c0c
Merge branch 'story_64_sails' into 'master'
...
Story 64 sails
See merge request !29
8 years ago
598275591f
Updated javadoc.
8 years ago
5ba6f52669
fixed autovmg.
8 years ago
79add59375
Unresizable control screen.
8 years ago
f1ef75fb81
Merge branch 'master' into new_issue#19
8 years ago
03dd937713
Change fxml stuff. Added back to menu buttons.
8 years ago
dcd1df2999
Merged master.
8 years ago
014b78f166
Merge branch 'master' into story_64_sails
8 years ago
83b0c0a6b4
Fixed issue using File from java.io.File which did not like maven
8 years ago
9f813ab7aa
Merged in development.
8 years ago
e26fb73627
Merged master.
8 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
8 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
8 years ago
09eaf6d968
Merged master.
8 years ago
Fan-Wu Yang
David Wu
hba56
Connor Taylor-Brown
Joseph Gardner
fjc40