fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,199 Commits 1 Branch 0 Tags
7b97e93d3ac87172d9dd5b73b30618eb3851a216
Commit Graph
1199 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
zwu18 c7af4f2eb7 Made changes to tutorial xmls. Linked button in title menu to start up a race on mouse click. Will need to make it so it starts the tutorial on click. #story[1189] 2017-08-31 19:54:22 +12:00
Fan-Wu Yang 9a5d20bdf2 Added new polar function, currently it does not distinguish between up wind and downwind and doesn't find it in the correct quadrant #story[1186] 2017-08-31 17:39:17 +12:00
Jessica Syder 8250226bde Key bindings can be updated with any key. 
- Changed key press from FXML key event to a listener
- UP, DOWN, ENTER keys now work
- Keys no longer change cells or press buttons
- Added placeholder buttons Cancel, Reset and Save
- Added some JavaDoc

#story[1197]
 2017-08-31 15:00:37 +12:00
Joseph 0de7780020 Changed wind speed to be non-linear. #story[1187] 2017-08-31 12:26:30 +12:00
Connor Taylor-Brown 3cc806dc45 Returned rotation to boat in lobby 
#story[1196]
 2017-08-31 01:06:33 +12:00
Connor Taylor-Brown fb7bf572d8 Changed View3D add-remove interface to an ObservableList 
#story[1196]
 2017-08-31 00:59:36 +12:00
Connor Taylor-Brown b6e56d815c ResizableRaceCanvas no longer depends on VisualiserRaceEvent 
#story[1196]
 2017-08-30 18:52:29 +12:00
Jessica Syder ad0e26e882 Created scene to view/update current key bindings. 
- Current key bindings are shown on buttons
- Added button action events to store the clicked button
- Added key press event to entire pane
- Button text is updated to display its key
- Added functionality to keyFactory to update key bindings
- CSS styling for some components

#story[1197]
 2017-08-30 17:16:15 +12:00
Connor Taylor-Brown c2fd5c9bae Changed box to boat mesh 
- Mesh needs to be rotated -90 degrees on X
- STL file has been added to assets

#story[1196]
 2017-08-30 15:49:20 +12:00
Connor Taylor-Brown cc66d63096 Removed unused shapes list from View3D 
#story[1196]
 2017-08-30 15:18:08 +12:00
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
David Wu 86f1a608e4 Created xml for tutorial that contains start and finish line. TODO: Add gate/mark. #story[1189] 2017-08-30 14:51:56 +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
David Wu 23d58dc809 Created UI option in the start menu to play a practice game. #story[1189] 2017-08-30 13:26:18 +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
Hamish Ball 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
 2017-08-29 11:16:47 +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
Hamish Ball 27e8cddd94 Merge branch 'new_issue#19' into 'master' 
New issue#19



See merge request !31
 2017-08-17 17:08:55 +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
Joseph Gardner 0490237c0c Merge branch 'story_64_sails' into 'master' 
Story 64 sails



See merge request !29
 2017-08-17 16:59:50 +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