87acce71ea
Merge branch 'develop' into story1118_map_arrows
...
# Conflicts:
# src/main/java/seng302/gameServer/MainServerThread.java
# src/main/java/seng302/model/RaceState.java
# src/main/java/seng302/visualiser/GameClient.java
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
2017-08-17 00:52:41 +12:00
95b1c8a01f
Arrows now work as intended. Case added for interior angles.
...
#implement #story[1118]
2017-08-17 00:43:07 +12:00
dfd421c3b7
Merge branch '1124b_Fixing_Update_Order' into 'develop'
...
Updating Yacht Positions / Finish Screen
# Change Log
* Yachts now update their position on the side bar as they pass marks
* Finish screen is now displayed correctly at end of race, populated by races
# Testing
* Manual test log performed
See merge request !63
2017-08-17 00:11:13 +12:00
4596f1e0f8
Finish screen all done, updates during race
...
tags: #story[1124] #pair[wmu16, cir27]
2017-08-16 23:42:07 +12:00
a59d06fbbf
Finish screen
2017-08-16 23:36:45 +12:00
65286f273b
Working ordering for in game AND race finish screen.
...
List in RaceState holds a sorted list of yachts.
A Listener is added to this list, listening for a permutation change, on perm change, sorts the list by comparitor of leg number of each yacht (stable sort)
2017-08-16 23:22:58 +12:00
9727e86249
Merge remote-tracking branch 'origin/story1118_map_arrows' into 1124_Fixing_Order_And_Finish_Screen
...
# Conflicts:
# src/main/java/seng302/gameServer/MainServerThread.java
# src/main/java/seng302/visualiser/GameClient.java
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
# src/main/resources/server_config/xml_templates/race.ftlh
2017-08-16 22:40:32 +12:00
db614fe845
Initial commit for Fixing order
2017-08-16 21:16:27 +12:00
85899e3fbe
Merged with develop functionality.
2017-08-16 21:11:34 +12:00
87d6799c10
Re-added wind speed & direction variations
...
- Wind speed & direction are randomly updated
- Removed two duplicate threads ;)
Tags: #story[1124]
2017-08-16 20:48:37 +12:00
67f0c213c2
Everything works. Needs a bit of polish, and possibly look at boat shapes next.
...
tags: #story[1142]
2017-08-16 20:38:11 +12:00
c103595bba
Merge branch 'develop' into story1118_map_arrows
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/MainServerThread.java
# src/main/java/seng302/model/RaceState.java
# src/main/java/seng302/visualiser/GameClient.java
2017-08-16 20:34:27 +12:00
86a7c2565c
Arrows now rendered in correct orientation but rounding arc sometimes inverted.
...
#implement #story[1118]
2017-08-16 20:29:56 +12:00
21e6819f16
Arrows now rendered in correct orientation but rounding arc sometimes inverted.
...
#implement #story[1118]
2017-08-16 20:17:25 +12:00
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
02a7b804c1
Boat Names Change. Colors Change too. Updates clients during lobby when a change is made.
...
tags: #story[1142]
2017-08-16 19:31:27 +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
6d045e9976
Merge branch 'develop' into Story80_BoatCustomization
...
# Conflicts:
# src/main/java/seng302/visualiser/GameClient.java
# src/main/java/seng302/visualiser/controllers/LobbyController.java
2017-08-16 17:59:11 +12:00
4fc00f8a3c
Boat names now change, just the issue of the lobby not updating unless another person joins/leaves to try and fix.
...
tags: #story[1142]
2017-08-16 17:57:22 +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
99685d76a9
Merge remote-tracking branch 'origin/develop' into develop
2017-08-16 16:55:53 +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
1db75a8ae4
Request Messages now sending to server, need to update game and send response packet.
...
tags: #story[1142]
2017-08-16 14:54:50 +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
3542c646f8
Marker class can now store and show multiple arrows sequentially
...
#implement #story[1118]
2017-08-16 14:51:05 +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
bd213bcd9e
Merge branch 'develop' into Story80_BoatCustomization
2017-08-16 13:06:31 +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
d02f2385dd
Merge remote-tracking branch 'origin/develop' into develop
...
# Conflicts:
# src/main/java/seng302/model/ClientYacht.java
# src/main/java/seng302/visualiser/GameView.java
# src/test/java/seng302/visualiser/map/BoatSailAnimationToggleTest.java
# src/test/java/steps/ToggleSailSteps.java
2017-08-16 10:11:58 +12:00
a5261494cd
Merge remote-tracking branch 'origin/1124_broadcast_mark_rounding_message' into 1124_broadcast_mark_rounding_message
2017-08-16 10:06:25 +12:00
ac47e9d88a
Game state now updates based on boat position. Arrows drawn as boat travels course. Currently do not point in correct direction, also the sparkline does not work.
...
#bug #refactor #implement #story[1118]
2017-08-16 03:51:48 +12:00
7329f7dc65
Merge branch 'develop' into story1118_map_arrows
2017-08-16 01:35:15 +12:00
Calum
Zhi You Tan
William Muir
Michael Rausch
Alistair McIntyre
Peter Galloway
Kusal Ekanayake
Haoming Yin
Zhi You Tan