42 Commits (246d6bcc71c2febc630578e40ec0c2e96cd12f15)

Author SHA1 Message Date
Connor Taylor-Brown 246d6bcc71 CSS now works on startup
8 years ago
Connor Taylor-Brown 315bb64bb3 Boat on start screen now follows infinite loop
8 years ago
Connor Taylor-Brown 4f229ad01c Implemented basic 3D start screen with no background race
8 years ago
Connor Taylor-Brown 51413257b2 Modified title screen to use View3D with skybox and ambient lighting
8 years ago
Joseph Gardner 14b5f4bdf1 Merge branch 'master' into storyD-3D
8 years ago
hba56 4c52673fc1 javadoc fixes
8 years ago
Jessica Syder e664619a81 Tutorial is played with tutorial map.
8 years ago
Connor Taylor-Brown d90b161d01 Merge branch 'master' into storyA_sounds
8 years ago
Jessica Syder 9bc36ba544 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
8 years ago
Jessica Syder c30391ef23 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
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
Jessica Syder 669a303e9b Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
8 years ago
David Wu b976186c7d Merged current master in. Made changes to classes so tutorial again due to merge. #story[1189]
8 years ago
David Wu 28ec4b9246 Merge branch 'master' into story70
8 years ago
Jessica Syder 0dff85006a Changes to code to use new controller structure.
8 years ago
Jessica Syder a5050b8ea8 Adding back lost changes and finishing splitting last controllers.
8 years ago
Jessica Syder 9f3cc53a63 Finished Arrow, Title and StartController scene splitting
8 years ago
Jessica Syder 4a0d04d7ab Created new abstract Controller class with load methods.
8 years ago
Jessica Syder addaaf0de3 Merge remote-tracking branch 'remotes/origin/master' into C_keybindings
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 086206a623 Controls button in title screen now opens the key mapping menu. #story[1197]
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
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]
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
cbt24 1b1b0a4591 Added floating test cube in title screen initialiser
8 years ago
David Wu 37095bfc6c Merged master into branch.
8 years ago
David Wu 5234cdea66 Merge branch 'master' into new_issue#19
8 years ago
David Wu 79add59375 Unresizable control screen.
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
Jessica Syder 7c5670f8c2 Sails are displayed on first boat in a race. Optimised imports.
8 years ago
Fan-Wu Yang 442920f9f6 DOD, and added javadocs/fixed javadocs #story[1087]
9 years ago
hba56 85347c169d You can now resize all windows other than the title screen
9 years ago
hba56 64b4aa539a added and option to swap between css files in the title pane
9 years ago
zwu18 243c450790 Merged with multi visualiser branch so now multiple visualisers can connect to the same host.
9 years ago
zwu18 9c9b98f882 Added functionality to host game and join a game in lobby. Host name and game name are not implemented yet.
9 years ago
David Wu 9159e16a21 Set up controller classes for lobby and host. Made changes to TitleController and MainController. Title screen can now enter lobby and host.
9 years ago
Jessica McAuslin 4ba9c6b774 Added a pretty title screen to the application.
9 years ago