28569506f0
Merge remote-tracking branch 'origin/develop' into develop
2017-08-16 20:09:20 +12:00
dad2ebf693
Fixed double thread issue! :D
2017-08-16 20:09:05 +12:00
9dbb31dcef
Merge branch 'Story40_Zooming' into 'develop'
...
Story40 zooming
# Zooming and Tracking
## Changes
* Boats can now be selected by clicking and selecting on the drop down menu
* Selected boats can now be tracked when the zoom level is increased
* Zoom in with the 'z' key and zoom out with the 'x' key
## Testing
* Manual testing logged in doc
* No cucumber tests made for this story
## Bug Fixes
* Fixed the sails animation bug
See merge request !62
2017-08-16 18:25:58 +12:00
a932f41cc2
Removed unused boolean in boat objects
2017-08-16 18:19:55 +12:00
3570a3d2eb
Removed unneeded imports
2017-08-16 18:16:55 +12:00
85852df176
Modified limits to zooming
...
#story[1121]
2017-08-16 18:06:39 +12:00
9c2bac36b6
Merge branch 'develop' into Story40_Zooming
2017-08-16 17:27:09 +12:00
8501fc0b6d
Added limits to zooming
...
#story[1121]
2017-08-16 17:25:51 +12:00
e9e7f306cd
Merge branch 'Story1117_Course_Boundary_Collision' into 'develop'
...
Checked if a boat has crossed the boundary/course limit, if so, bounce the boat back.
# Boundary crossing detection
* if a boat has crossed the boundary, it will be bounced back to where it has came from
# Testing
* Manual testing has been done.
* Boats have bounced back when collides with other boats, mark or boundary.
#story[1117] #pair[hyi25, zyt10]
See merge request !60
2017-08-16 17:25:14 +12:00
fa68a5fdff
Fixed commented out test
...
#story[1117]
2017-08-16 17:23:52 +12:00
07a39722fb
Minor bug fix to velocity calculation
2017-08-16 17:23:14 +12:00
1d4ab0e1fa
Merge remote-tracking branch 'origin/develop' into develop
2017-08-16 17:22:14 +12:00
653651f97f
Minor bug fix to velocity calculation
2017-08-16 17:22:00 +12:00
b1ba6e729a
Merge branch 'StartScreen' into 'develop'
...
Start screen
## Changes
* Race timer now works
* Lobby switches to race view at T-5 seconds
* Updated lobby title to show race name
## Testing
* Manual testing completed
* No unit or cucumber testing as this is mostly UI code
See merge request !61
2017-08-16 17:12:17 +12:00
711c94001b
Fixed game crash, and improved timer
...
- Fixed the null pointer exception that happened on slower computers
- Made the timer start counting down when the host clicks ready
Tags: #story[1109]
2017-08-16 16:34:31 +12:00
7f3d66d01d
Checked if a boat has crossed the boundary/course limit, if so, bounce the boat back.
...
#story[1117] #pair[hyi25, zyt10]
2017-08-16 16:33:14 +12:00
7b9d28ade9
Progress made on the improper tracking of boats (boats aren't being correctly centered).
2017-08-16 14:51:52 +12:00
5843fc9212
The merge went well!!
...
Tags: #story[1109]
2017-08-16 14:51:44 +12:00
8fb5ea2223
Merge branch 'develop' into StartScreen
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/MainServerThread.java
# src/main/java/seng302/gameServer/ServerToClientThread.java
# src/main/java/seng302/utilities/StreamParser.java
# src/main/java/seng302/visualiser/GameClient.java
# src/main/java/seng302/visualiser/controllers/LobbyController.java
2017-08-16 14:31:14 +12:00
958c1e216f
Fixed sail toggling issues and test.
2017-08-16 14:30:37 +12:00
100689a20b
Merged develop onto zooming for easier merge later on.
...
#story[1121]
2017-08-16 13:15:15 +12:00
2da887e677
Merge branch 'develop' into Story40_Zooming
...
# Conflicts:
# src/main/java/seng302/model/Yacht.java
# src/main/java/seng302/visualiser/GameClient.java
# src/main/java/seng302/visualiser/GameView.java
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
# src/test/java/steps/ToggleSailSteps.java
2017-08-16 13:13:39 +12:00
bf016356a6
Finish screen now displays correctly on finishing.
...
GameState update now checks for finishing the race
Can now go back to main menu from finish screen
Labeled all threads for better debugging
Still need to implement race list ordering and finish screen ordering
2017-08-16 13:04:34 +12:00
76a750a764
Moved sendRaceStatus Message out of S2C Thread into MS Thread (minor refactor)
2017-08-16 11:53:29 +12:00
000d562ffe
SailIn / out animation on client is now correct again
2017-08-16 11:27:46 +12:00
7c5f146b11
Merge to integrate develop with separated Yacht classes. Functionality from this branch is not yet completed.
...
#refactor
2017-08-16 01:23:38 +12:00
e3fbbd4590
Fixed sails in and out test.
...
#bug #test
2017-08-16 01:19:34 +12:00
dc8baa09a3
Re-implemented collision tests.
...
#test #bug
2017-08-16 01:17:40 +12:00
720ce0ae5b
Merged with develop. Moved all collision logic into game state.
...
#refactor
2017-08-16 01:04:16 +12:00
a7a667b4bc
Merge branch 'develop' into 1124_switching_to_finish_screen
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/MainServerThread.java
# src/main/java/seng302/gameServer/ServerToClientThread.java
# src/main/java/seng302/model/Yacht.java
# src/main/java/seng302/visualiser/GameClient.java
# src/main/java/seng302/visualiser/GameView.java
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
# src/test/java/seng302/visualiser/ClientToServerTests/RegularPacketsTest.java
2017-08-15 23:45:50 +12:00
4e68cf31cf
Fixed finish screen switch
...
tags: #fix
2017-08-15 23:30:27 +12:00
d03460d69e
Implemented boat tracking when boat is selected by either clicking or selecting from sidebar combo box. Clicking tracked boat will cancel tracking, but using combobox will always result in one boat being selected.
...
#story[1121] #pair[wmu16, zyt10]
2017-08-15 23:16:25 +12:00
50baf6f85b
implemented race finish functionality, finish screen not loading properly yet #story[1124]
2017-08-15 20:48:51 +12:00
23a04facbe
ServerYachts now send now have their own boat status.
...
This allows clients to know when this boat has finished
tags: #story[1124]
2017-08-15 20:24:51 +12:00
7fbecc8b3d
Fixed juttery movements when zooming and sometimes tracking.
...
Need to look into getting the boat propery fixed in the center.
#story[1121]
2017-08-15 19:14:16 +12:00
366ebb3adb
Merge branch 'Story66_Collision' into 'develop'
...
Collision branch merging to develop
# Change log
* Added yacht-mark collision and yacht will be pushed back upon collision.
* Added yacht-yacht collision and both yachts will be pushed back upon collision.
* Updated yacht map position initialisation. Yachts will all be spawned behind start line with a distance apart from each other.
* Added a collision visual alert when collision packet is received.
* Added two extra colours to support for 8 boats.
# Testing
* Junit tests for yacht-yacht collision.
* Manual testing for yacht map position initialisation
* Yacht spawned apart from each other.
* Yacht will spawn behind start line even if start line is different direction.
See merge request !59
2017-08-15 15:53:36 +12:00
c00d165f47
Merge remote-tracking branch 'origin/1124_broadcast_mark_rounding_message' into 1124_broadcast_mark_rounding_message
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
2017-08-15 15:13:40 +12:00
d2bb15471a
Changed the velocity equation for boats to handle outlying scenarios such as 0 velocity.
...
#bug
2017-08-15 15:12:39 +12:00
c0cd260610
Fixed junit fail
2017-08-15 15:06:11 +12:00
ce5424cc79
Fixed develop merge and now collision works
2017-08-15 14:53:15 +12:00
c125708a4a
Final commit for yacht refactor
...
tags: #story[1124] #pair[hyi25, wmu16]
2017-08-15 14:49:16 +12:00
2dc0ba07d9
WIP: Second commit for seperating server and client yacht classes
...
tags: #story[1124]
2017-08-15 14:30:39 +12:00
2a3231d334
Merge remote-tracking branch 'origin/develop' into Story66_Collision
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/MainServerThread.java
# src/main/java/seng302/gameServer/ServerToClientThread.java
# src/main/java/seng302/model/Yacht.java
# src/main/java/seng302/model/mark/MarkOrder.java
# src/main/java/seng302/visualiser/GameView.java
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
2017-08-15 14:30:01 +12:00
d6a436d2eb
WIP: Initial commit for seperating server and client yacht classes
...
tags: #story[1124]
2017-08-15 14:18:48 +12:00
baacd8a9c0
Refactor. Taken Rounding logic out of yacht and into game state.
...
tags: #story[1124]
2017-08-14 23:52:06 +12:00
e1dddd317d
WIP: Minor fixes
2017-08-14 17:57:41 +12:00
b9ae9c4730
made server send appropriate racestatus flags in the race status packet #pair[mra106, ptg19] #story[1109]
2017-08-14 17:55:53 +12:00
fab5f9229f
Got the boat's to track and center correctly.
...
As well as allowing selecting different boats to track them, doesn't work as intuitively as I would like but will need to sort out a boat selection feature first made specifically for the selection of only one boat.
#story[1121]
2017-08-14 17:27:14 +12:00
ff92262a78
fixed race clock countdown/count up #story[1109]
2017-08-14 16:32:50 +12:00
a4547e12cb
Merged develop into this branch and resolved conflicts
...
tags: #story[1124] #pair[wmu16, hyi25]
2017-08-14 16:21:18 +12:00
William Muir
Peter Galloway
Kusal Ekanayake
Michael Rausch
Haoming Yin
Zhi You Tan
Calum
Alistair McIntyre