fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,192 Commits 1 Branch 0 Tags
490aab3f8dac52cae89ee5e1c8375f3631bc2471
Commit Graph
280 Commits
Author SHA1 Message Date
cbt24 05a0614246 Boats now rotate correctly in position rather than about the origin 
#story[1261]
 2017-09-05 16:02:20 +12:00
cbt24 3ecf203cba Recovered stable rotation of the player's boat 
- Uses AnimationTimer rather than listeners
- Reduced pre-start time to speed up testing

#story[1261]
 2017-09-05 15:19:04 +12:00
Connor Taylor-Brown c74cc26bf1 Merged with master and changed View3D default background 
- Removed sparkline from RaceController

#story[1261]
 2017-09-05 12:17:55 +12:00
Connor Taylor-Brown b8c99be201 Merge branch 'master' into storyD-3D 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/RaceController.java
 2017-09-05 00:17:22 +12:00
cbt24 971a061499 View3D within RaceController now tracks boat heading 
- Race leaves lobby on Warning status for development
- Latest subject added is used as camera pivot

#story[1261]
 2017-09-04 18:51:37 +12:00
hba56 8287fbf6ba Updated the HostGame window to support maps 
#story[1193]
 2017-09-04 15:05:31 +12:00
Jessica Syder 35c595adf8 Merge branches 'master' and 'storyD-3D' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into storyD-3D 2017-09-04 14:00:20 +12:00
Jessica Syder addaaf0de3 Merge remote-tracking branch 'remotes/origin/master' into C_keybindings 2017-09-04 13:23:55 +12:00
Jessica Syder 85eb66d508 Keybindings can be saved and loaded, and work when Jar'd! 
- trying to solve jar file reading issue
- learnt a lot about jars including their lack of file structure
- changed location of keybindings settings to outside of jar
- added new folder/file that is generated on first run

#story[1197]
 2017-09-04 12:30:01 +12:00
fjc40 dd1cb89b66 Merge remote-tracking branch 'origin/master' into 77_racexml_updates 2017-09-04 11:28:21 +12:00
Joseph f1c07bca46 Linked table to show games from received packets. #story[1188] 2017-09-04 09:53:26 +12:00
Joseph f8e1a539c2 Linked table to show games from received packets. #story[1188] 2017-09-04 09:46:13 +12:00
Connor Taylor-Brown 0ee448e17d Created wrapper for controlling the position and heading of rendered 3D models. 
- Updated View3D to use Subject3D wrappers instead of Shape3D
- Fixed HostController for the new architecture
- Made position and heading observable in VisualiserBoat
- Attached listeners to each VisualiserBoat in RaceController

#story[1261]
 2017-09-04 01:27:29 +12:00
Jessica Syder cfa6fc37e0 User modified keybindings are persistently saved 
- Works on windows computers
- KeyFactory processes its own XML saving/loading
- Does not work with Jar yet
- Changed keyFactory to static temporarily to work with existing FXML loading architecture

#story[1197]
 2017-09-03 20:44:27 +12:00
fjc40 e3cbb6d482 Start game button actually starts the game. 2017-09-03 16:39:59 +12:00
Jessica Syder 3fdfbd83e0 User can save, reset or cancel. 
- Created a notification popups for errors
- Added functionality to save, cancel and reset buttons
- Key bindings are only saved if they're valid
- Added window close event
- Can not exit without saving correctly
- CSS to cancel, save and reset buttons to differentiate between key buttons
- Javadocd

#story[1197]
 2017-09-01 14:29:18 +12:00
David Wu 086206a623 Controls button in title screen now opens the key mapping menu. #story[1197] 2017-09-01 13:44:09 +12:00
David Wu 65b960f725 Background of title now changes colour depending on day mode and night mode. Sun image also changes. This is so that the tutorial label is more visible during night mode. #story[1189] 2017-09-01 13:28:05 +12:00
David Wu ea029baf22 Tutorial option in title screen will now created a game with tutorial xmls. Host game will now created a game with the race xml instead of tutorial xml as well. Made changes to tutorial label in title. #story[1189] 2017-09-01 12:28:09 +12:00
hba56 5676d435b0 hosts now send info then wait rather than wait then send 
#story[1188]
 2017-09-01 12:20:48 +12:00
fjc40 9156bde8af Moved XML message creation to RaceServer instead of ConnectionAcceptor. 
RaceServer does not currently generate new XMLMessages - NYI.
Added a sequence number to RaceDataSource - this is used to indicate that the data source has been modified.
#story[1188]
 2017-09-01 01:19:17 +12:00
Jessica Syder 716a99aac7 Reset to default button is now functional. 
- keybindings are reset to built in default
- the table is cleared and reloaded

#story[1197]
 2017-08-31 22:58:35 +12:00
Jessica Syder 3e720a9e16 Modified key bindings can be saved to use in a race. 
- new key bindings replace old new bindings on save
- javadoc save method and small updates

#story[1197]
 2017-08-31 22:47:57 +12:00
Jessica Syder 278fb65852 Pressing ESC cancels the selected command's key from being replaced 
- focus is shifted away on esc
- focus is shifted away after successful change

#story[1197]
 2017-08-31 22:39:19 +12:00
Jessica Syder ce47b0d813 When a new key is bound other commands bound to this key are removed 
- On binding new key existing keys are searched
- If key is in use the old one is removed
- ControlKey is updated with a placeholder key value

#story[1197]
 2017-08-31 22:28:55 +12:00
Jessica Syder 2188ddc3a3 Fixed errors in making the keybinding replaceable. 
- Changed KeyFactory to not be a singleton
- Simplified keyBindings initializer
- Modified and simplified keyListener
- Added method to copy existing keyState
- Changed button events
- Changed to newer lambda functions
- Modified updateKey method
- Left option for multiple keys bound to one command
- Updated and wrote new JavaDoc

#story[1197]
 2017-08-31 21:59:28 +12:00
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
hba56 d1c0797db7 hosting a game now continues to send out the info of the race 
#story[1188]
 2017-08-31 15:06:43 +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
hba56 9161f69547 updating match table to store ip and port of clients and hosts 
#story[1188]
 2017-08-31 13:45:04 +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
hba56 83f756d7d8 packets can now be sent from client to match server 
#story[1188]
 2017-08-30 15:26:54 +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 e7164d8a78 View3D perspective camera is now operational 
#story[1196]
 2017-08-30 13:57:15 +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
hba56 b2bd4fdc1c network interface 2017-08-30 12:13:17 +12:00
David Wu 028428da2c Fixed fxml issues due to merge. Added pane centering for panes. #story[1188] 2017-08-30 12:04:17 +12:00
David Wu d2f0c1105a Merged 3d branch. Added 3d item to one of the player pane. #story[1188] 2017-08-30 11:52:45 +12:00
David Wu b724a814b1 Merge branch 'story86-3D' into story77_lobby 
# Conflicts:
#	racevisionGame/src/main/resources/visualiser/scenes/hostlobby.fxml
 2017-08-30 11:46:00 +12:00
David Wu 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] 2017-08-30 11:39:41 +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