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
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
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
ef2659a7b9
Merge branch 'develop' into issue47_disconnect_crash_rebranch
...
# Conflicts:
# src/main/java/seng302/visualiser/GameClient.java
# src/test/java/seng302/visualiser/ClientToServerTests/RegularPacketsTest.java
2017-08-17 12:16:14 +12:00
769d1956b3
Moved client side disconnection handling to this branch and reimplemented it with develop functionality.
...
#refactor #issue[47]
2017-08-17 12:11:36 +12:00
8ca455ed24
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 12:03:43 +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
d73e4f8ec5
Fixed a build error.
...
tags: #story[1142]
2017-08-17 01:23:34 +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
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
9c2bac36b6
Merge branch 'develop' into Story40_Zooming
2017-08-16 17:27:09 +12:00
fa68a5fdff
Fixed commented out test
...
#story[1117]
2017-08-16 17:23:52 +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
958c1e216f
Fixed sail toggling issues and test.
2017-08-16 14:30:37 +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
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
c0cd260610
Fixed junit fail
2017-08-15 15:06:11 +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
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
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
c52c345e53
Merge branch 'develop' into Story64_SailsAnimations
...
# Conflicts:
# src/main/java/seng302/visualiser/GameClient.java
2017-08-14 14:04:53 +12:00
9c1fe72f6b
Merge and tests fix
2017-08-14 13:35:18 +12:00
2e892f35ea
Merge branch 'develop' into Story64_SailsAnimations
...
# Conflicts:
# src/main/java/seng302/visualiser/GameClient.java
2017-08-14 13:32:57 +12:00
e4cc5a0950
Fixing develop (sort of)
2017-08-14 12:52:58 +12:00
c77adf385e
Terminating client thread before server thread to prevent alert box popping up
2017-08-14 11:21:33 +12:00
52e10997f1
Build issues caused by vm unable to open socket connections. Leaving as is for now.
...
#bug
2017-08-13 21:07:21 +12:00
1755b00079
Unncommented test to see if it breaks the build at remote repo.
2017-08-13 20:59:03 +12:00
a844585faf
Empty tests to check where bug is occuring
2017-08-13 20:54:13 +12:00
b7fe79a5cc
Attempted fix for build issues due to javaFX toolkit not being initialized.
2017-08-13 20:44:23 +12:00
2d5492601f
Fixed build issues caused by changes to a yacht step turn constant.
...
#bug
2017-08-13 20:40:18 +12:00
d79b0421c2
Fixed merged conflicts with merge onto develop.
...
#bug
2017-08-13 19:00:06 +12:00
8cb5b8caec
Merge branch 'develop' into issue38_irregular_key_event_packets
...
# 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/visualiser/ClientToServerThread.java
# src/main/java/seng302/visualiser/GameClient.java
2017-08-13 18:44:34 +12:00
2093e79b6a
Rather than a high frequency loop sending all packets a low frequency loop is made then destroyed on button press for sending turn packets. This means a fast response time on button press but fewer packets sent.
...
#implement #issue[38]
2017-08-13 18:38:24 +12:00
0a7a9018f3
Merge branch 'develop' into Story64_SailsAnimations
...
# Conflicts:
# src/main/java/seng302/model/Yacht.java
2017-08-13 15:27:25 +12:00
25c2de63a2
Working cucumber tests for sails toggle.
...
When sails in will send a sails out message when sails out will send a sails in message and then checks for the new status of the sail
#story[1111]
2017-08-13 14:55:33 +12:00
2411a3cc2c
Merge branch 'develop' into Story64_SailsAnimations
...
# Conflicts:
# src/main/java/seng302/model/Yacht.java
2017-08-13 14:34:42 +12:00
fda6625256
Merge remote-tracking branch 'origin/develop' into Story66_Collision
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/model/Yacht.java
# src/main/java/seng302/model/mark/MarkOrder.java
# src/main/java/seng302/visualiser/GameClient.java
2017-08-10 20:23:56 +12:00
6ddaaa0dfa
Removed extra print statement from test.
2017-08-10 20:18:36 +12:00
32b231e78a
Added testing for the vmg autopilot
...
tags: #story[1107]
2017-08-10 19:19:41 +12:00
Calum
Alistair McIntyre
Haoming Yin
alistairjmcintyre
Kusal Ekanayake
Michael Rausch
Zhi You Tan
William Muir
Zhi You Tan