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
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
9cb5956f3c
Updated lobby controller to pass the player ID through, and the lobby view to have a customize button.
...
tags: #story[1142]
2017-08-15 16:48:23 +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
458bd5408f
Merge remote-tracking branch 'origin/1124_broadcast_mark_rounding_message' into 1124_broadcast_mark_rounding_message
2017-08-15 15:21:10 +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
6a9357f598
Merged Develop onto refactored yacht branch
...
tags: #story[1124] #pair[hyi25, wmu16]
2017-08-15 15:04:35 +12:00
6909f99773
Merge remote-tracking branch 'origin/develop' into 1124_broadcast_mark_rounding_message
...
# Conflicts:
# src/main/java/seng302/model/Yacht.java
# src/main/java/seng302/visualiser/GameView.java
2017-08-15 14:58:13 +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
1a39b6e4a3
Merge branch 'develop' into 1124_broadcast_mark_rounding_message
...
# Conflicts:
# src/main/java/seng302/gameServer/ServerToClientThread.java
2017-08-14 16:16:04 +12:00
58446ffaed
MarkRounding Message now sent out correctly.
...
Added submark seqID attribute to each mark of a compound mark from parsing xml
Added Rounding side attribute to each individual mark as read from the xml
RoundingSide enum now has a method to get Enum from String literal
Now store the closest mark to each yacht in each update for purpose of knowing which mark they round
Minor code tidying, Added logger to serverToClientThread, removed 'serverLog' method
removed obsolete code
2017-08-14 16:11:32 +12:00
1f09005147
Message types for Request and Response created, and Messages for them also created.
...
tags: #story[1142]
2017-08-14 15:30:42 +12:00
3754b71f4d
Merged updated develop into branch.
...
tags: #story[1142]
2017-08-14 14:31:02 +12:00
1d2222b599
Merge branch 'develop' into Story80_BoatCustomization
2017-08-14 14:23:05 +12:00
89ceab0c4b
Merge branch 'Story64_SailsAnimations' into 'develop'
...
Story64 sails animations
The sail animations for the boats.
The sail should follow the boat when the boats heading nears downwind and upwind. The shift key should make the sail have a squiggly animation and flow into the wind. A cucumber test has also been created and could be looked into for more stories.
Unintentionally merged in parts of the zooming story. (Basic zooming in and out)
See merge request !56
2017-08-14 14:19:00 +12:00
76dabb8138
Merge remote-tracking branch 'origin/Story64_SailsAnimations' into Story64_SailsAnimations
...
# Conflicts:
# src/test/java/steps/ToggleSailSteps.java
2017-08-14 14:17:10 +12:00
8b543488e3
Fixed faulty develop merge and completed manual testing before merging back into develop.
...
tags: #story[1111]
2017-08-14 14:15:34 +12:00
Calum
Michael Rausch
Kusal Ekanayake
Alistair McIntyre
William Muir
Haoming Yin
Zhi You Tan
Peter Galloway