fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,262 Commits 1 Branch 0 Tags
083eb5a4bc304be5ac494ec0280a8ff04423a2f3
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
hba56 083eb5a4bc updated race view that does not use a split pane 2017-09-14 13:45:46 +12:00
hba56 87f3265640 pushed branch 
#story[1195]
 2017-09-14 13:06:39 +12:00
hba56 81a04c987b Changed the ip of the matchbrowser to that of the CI. 2017-09-13 23:50:55 +12:00
hba56 4c52673fc1 javadoc fixes 
#story[1188]
 2017-09-13 17:12:24 +12:00
hba56 e4dbebfcac Merge remote-tracking branch 'remotes/origin/master' into story77 
# Conflicts:
#	racevisionGame/src/main/java/mock/app/Event.java
#	racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java
#	racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java
#	racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
#	racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
#	racevisionGame/src/main/java/visualiser/app/App.java
#	settings/keyBindings.xml
 2017-09-13 16:14:07 +12:00
hba56 fd120edaf9 Merge remote-tracking branch 'remotes/origin/master' into story77 
# Conflicts:
#	racevisionGame/src/main/java/mock/app/Event.java
#	racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java
#	racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java
#	racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
#	racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
#	racevisionGame/src/main/java/visualiser/app/App.java
#	settings/keyBindings.xml
 2017-09-13 16:13:14 +12:00
hba56 00780e17e9 Merge remote-tracking branch 'remotes/origin/temp77' into story77 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
#	racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml
#	racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml
 2017-09-13 15:17:37 +12:00
hba56 aafc0dc9db Merge remote-tracking branch 'remotes/origin/temp77' into story77 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
#	racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml
#	racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml
 2017-09-13 15:16:06 +12:00
hba56 079d93fc0f Merge remote-tracking branch 'remotes/origin/master' into story77 
# Conflicts:
#	racevisionGame/src/main/java/mock/app/Event.java
#	racevisionGame/src/main/java/visualiser/Controllers/HostController.java
#	racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
#	racevisionGame/src/main/java/visualiser/Controllers/MainController.java
#	racevisionGame/src/main/resources/visualiser/scenes/main.fxml
#	settings/keyBindings.xml
 2017-09-13 14:22:46 +12:00
hba56 70ccb4cf1c Merge remote-tracking branch 'remotes/origin/master' into story77 
# Conflicts:
#	racevisionGame/src/main/java/mock/app/Event.java
#	racevisionGame/src/main/java/visualiser/Controllers/HostController.java
#	racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
#	racevisionGame/src/main/java/visualiser/Controllers/MainController.java
#	racevisionGame/src/main/resources/visualiser/scenes/main.fxml
#	settings/keyBindings.xml
 2017-09-13 14:00:40 +12:00
hba56 731c0b0e61 send out to every client fix 2017-09-13 13:34:26 +12:00
hba56 2c06a46ad2 send out to every client fix 2017-09-13 12:59:49 +12:00
hba56 5fb24307ec send out to every client fix 2017-09-13 12:48:47 +12:00
hba56 bed9f8b07a send out to every client fix 2017-09-13 12:19:33 +12:00
hba56 4adcd6322c send out to every client 2017-09-13 12:05:09 +12:00
hba56 3d58801760 matchbrowser now updates and flushes in a better time frame. 30s for flush as thats the time for match lobbys and 5s for update 2017-09-12 22:02:51 +12:00
hba56 4dcff5c009 SeaSurface files have been added to display the surface in the lobby. Surface is now drawn in the lobby 2017-09-12 21:55:23 +12:00
hba56 e3ddb272c0 Merge remote-tracking branch 'remotes/origin/master' into story77 
# Conflicts:
#	racevisionGame/src/main/java/shared/model/Constants.java
#	racevisionGame/src/main/java/visualiser/Controllers/HostController.java
#	racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml
 2017-09-12 15:13:35 +12:00
