70 Commits (7b076f37186464ed8a4b3f60bed229cf085b0c41)

Author SHA1 Message Date
Connor Taylor-Brown d90b161d01 Merge branch 'master' into storyA_sounds
8 years ago
zwu18 1a9f24a3ba Forgot to hide race.fxml :P #story[1189]
8 years ago
zwu18 fc9a4898d6 Made changes based on DoD review. Class documentation and commenting added. Removed annotation features. Removed sout commands. #story[1189]
8 years ago
David Wu c97706d86e Merge branch 'master' into story70
8 years ago
David Wu c6594a0e20 Tutorial text now displays on screen when in tutorial. #story[1189]
8 years ago
David Wu 9a96131a33 Fixed issue where wind arrow, accordion, time, etc. were not being displayed. Fixed issue where zooming would crash when done outside of tutorial. #story[1189]
8 years ago
David Wu bad6422ca9 Implemented tutorial for zooming as it was left out from the last commit. Refactored updating tutorial state. #story[1189]
8 years ago
David Wu d2d5ae62eb Tutorial states implemented and working. Game currently prints to terminal the "tutorial text". Next step is to create display on application for these text. Game ends when tutorial ends. Fixed game not loading xml issue. #story[1189]
8 years ago
David Wu 28ec4b9246 Merge branch 'master' into story70
8 years ago
hba56 ae8fa312a3 removed sout and added a longer startup time. Also fixed race xmls to remove set boats
8 years ago
hba56 ea1594a839 Merge remote-tracking branch 'remotes/origin/master' into Story_76
8 years ago
Jessica Syder 14aaf26b73 Merge branch 'story40-zoom' into 'master'
8 years ago
hba56 5e516b0508 re added the standard race
8 years ago
Connor Taylor-Brown 0c9e55093c Set lobby anchor pane to invisible to allow races to start
8 years ago
hba56 d3ddff8bf1 host game start button added margins
8 years ago
Connor Taylor-Brown 54baf4f884 Added scroll-wheel zooming
8 years ago
hba56 e82c59a8a4 New css for the host game window
8 years ago
Fan-Wu Yang 7024cac426 Rotated image of arrow direction #story[1187]
8 years ago
hba56 0886a60911 arrow Flip
8 years ago
hba56 4ec2a50d20 Image Scales
8 years ago
hba56 4eac3ea8b5 Updated the HostGame now has images for the maps and the map can be picked
8 years ago
David Wu 8b5a5506e7 Boat collisions now play a sound when user collides and a quieter sound when others collide. #story[1195]
8 years ago
hba56 8287fbf6ba Updated the HostGame window to support maps
8 years ago
Jessica Syder addaaf0de3 Merge remote-tracking branch 'remotes/origin/master' into C_keybindings
8 years ago
Jessica Syder 85eb66d508 Keybindings can be saved and loaded, and work when Jar'd!
8 years ago
zwu18 cd685ae467 Added sound effect files for button clicks and mark rounding and linked them up to application. Collision audio is added too but not linked up. #story[1195]
8 years ago
Jessica Syder cfa6fc37e0 User modified keybindings are persistently saved
8 years ago
Jessica Syder 3fdfbd83e0 User can save, reset or cancel.
8 years ago
David Wu c3be9665ac Added button press sounds for hosting a game, entering lobby list and entering host menu. #story[1195]
8 years ago
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]
8 years ago
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]
8 years ago
Jessica Syder 8250226bde Key bindings can be updated with any key.
8 years ago
Jessica Syder ad0e26e882 Created scene to view/update current key bindings.
8 years ago
David Wu 86f1a608e4 Created xml for tutorial that contains start and finish line. TODO: Add gate/mark. #story[1189]
8 years ago
David Wu 23d58dc809 Created UI option in the start menu to play a practice game. #story[1189]
8 years ago
Connor Taylor-Brown cf838f2072 Added View3D control for rendering 3D shapes under a PerspectiveCamera, which is not currently working.
8 years ago
David Wu 7df181c759 Minor changes to new lobby fxml. #story[1188]
8 years ago
David Wu 892320db5f Added javadoc and extra files to push
8 years ago
David Wu c63403d1de Created new lobby menu. Working on animated background for menu.
8 years ago
David Wu 5234cdea66 Merge branch 'master' into new_issue#19
8 years ago
David Wu 03dd937713 Change fxml stuff. Added back to menu buttons.
8 years ago
Joseph Gardner d41e52766b Merge branch 'master' into story_64_sails
8 years ago
Joseph f60809bdd4 Merge branch 'master' into story_64_sails
8 years ago
zwu18 317582aae8 Merge branch 'issue#20fix' into Development
8 years ago
zwu18 4e8b7d3b5a Merge remote-tracking branch 'origin/master' into issue#20fix
8 years ago
hba56 fdd0b30a51 Added the ability to hide and show info table with a key press
8 years ago
zwu18 5e0bcd2af5 Added control menu to title screen. Pressing control button will open a pop-up window showing game controls.
8 years ago
fjc40 3a0bd10a57 Merge remote-tracking branch 'origin/master' into story_61
8 years ago
fjc40 7366aba5ec Added empty data sources, to be used by VisualiserRace.
8 years ago
hba56 499a409d4f Merge branch 'master' into story68
8 years ago