5fb8a0c2c1
Merge branch 'issue47_disconnect_crash_rebranch' into 'develop'
...
Issue47 disconnect crash rebranch
Fix for all disconnection issues. Fix is not robust. Need consistent interface between disconnection of ServerToClientThreads and MainServerThread.
See merge request !66
2017-08-17 14:55:45 +12:00
3c91db59f3
Changed wind change variation
2017-08-17 14:49:39 +12:00
2331942bf9
Merge branch 'Story1124_Sparkline' into 'develop'
...
Fixing Ordering
# Changes
* Fixed ordering which was broken from a previous commit
* Removed Sparkline as we could not get it working in time
# Testing
* Manual testlog only
See merge request !65
2017-08-17 14:25:32 +12:00
d0565503e8
Merge branch 'develop' into issue47_disconnect_crash_rebranch
...
# Conflicts:
# src/main/java/seng302/gameServer/ServerToClientThread.java
# src/main/java/seng302/visualiser/ClientToServerThread.java
# src/main/java/seng302/visualiser/GameClient.java
2017-08-17 14:15:27 +12:00
3639e0d3ce
Fixed disconnection issues. Fix is only temporary until a consistent interface for disconnections exists.
...
#bug #implement
2017-08-17 14:10:38 +12:00
0276911b88
Fixed disconnection issues. Fix is only temporary until a consistent interface for disconnections exists.
...
#bug #implement
2017-08-17 14:02:18 +12:00
5a2a78a7d5
Bug fixes for final commit
2017-08-17 13:43:31 +12:00
39cfaf6780
Merge remote-tracking branch 'origin/develop' into Story80_BoatCustomization
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/ServerPacketParser.java
# src/main/java/seng302/gameServer/ServerToClientThread.java
# src/main/java/seng302/gameServer/messages/ChatterMessage.java
# src/main/java/seng302/gameServer/messages/MarkRoundingMessage.java
# src/main/java/seng302/model/ServerYacht.java
# src/main/java/seng302/visualiser/ClientToServerThread.java
# src/main/java/seng302/visualiser/GameClient.java
# src/main/java/seng302/visualiser/GameView.java
2017-08-17 13:31:27 +12:00
7a11b5eb77
Merge branch 'develop' into Story1124_Sparkline
2017-08-17 13:14:08 +12:00
faf4600f51
Fixed some weird bug with the messages package, trying to add some small QoL changes with potential interaction bugs with the customization/lobby menu.
...
tags : #story[1142]
2017-08-17 13:13:07 +12:00
3e383465a9
Attempted to fix sparklines, temporarily disabled them for end of sprint.
2017-08-17 13:12:09 +12:00
ac279583df
Small documentation changes.
...
tags: #story[1142]
2017-08-17 12:31:15 +12:00
7bda2bc580
Fixed:
...
- Fixed regularPacketsTest unit test, which checks how regularly packets are sent from C2S thread.
- Removed misused GameClient in main server thread.
tags: #story[1124]
2017-08-17 11:46:14 +12:00
6e02d3e533
Added some general UI improvements such as autofilling the color field of the form, and looked at how best to deal with response packets, as it should be part of the spec.
...
tags: #story[1142]
2017-08-17 01:20:16 +12:00
7b4a70817b
Merged onto develop.
...
#mergre #refactor
2017-08-17 01:03:14 +12:00
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
4596f1e0f8
Finish screen all done, updates during race
...
tags: #story[1124] #pair[wmu16, cir27]
2017-08-16 23:42:07 +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
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
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
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
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
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
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
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
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
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
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
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
ce5424cc79
Fixed develop merge and now collision works
2017-08-15 14:53:15 +12:00
Alistair McIntyre
Michael Rausch
Calum
Zhi You Tan
Haoming Yin
alistairjmcintyre
William Muir