hba56 ddc3a6ae47 boxes in lobby are now boats 2017-09-09 16:26:17 +12:00
hba56 e5d8a4028d Merge remote-tracking branch 'remotes/origin/master' into story77 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/HostController.java
#	racevisionGame/src/main/java/visualiser/layout/Subject3D.java
#	racevisionGame/src/main/java/visualiser/layout/View3D.java
#	racevisionGame/src/main/resources/visualiser/scenes/hostlobby.fxml
 2017-09-09 16:20:00 +12:00
hba56 ae8fa312a3 removed sout and added a longer startup time. Also fixed race xmls to remove set boats 2017-09-09 15:37:35 +12:00
hba56 ea1594a839 Merge remote-tracking branch 'remotes/origin/master' into Story_76 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/HostController.java
#	racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml
 2017-09-09 15:35:02 +12:00
hba56 5e516b0508 re added the standard race 
#story[1193]
 2017-09-08 18:12:51 +12:00
hba56 4c2ab9cc9a Merge branch 'master' into story77 
# Conflicts:
#	racevisionGame/src/main/java/mock/app/Event.java
#	racevisionGame/src/main/java/visualiser/Controllers/HostController.java
#	racevisionGame/src/main/java/visualiser/model/View3D.java
 2017-09-08 17:28:17 +12:00
hba56 4780354452 Errors in this commit: mock threads get interrupted 
#story[#1188]
 2017-09-08 16:35:36 +12:00
hba56 63e2cc1fd0 Merge remote-tracking branch 'remotes/origin/story77_lobby' into story77 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/HostController.java
 2017-09-08 13:34:48 +12:00
hba56 a494eb4a6d games are now added on the correct port 
#story[1188]
 2017-09-08 12:04:54 +12:00
hba56 d3ddff8bf1 host game start button added margins 
#story[1193]
 2017-09-08 11:52:21 +12:00
hba56 d302a08a14 fix for ci builds 
#story[1193]
 2017-09-07 19:25:49 +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
Hamish Ball 321359be07 Merge branch 'vmg_fix' into 'master' 
Vmg fix

Note: there should be a small deadzone between upwind and reaching/running where pressing the key has no effect so that issues in judging the exact TWA of the boat don't lead to a surprising direction change.

Turn off toggle

Remember to close Issue#43 when you have finished DoD'ing



See merge request !37
 2017-09-06 20:10:42 +12:00
hba56 dfd3cb96f3 removed System.out.println 2017-09-06 20:05:54 +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
hba56 4ec2a50d20 Image Scales 
#story[1193]
 2017-09-06 14:53:02 +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
Hamish Ball 28d27a7b2b Merge branch 'C_keybindings' into 'master' 
C keybindings

AC:
* All keybindings can be easily changed in the start screen
* Buttons are replacable on clicking on the current button assigned.
* When the current button assigned is clicked the text should turn "blank" and return to with text after a new button has been pressed or escape has been pressed.
* There cannot be more than one active replace button at a time.
* Reset to default should reset to the keys defined by the P.O (but with UP, DOWN instead of PG_UP, PG_DWN)
* Buttons should not save until the user exits with "save"

See merge request !35
 2017-09-04 15:27:36 +12:00
hba56 8287fbf6ba Updated the HostGame window to support maps 
#story[1193]
 2017-09-04 15:05:31 +12:00
hba56 66699a4660 Added a draft for a new Course layout 
#story[1193]
 2017-09-01 14:31:01 +12:00
hba56 ec5bc9c6aa Wind now will occasionally back and veer (in some games, takes ~20min for full 180 degree rotation) 
#story[1188]
 2017-09-01 13:19:59 +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
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
hba56 a1fa09962a matching table now stores the correct ip of the hosts 
#story[1188]
 2017-08-31 13:55:16 +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
hba56 960b1213fb fix so that test pass 
#story[1188]
 2017-08-30 15:31:28 +12:00
hba56 83f756d7d8 packets can now be sent from client to match server 
#story[1188]
 2017-08-30 15:26:54 +12:00
hba56 b2bd4fdc1c network interface 2017-08-30 12:13:17 +12:00
hba56 ca0a3f2a8b encoders and decoders for the hosted games request message with datatype and test 
#story[1188]
 2017-08-29 15:28:03 +12:00
hba56 cb8e81a7b2 encoders and decoders for the host game message with datatype and test 
#story[1188]
 2017-08-29 14:38:42 +12:00
