fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,173 Commits 1 Branch 0 Tags
70bbc892396f549b9a4fa601f428ebe4362185b4
Commit Graph
450 Commits
Author SHA1 Message Date
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] 2017-09-07 21:15:41 +12:00
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] 2017-09-07 19:30:51 +12:00
hba56 e82c59a8a4 New css for the host game window 
#story[1193]
 2017-09-07 19:21:08 +12:00
hba56 cbfcd3aa0d Images 
#story[1193]
 2017-09-07 17:17:40 +12:00
Connor Taylor-Brown e3e61e5b28 Merge remote-tracking branch 'remotes/origin/master' into storyD-3D 2017-09-06 23:51:46 +12:00
hba56 dfd3cb96f3 removed System.out.println 2017-09-06 20:05:54 +12:00
Fan-Wu Yang ae1526c457 Merge branch 'master' into vmg_fix 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/MainController.java
 2017-09-06 17:48:11 +12:00
Fan-Wu Yang 7024cac426 Rotated image of arrow direction #story[1187] 2017-09-06 17:41:48 +12:00
Fan-Wu Yang 8eee282977 Merge branch 'wind_(story53)' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into wind_(story53) 2017-09-06 17:13:39 +12:00
hba56 0886a60911 arrow Flip 2017-09-06 17:08:53 +12:00
hba56 86f495a551 javaDoc 2017-09-06 17:04:15 +12:00
Fan-Wu Yang 5bb8ba44b8 Fixed Javadoc and also made some variables private #story[1187] 2017-09-06 17:00:56 +12:00
Fan-Wu Yang 2382585c15 Fixed Javadoc and also made some variables private #story[1187] 2017-09-06 16:58:27 +12:00
hba56 4ec2a50d20 Image Scales 
#story[1193]
 2017-09-06 14:53:02 +12:00
Connor Taylor-Brown d89186d8bf Finished playable 3D race with first person camera 
- Camera pivot must be manually updated
- GPS coordinates are scaled by an arbitrary amount to make movement visible
- Model has to be flipped 180 degrees to move forward

#story[1261]
 2017-09-06 14:36:24 +12:00
hba56 4eac3ea8b5 Updated the HostGame now has images for the maps and the map can be picked 
#story[1193]
 2017-09-06 13:49:18 +12:00
hba56 9560486248 Merge branch 'Story_76' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into Story_76 2017-09-06 11:57:04 +12:00
hba56 6b9c041c6b Merge remote-tracking branch 'remotes/origin/master' into wind_(story53) 
# Conflicts:
#	racevisionGame/src/main/java/mock/app/Event.java
#	racevisionGame/src/main/java/mock/model/MockRace.java
 2017-09-05 23:37:17 +12:00
hba56 dbd4703e74 javadoc fix 2017-09-05 23:21:49 +12:00
Fan-Wu Yang 06517b7b47 Tidied up code 
- Removed prints from tests
- Added Javadocs in necessary places
- Reenabled boat status message to send
- Added boat average angle
- pulled out modulateAngle function
- Commented harder to read loops
- Disabled toggled VMG
#story[1182]
 2017-09-05 21:37:33 +12:00
Fan-Wu Yang d602c1ec6f VMG is now working and fixed, however, it feels a bit odd #story[1182] 2017-09-05 21:03:19 +12:00
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] 2017-09-05 20:09:56 +12:00
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] 2017-09-05 19:26:06 +12:00
cbt24 19f4d0fc06 Added marks back to the race view 
#story[1261]
 2017-09-05 16:50:26 +12:00
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
David Wu 8b5a5506e7 Boat collisions now play a sound when user collides and a quieter sound when others collide. #story[1195] 2017-09-05 14:00:15 +12:00
Fan-Wu Yang 7aaa880f40 VMG now works with some edge cases issues #story[1182] 2017-09-05 13:05:37 +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
Fan-Wu Yang 71dcc8ee6c Added POlar Linear Interpolation #story[1186] 2017-09-04 14:17:13 +12:00
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] 2017-09-04 14:06:38 +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 361856ea1d Updated timescale. 2017-09-04 11:38:45 +12:00
fjc40 dd1cb89b66 Merge remote-tracking branch 'origin/master' into 77_racexml_updates 2017-09-04 11:28:21 +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
Connor Taylor-Brown 368bb8ddb3 Changed reporting plugin settings and specified central repository 2017-09-03 23:35:18 +12:00
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] 2017-09-03 21:22:26 +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
fjc40 ac891fa91c Fixed tests. 2017-09-02 01:03:47 +12:00
fjc40 16bf57e333 javadoc fixes. 2017-09-02 00:45:08 +12:00
fjc40 8c76d6c26e Added boats.xml schema. 
RaceServer now creates an XMLMessage when the race's BoatDataSource changes.
#story[1188]
 2017-09-02 00:34:41 +12:00
fjc40 298fcd03dc Added regatta schema. 
RaceServer now creates an XMLMessage when the race's RegattaDataSource changes.
#story[1188]
 2017-09-02 00:33:09 +12:00
fjc40 ec58f0c847 Participants can now join during the warning period as well. 
Added RaceDataSourceToXML.
RaceServer now create an XMLMessage when the race's RaceDataSource changes.
#story[1188]
 2017-09-02 00:27:44 +12:00
Fan-Wu Yang 34cfe48df0 Got VMG quad detection working, however, the speeds are completley wrong. #story[1186] 2017-09-01 20:30:28 +12:00