fanwuyang
/
SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1395 Commits
1 Branch
0 Tags
227 MiB
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '49c08f5687'
${ noResults }
Commit Graph

647 Commits (49c08f5687f5678f6479c8371aab565a3c392567)

Author SHA1 Message Date
Connor Taylor-Brown fbd124e602 Merge branch 'master' into storyB-)
8 years ago
hba56 e3ddb272c0 Merge remote-tracking branch 'remotes/origin/master' into story77
8 years ago
Connor Taylor-Brown 59bd22c2aa Fixed mark rounding
8 years ago
Connor Taylor-Brown 0f316afb3c Added colour indication to next mark
8 years ago
Joseph 7a8ea7fea7 Made seasurface overlay to enable skybox to be smaller. #story[1261]
8 years ago
Connor Taylor-Brown b902b05e5e Wrote possible fix for issue #50 (Composite command tries to remove non-existent element)
8 years ago
Connor Taylor-Brown d90b161d01 Merge branch 'master' into storyA_sounds
8 years ago
Joseph 49cd19e1a8 Made and textured a skybox, still needs to be fixed on two sides. #story[1261]
8 years ago
Jessica Syder 0cb008cef7 Removed a couple of old canvas lines.
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 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
Fan-Wu Yang 2cda5ea70d Lobby no longer glitches out when a person disconnects and reconnects without restarting the program #story[1188]
8 years ago
Connor Taylor-Brown 5e35cd4195 Removed empty java files
8 years ago
Fan-Wu Yang 54a9140f31 lobby listener is added and removed so that the program doesn't drasticaly slow down when the lobby is connected to multiple times #story[1188]
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
Jessica Syder 108643b59d Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
8 years ago
Fan-Wu Yang df04cdf87c Boats are now visualy removed when they leave the lobby.
8 years ago
Joseph Gardner 0da6931f8f Have structure for skybox, still need to play around with it a bit more to make it fit. #story[1261]
8 years ago
Fan-Wu Yang d92410b9b4 Fixed XML Issue where sometimes the last boat would not display itself #story[1188]
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 c97706d86e Merge branch 'master' into story70
8 years ago
fjc40 346aa148ef Added some debug statements, and WIP MarkRoundingSequence class.
8 years ago
Fan-Wu Yang ae75bb86d3 Resized models to a similar size of the collision detectors. #story[1261]
8 years ago
Fan-Wu Yang 08ca42f786 Wrote some missing java docs #story[1261]
8 years ago
Fan-Wu Yang 9ac9c25923 Made sea surface look like a sea surface which is randomly generated each time, size may need to be altered a bit else it will cause the program to slow #story[1261]
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
Fan-Wu Yang a7eefca13a Work in progress, the perlin noise is now generated, however, a good colour should be selected as well as using a subject3d instead of a imageview #story[1261]
8 years ago
David Wu 28ec4b9246 Merge branch 'master' into story70
8 years ago
Fan-Wu Yang e2b868d815 Added boundaries to the map, which are drawn by the race #story[1261]
8 years ago
cbt24 70f4a00d12 Scaled down marks and boats to make 3rd person view more realistic
8 years ago
hba56 ddc3a6ae47 boxes in lobby are now boats
8 years ago
hba56 e5d8a4028d Merge remote-tracking branch 'remotes/origin/master' into story77
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
cbt24 2508b847b8 Merge branch 'master' into storyD-3D
8 years ago
cbt24 643f145407 Added mark radius 3D annotation to improve bird's eye visibility
8 years ago
Jessica Syder 14aaf26b73 Merge branch 'story40-zoom' into 'master'
8 years ago
Jessica Syder 1ed7ccf146 Minor changes preparing to merge in 3D
8 years ago
Connor Taylor-Brown 93883ee8b7 Added more descriptive documentation to new classes and functionality
8 years ago
Jessica Syder 0dff85006a Changes to code to use new controller structure.
8 years ago
Fan-Wu Yang e149255240 Tried to get multiple boats working but.... it's not #story[1196]
8 years ago
Fan-Wu Yang 5bc382304b Created and linked up bouy to race, and added keybindings to git ignore #story[1196]
8 years ago
hba56 5e516b0508 re added the standard race
8 years ago
Jessica Syder a5050b8ea8 Adding back lost changes and finishing splitting last controllers.
8 years ago
hba56 4c2ab9cc9a Merge branch 'master' into story77
8 years ago
Connor Taylor-Brown 0c9e55093c Set lobby anchor pane to invisible to allow races to start
8 years ago
Jessica Syder a5d3434a70 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
8 years ago
hba56 4780354452 Errors in this commit: mock threads get interrupted
8 years ago
Connor Taylor-Brown b034a452b6 Fixed problem with race pane registering non-control keys
8 years ago
Joseph Gardner 2868f921e2 Only one angular command can be active at a time. Only one velocity command can be active at a time. #story[1196]
8 years ago
Connor Taylor-Brown 68f434b6b6 Bound zooming action to zoom keys
8 years ago
Joseph Gardner df624a8437 Angular movement when auto vmg is pressed is smoothed. #story[1196]
8 years ago
Connor Taylor-Brown 1efec06bdc View3D can untrack objects and zoom in different modes
8 years ago
Joseph Gardner d2c8ccd98e Course image for a type M2 course has been made. #story[1193]
8 years ago
fjc40 ec82e65ae7 Fixed javadocs in xml creation classes.
8 years ago
hba56 63e2cc1fd0 Merge remote-tracking branch 'remotes/origin/story77_lobby' into story77
8 years ago
Joseph Gardner 3157ac88b5 Course layout for a type M2 course has been made. #story[1193]
8 years ago
Connor Taylor-Brown 23eabed3ff View3D tracks selected boat at fixed distance, pitch, and relative yaw
8 years ago
Connor Taylor-Brown b59eca1a8b Added Subject3D selection to View3D
8 years ago
hba56 a494eb4a6d games are now added on the correct port
8 years ago
hba56 d3ddff8bf1 host game start button added margins
8 years ago
zwu18 64ed1f9aa6 Improved map layout image. #story[1193]
8 years ago
Connor Taylor-Brown 54baf4f884 Added scroll-wheel zooming
8 years ago
Jessica Syder a2b3ba44c0 RaceController scene separating
8 years ago
Fan-Wu Yang 7bad0e53ff The boat is now viewable in top down view (60 degrees for isometric) and the race is playable #story[1261]
8 years ago
Jessica Syder 9f3cc53a63 Finished Arrow, Title and StartController scene splitting
8 years ago
David Wu 55cfda33d0 Merge branch 'Story_76' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into Story_76
8 years ago
David Wu 002cccd5a0 Reworked iMapLayout as race would either take too long or too short. Added temporary image for iMapLayout. Will be reworked when I have time. #story[1193]
8 years ago
Fan-Wu Yang 18a689b110 Changed a constant to be using the one in the constants file (prepartory start time) and temporarily made it so that the race can start in 3 seconds. #story[1261]
8 years ago
hba56 e82c59a8a4 New css for the host game window
8 years ago
hba56 cbfcd3aa0d Images
8 years ago
cbt24 8c7345a30d Documented command classes
8 years ago
cbt24 a6db06a82c Boats now reverse smoothly when colliding
8 years ago
cbt24 9cba3934ea Sails command now applies acceleration to boat
8 years ago
cbt24 eba70ab2d4 Sails command now listens to race to check if goal velocity is met
8 years ago
cbt24 b62344261a Merge remote-tracking branch 'remotes/origin/master' into storyB-)
8 years ago
cbt24 844b48a81a Resolved issue #42 - "putting sails out changes boat bearing to face target gate"
8 years ago
Connor Taylor-Brown e3e61e5b28 Merge remote-tracking branch 'remotes/origin/master' into storyD-3D
8 years ago
hba56 dfd3cb96f3 removed System.out.println
8 years ago
Fan-Wu Yang ae1526c457 Merge branch 'master' into vmg_fix
8 years ago
Fan-Wu Yang 7024cac426 Rotated image of arrow direction #story[1187]
8 years ago
Fan-Wu Yang 8eee282977 Merge branch 'wind_(story53)' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into wind_(story53)
8 years ago
hba56 0886a60911 arrow Flip
8 years ago
hba56 86f495a551 javaDoc
8 years ago
Fan-Wu Yang 5bb8ba44b8 Fixed Javadoc and also made some variables private #story[1187]
8 years ago
Fan-Wu Yang 2382585c15 Fixed Javadoc and also made some variables private #story[1187]
8 years ago
Joseph Gardner 00cedf4d4d TackGybeCommand now smooths the rotation of the boat. #story[1196]
8 years ago
hba56 4ec2a50d20 Image Scales
8 years ago
Connor Taylor-Brown d89186d8bf Finished playable 3D race with first person camera
8 years ago
hba56 4eac3ea8b5 Updated the HostGame now has images for the maps and the map can be picked
8 years ago
hba56 9560486248 Merge branch 'Story_76' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into Story_76
8 years ago
hba56 6b9c041c6b Merge remote-tracking branch 'remotes/origin/master' into wind_(story53)
8 years ago
hba56 dbd4703e74 javadoc fix
8 years ago
Fan-Wu Yang 06517b7b47 Tidied up code
8 years ago
Fan-Wu Yang d602c1ec6f VMG is now working and fixed, however, it feels a bit odd #story[1182]
8 years ago
David Wu b22c5c5cd6 Created xml for new course layout. Marks and such are all added. Need to set up boundary when I have time. #story[1193]
8 years ago
Fan-Wu Yang 7331ad1a20 VMG now works however some little bug in the interpolation in some quadrant that is making the speed all the same in the quadrant #story[1182]
8 years ago
cbt24 19f4d0fc06 Added marks back to the race view
8 years ago
cbt24 05a0614246 Boats now rotate correctly in position rather than about the origin
8 years ago
cbt24 3ecf203cba Recovered stable rotation of the player's boat
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
Fan-Wu Yang 7aaa880f40 VMG now works with some edge cases issues #story[1182]
8 years ago
Joseph f4cb1a3ac4 Made ObserverCommands and made racestate an observable. ObserverCommands observes the race passes in the params. #story[1196]
8 years ago
Connor Taylor-Brown c74cc26bf1 Merged with master and changed View3D default background
8 years ago
Connor Taylor-Brown b8c99be201 Merge branch 'master' into storyD-3D
8 years ago
Jessica Syder 4a0d04d7ab Created new abstract Controller class with load methods.
8 years ago
cbt24 971a061499 View3D within RaceController now tracks boat heading
8 years ago
Jessica Syder 1073113589 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
8 years ago
hba56 8287fbf6ba Updated the HostGame window to support maps
8 years ago
Fan-Wu Yang 71dcc8ee6c Added POlar Linear Interpolation #story[1186]
8 years ago
David Wu 8c1eded926 Boat collision packets are now sent. Command class created for boat collision. Currently prints out message depending on if user crashed or someone else crashed. #story[1195]
8 years ago
Jessica Syder 35c595adf8 Merge branches 'master' and 'storyD-3D' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into storyD-3D
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
fjc40 361856ea1d Updated timescale.
8 years ago
fjc40 dd1cb89b66 Merge remote-tracking branch 'origin/master' into 77_racexml_updates
8 years ago
Joseph f1c07bca46 Linked table to show games from received packets. #story[1188]
8 years ago
Joseph f8e1a539c2 Linked table to show games from received packets. #story[1188]
8 years ago
Connor Taylor-Brown 0ee448e17d Created wrapper for controlling the position and heading of rendered 3D models.
8 years ago
Connor Taylor-Brown 368bb8ddb3 Changed reporting plugin settings and specified central repository
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
fjc40 e3cbb6d482 Start game button actually starts the game.
8 years ago
fjc40 ac891fa91c Fixed tests.
8 years ago
fjc40 16bf57e333 javadoc fixes.
8 years ago
fjc40 8c76d6c26e Added boats.xml schema.
8 years ago
fjc40 298fcd03dc Added regatta schema.
8 years ago
fjc40 ec58f0c847 Participants can now join during the warning period as well.
8 years ago
Fan-Wu Yang 34cfe48df0 Got VMG quad detection working, however, the speeds are completley wrong. #story[1186]
8 years ago
David Wu abf325e5ea Passing a mark will now play a sound. Currently using placeholder sound so will ned to change. #story[1195]
8 years ago
hba56 66699a4660 Added a draft for a new Course layout
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
hba56 ec5bc9c6aa Wind now will occasionally back and veer (in some games, takes ~20min for full 180 degree rotation)
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
hba56 5676d435b0 hosts now send info then wait rather than wait then send
8 years ago
fjc40 9156bde8af Moved XML message creation to RaceServer instead of ConnectionAcceptor.
8 years ago
fjc40 d0eebcdb2f SourceIdAllocator now allocates from the BoatDataSource and RaceDataSource exposed by MockRace, instead of having its own source IDs. Can only allocate ids during PRESTART period.
8 years ago
Jessica Syder 716a99aac7 Reset to default button is now functional.
8 years ago
Jessica Syder 3e720a9e16 Modified key bindings can be saved to use in a race.
8 years ago
Jessica Syder 278fb65852 Pressing ESC cancels the selected command's key from being replaced
8 years ago
Jessica Syder ce47b0d813 When a new key is bound other commands bound to this key are removed
8 years ago
Jessica Syder 2188ddc3a3 Fixed errors in making the keybinding replaceable.
8 years ago
fjc40 3176e76c8c MockRace:
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
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]
8 years ago
hba56 d1c0797db7 hosting a game now continues to send out the info of the race
8 years ago
Jessica Syder 8250226bde Key bindings can be updated with any key.
8 years ago
hba56 9161f69547 updating match table to store ip and port of clients and hosts
8 years ago
Joseph 0de7780020 Changed wind speed to be non-linear. #story[1187]
8 years ago
Connor Taylor-Brown 3cc806dc45 Returned rotation to boat in lobby
8 years ago
Connor Taylor-Brown fb7bf572d8 Changed View3D add-remove interface to an ObservableList
8 years ago
Connor Taylor-Brown b6e56d815c ResizableRaceCanvas no longer depends on VisualiserRaceEvent
8 years ago
Jessica Syder ad0e26e882 Created scene to view/update current key bindings.
8 years ago
Connor Taylor-Brown c2fd5c9bae Changed box to boat mesh
8 years ago
hba56 960b1213fb fix so that test pass
8 years ago
hba56 83f756d7d8 packets can now be sent from client to match server
8 years ago
Connor Taylor-Brown cc66d63096 Removed unused shapes list from View3D
8 years ago
Connor Taylor-Brown bb7eb7cb44 Added adapter interface for PerspectiveCamera frustum and transformations in View3D.
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
Connor Taylor-Brown e04f199fc7 Merge branch 'story86-3D' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story86-3D
8 years ago
Connor Taylor-Brown e7164d8a78 View3D perspective camera is now operational
8 years ago
Fan-Wu Yang 4910d2712c Changed STL Importers Version #story[1191]
8 years ago
David Wu 23d58dc809 Created UI option in the start menu to play a practice game. #story[1189]
8 years ago
Fan-Wu Yang 921e0999b8 Testing if dependency for stl works this time #story[1191]
8 years ago
Fan-Wu Yang 0927e62ea3 Changed dependency to see if it will pass the CI runner #story[1191]
8 years ago
hba56 b2bd4fdc1c network interface
8 years ago
David Wu 028428da2c Fixed fxml issues due to merge. Added pane centering for panes. #story[1188]
8 years ago
David Wu d2f0c1105a Merged 3d branch. Added 3d item to one of the player pane. #story[1188]
8 years ago
David Wu b724a814b1 Merge branch 'story86-3D' into story77_lobby
8 years ago
David Wu d65ce1a897 Merge branch 'story77' into story77_lobby
8 years ago
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]
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
Connor Taylor-Brown d630788a14 Merge remote-tracking branch 'remotes/origin/story77_lobby' into story86-3D
8 years ago
Fan-Wu Yang 43ec179d79 Merge branch 'story86-3D' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story86-3D
8 years ago
Fan-Wu Yang ea41c64c34 Added dependency for stl converter #story[1191]
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 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.
8 years ago
Joseph Gardner b0f7c5e734 Wind speed changes depending on where the wind direction is. #story[1187]
8 years ago
hba56 ca0a3f2a8b encoders and decoders for the hosted games request message with datatype and test
8 years ago
David Wu c63403d1de Created new lobby menu. Working on animated background for menu.
8 years ago
Joseph Gardner d0ba7b93e0 Wind oscillates, replaces random wind with shifting wind. #story[1187]
8 years ago
hba56 cb8e81a7b2 encoders and decoders for the host game message with datatype and test
8 years ago
cbt24 1b1b0a4591 Added floating test cube in title screen initialiser
8 years ago
Joseph Gardner 0be5b731c3 Merge branch 'master' into wind_(story53)
8 years ago
Joseph Gardner 12e2ae9c01 Started implementing wind oscillation. #story[1187]
8 years ago
Joseph Gardner 64e96a1b8b Class for shifting wind. #story[1187]
8 years ago
fjc40 eb980c436e Wind arrow now points in the direction the wind is blowing, as per P.O feedback (again....).
8 years ago
fjc40 a9fde95b39 Updated maven version to 2.0.
8 years ago
fjc40 0d2be85d17 Brought over long/latitude fix from "rounding_line_visible_hack" branch.
8 years ago
hba56 b886cb426f guide line last leg fix
8 years ago
fjc40 666c7b029f Disabled map rotation - temp fix for the demo.
8 years ago