hba56 5b6b0a9978 added the new program for holding known games 
#stroy[1188]
 2017-08-29 12:57:19 +12:00
Hamish Ball 7086af6057 Merge branch 'demo_6_no_rotation' into 'master' 
Removed old modules & fixed wind arrow direction

This branch removes the old modules (visualiser, network, mock), and adds a new one - dedicatedServer.

It also fixes the wind arrow direction as pointed out by P.O during the demo.

Changed the maven version number to 2.0.

This branch also has the map rotation disabled until we get rotation+rounding working together.

See merge request !32
 2017-08-29 11:16:47 +12:00
hba56 b886cb426f guide line last leg fix 2017-08-17 22:38:31 +12:00
Hamish Ball 27e8cddd94 Merge branch 'new_issue#19' into 'master' 
New issue#19



See merge request !31
 2017-08-17 17:08:55 +12:00
Hamish Ball d2f9bfedcb Merge branch 'issue_18_track_alpha' into 'master' 
Issue 18 track alpha

This should resolve #18.

Track point system is now a line, and updated more frequently.
Line fades over time.

The boat wake is also longer, and has a black dot at the end.

See merge request !28
 2017-08-17 13:50:44 +12:00
Hamish Ball 2edb6b5249 Merge branch 'issue#40' into 'master' 
Issue#40



See merge request !30
 2017-08-17 13:49:58 +12:00
hba56 02ab0e8a00 added javadoc 2017-08-17 13:16:47 +12:00
hba56 3cf50c56f8 added a refresh for the info table so no new values are shown when the game is in full screen 2017-08-17 13:15:33 +12:00
Hamish Ball 96acb6251e Merge branch 'story66-collision' into 'master' 
66. [M] As Gemma, I'd like boats and marks to act as barriers to movement so that another player cannot beat me by just ignoring marks and other boats on the course.

Note: as boats and marks don't start in overlapped positions, we are only concerned with collisions. 

Acceptance criteria:
- No boat can pass within an agreed distance of the centre of another boat or mark
- Boats that hit other objects are repelled twice the agreed distance in the opposite direction to their current heading

See merge request !27
 2017-08-17 12:14:30 +12:00
hwball 86d94ef27e javadoc fix 2017-08-17 11:58:13 +12:00
hwball df2b674b94 update scale for table displaying 2017-08-17 11:51:33 +12:00
hba56 ee0cc4b704 Merge branch 'issue#40' into Development 2017-08-16 22:41:49 +12:00
hba56 fdd0b30a51 Added the ability to hide and show info table with a key press 
-the wind arrow also scales with the new size of the screen
 2017-08-16 02:04:07 +12:00
hba56 1bdf80417d javadoc 
#story[1087]
 2017-08-14 12:14:55 +12:00
hba56 0ff4e9871d Merge remote-tracking branch 'remotes/origin/master' into story68 2017-08-14 12:13:24 +12:00
hba56 dc9317fe2e remove system.out statments 
#story[1101]
 2017-08-13 19:33:46 +12:00
hba56 67bb7b81dc Merge remote-tracking branch 'origin/story68' into story68 2017-08-13 19:10:31 +12:00
hba56 0d786f381b fix for boats finishing the race 
#story[1101]
 2017-08-13 19:10:16 +12:00
hba56 2acc36225e Fix for placement of invis gates and checks that boats pass through these gates 
-see wiki on rounding
#story[1101]
 2017-08-13 18:11:53 +12:00
hba56 f90648e4ce Fixing a silly mistake where starboard side rounding checks for a port side rounding (Thank goodness for documenting manual tests) 
#story[1101]
 2017-08-12 23:40:28 +12:00
hba56 a05ffd023d Fixing a silly mistake where starboard side rounding checks for a port side rounding (Thank goodness for documenting manual tests) 
#story[1101]
 2017-08-12 22:55:25 +12:00
hba56 f386a4b989 added checks for gates and moved second rounding check to be in line with the next mark to move towards 
#story[1101]
 2017-08-12 22:27:27 +12:00
hba56 fe91264aec fix for the tests 
#story[1101]
 2017-08-12 21:10:31 +12:00
