fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,092 Commits 1 Branch 0 Tags
346aa148ef495a7fb06cf4c420568f2b9a0b970c
Commit Graph
372 Commits
Author SHA1 Message Date
Connor Taylor-Brown bb7eb7cb44 Added adapter interface for PerspectiveCamera frustum and transformations in View3D. 
- Tested interface while initialising HostController

#story[1196]
 2017-08-30 15:05:08 +12:00
Connor Taylor-Brown e04f199fc7 Merge branch 'story86-3D' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story86-3D 2017-08-30 13:57:35 +12:00
Connor Taylor-Brown e7164d8a78 View3D perspective camera is now operational 
#story[1196]
 2017-08-30 13:57:15 +12:00
Fan-Wu Yang 4910d2712c Changed STL Importers Version #story[1191] 2017-08-30 13:56:57 +12:00
Fan-Wu Yang 921e0999b8 Testing if dependency for stl works this time #story[1191] 2017-08-30 13:01:37 +12:00
Fan-Wu Yang 0927e62ea3 Changed dependency to see if it will pass the CI runner #story[1191] 2017-08-30 12:46:05 +12:00
Connor Taylor-Brown cf838f2072 Added View3D control for rendering 3D shapes under a PerspectiveCamera, which is not currently working. 
#story[1196]
 2017-08-30 01:30:05 +12:00
Connor Taylor-Brown d630788a14 Merge remote-tracking branch 'remotes/origin/story77_lobby' into story86-3D 2017-08-29 22:55:07 +12:00
Fan-Wu Yang 43ec179d79 Merge branch 'story86-3D' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story86-3D 2017-08-29 20:36:15 +12:00
Fan-Wu Yang ea41c64c34 Added dependency for stl converter #story[1191] 2017-08-29 20:36:08 +12:00
David Wu 7df181c759 Minor changes to new lobby fxml. #story[1188] 2017-08-29 19:08:22 +12:00
David Wu 892320db5f Added javadoc and extra files to push 2017-08-29 19:03:34 +12:00
David Wu 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. 2017-08-29 19:02:02 +12:00
Joseph Gardner b0f7c5e734 Wind speed changes depending on where the wind direction is. #story[1187] 2017-08-29 15:53:41 +12:00
David Wu c63403d1de Created new lobby menu. Working on animated background for menu. 2017-08-29 15:11:09 +12:00
Joseph Gardner d0ba7b93e0 Wind oscillates, replaces random wind with shifting wind. #story[1187] 2017-08-29 14:40:52 +12:00
cbt24 1b1b0a4591 Added floating test cube in title screen initialiser 
#story[1191]
 2017-08-29 14:38:27 +12:00
Joseph Gardner 0be5b731c3 Merge branch 'master' into wind_(story53) 2017-08-29 13:22:15 +12:00
Joseph Gardner 12e2ae9c01 Started implementing wind oscillation. #story[1187] 2017-08-29 13:21:34 +12:00
Joseph Gardner 64e96a1b8b Class for shifting wind. #story[1187] 2017-08-29 12:14:28 +12:00
fjc40 eb980c436e Wind arrow now points in the direction the wind is blowing, as per P.O feedback (again....). 2017-08-18 22:58:47 +12:00
fjc40 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.
 2017-08-18 22:55:50 +12:00
fjc40 0d2be85d17 Brought over long/latitude fix from "rounding_line_visible_hack" branch. 2017-08-18 21:58:31 +12:00
hba56 b886cb426f guide line last leg fix 2017-08-17 22:38:31 +12:00
fjc40 666c7b029f Disabled map rotation - temp fix for the demo. 
Set race to use 3 boat race.xml file.
 2017-08-17 22:26:56 +12:00
David Wu 37095bfc6c Merged master into branch. 2017-08-17 17:02:24 +12:00
David Wu 5234cdea66 Merge branch 'master' into new_issue#19 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
 2017-08-17 17:00:39 +12:00
David Wu 598275591f Updated javadoc. 2017-08-17 16:50:51 +12:00
Joseph Gardner 5ba6f52669 fixed autovmg. 2017-08-17 16:50:13 +12:00
David Wu 79add59375 Unresizable control screen. 2017-08-17 16:37:31 +12:00
David Wu f1ef75fb81 Merge branch 'master' into new_issue#19 2017-08-17 16:34:19 +12:00
David Wu 03dd937713 Change fxml stuff. Added back to menu buttons. 2017-08-17 16:33:52 +12:00
Joseph Gardner dcd1df2999 Merged master. 2017-08-17 16:26:00 +12:00
Joseph Gardner 014b78f166 Merge branch 'master' into story_64_sails 2017-08-17 16:25:40 +12:00
Fan-Wu Yang 83b0c0a6b4 Fixed issue using File from java.io.File which did not like maven 2017-08-17 16:24:54 +12:00
David Wu 9f813ab7aa Merged in development. 2017-08-17 16:14:09 +12:00
Joseph Gardner e26fb73627 Merged master. 2017-08-17 16:08:23 +12:00
David Wu 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
 2017-08-17 16:05:59 +12:00
Joseph Gardner 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
 2017-08-17 16:04:53 +12:00
David Wu 09eaf6d968 Merged master. 2017-08-17 13:55:49 +12:00
Joseph Gardner 37fe7389ff Rounding marks works. 2017-08-17 13:55:33 +12:00
David Wu 5a188f0582 Merge branch 'master' into new_issue#19 2017-08-17 13:52:04 +12:00
Hamish Ball 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
 2017-08-17 13:50:44 +12:00
Joseph Gardner 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
 2017-08-17 13:50:21 +12:00
Hamish Ball 2edb6b5249 Merge branch 'issue#40' into 'master' 
Issue#40



See merge request !30
 2017-08-17 13:49:58 +12:00
David Wu c08bafa566 Fixed most of issue #19 with new master? 2017-08-17 13:49:43 +12:00
fjc40 2656efcb4d Marks are a bit darker. 
Wake no longer has circle at end.
 2017-08-17 13:30:10 +12:00
Fan-Wu Yang 2e9c6fe593 Merged most recent master in, #story[1092] 2017-08-17 13:23:55 +12:00
hba56 02ab0e8a00 added javadoc 2017-08-17 13:16:47 +12:00
hba56 3cf50c56f8 added a refresh for the info table so no new values are shown when the game is in full screen 2017-08-17 13:15:33 +12:00