hba56 62e37489ee starboard rounding update 
#story[1101]
 2017-08-12 03:41:50 +12:00
hba56 d70a711a3d Merge branch 'master' into story68 
-updated port and starboard boat checks
-added gps method to check if on correct side of a line
-updated pos check method to make boats round marks with the new tech

# Conflicts:
#	racevisionGame/src/main/java/mock/app/ConnectionAcceptor.java
#	racevisionGame/src/main/java/mock/app/Event.java
#	racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java
#	racevisionGame/src/main/java/mock/model/commandFactory/VMGCommand.java
 2017-08-12 03:26:28 +12:00
hba56 499a409d4f Merge branch 'master' into story68 
-updated port and starboard boat checks
-added gps method to check if on correct side of a line
-updated pos check method to make boats round marks with the new tech

# Conflicts:
#	racevisionGame/src/main/java/mock/app/ConnectionAcceptor.java
#	racevisionGame/src/main/java/mock/app/Event.java
#	racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java
#	racevisionGame/src/main/java/mock/model/commandFactory/VMGCommand.java
 2017-08-12 03:24:20 +12:00
hba56 4da3734804 added the ability to toggle the race guide line on and off 
#story[1087]
 2017-08-10 12:17:19 +12:00
hba56 74f04a13f8 Merge remote-tracking branch 'origin/Development' into Development 2017-08-09 23:27:04 +12:00
hba56 e53d72f24b compound marks now can give the mark they have that needs to be rounded this is used to draw the line around the correct mark 
#story[1101]
 2017-08-09 23:25:42 +12:00
hba56 e2605c3c7c Merge remote-tracking branch 'remotes/origin/story68' into Development 2017-08-08 23:29:57 +12:00
hba56 bb75806781 Cleaned up line to be in a shippable shape 
#story[1101]
 2017-08-08 23:23:46 +12:00
hba56 22722286ef all paths now join up 
#story[1087]
 2017-08-08 14:47:11 +12:00
hba56 ef3f468b19 arrows displayed for each leg 
#story[1101]
 2017-08-08 00:02:07 +12:00
hba56 62752c142a building blocks for drawing the race line around the course 
#story[1087]
 2017-08-07 12:47:55 +12:00
hba56 747c31b948 Merge remote-tracking branch 'remotes/origin/story68' into Development 2017-08-07 12:29:56 +12:00
hba56 4195d41814 removed outdated comments 
#story[1087]
 2017-08-07 12:28:44 +12:00
hba56 950a801d16 rounding fix for the xml 
#story[1087]
 2017-08-07 12:16:37 +12:00
hba56 0b74acadff rounding checks are now done by port or starboard side depending on what the compound marks type is 
#story[1101]
 2017-08-04 22:19:07 +12:00
hba56 db1efab225 rounding checks are now done by port or starboard side depending on what the compound marks type is 
#story[1101]
 2017-08-04 22:17:17 +12:00
hba56 be8b0e672d Updated the xml reader to pull in the rounding type of the compound marks and set each mark with that value 
#story[1101]
 2017-08-04 22:01:21 +12:00
hba56 f212414bd9 Added in a new basis for boats to round marks, gave mockboats a status to say how far through a rounding they are and made a method in GPScoordinate public so it can be used to calculate intersections. 
This branch will not run the game any more as boats can't move on to the next leg until they can be controlled by the user.

#story[1087]
 2017-08-03 13:27:00 +12:00
hba56 b7af4e19cf new method to check if a boat is between gates as well as updated the gps values to fit better with real life values 
#story[1101]
 2017-08-02 18:09:12 +12:00
hba56 13922bc284 updated javadoc 
#story[1101]
 2017-08-02 17:06:52 +12:00
hba56 c633de21f5 added new methods to the mock boats to let them check which side a mark is on to them 
#story[1101]
 2017-08-02 16:33:03 +12:00
hba56 92b8b7b77f moved the tm symbol 
#story[1087]
 2017-07-27 13:34:03 +12:00
hba56 f4eb03e79e Merge remote-tracking branch 'origin/css' into css 2017-07-27 13:06:07 +12:00
hba56 85347c169d You can now resize all windows other than the title screen 
#story[1087]
 2017-07-27 13:05:56 +12:00