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
c52c345e53
Merge branch 'develop' into Story64_SailsAnimations
...
# Conflicts:
# src/main/java/seng302/visualiser/GameClient.java
2017-08-14 14:04:53 +12:00
9420717b44
Added Messages to MessageType, continued working on request.
...
tags: #story[1142]
2017-08-14 13:38:41 +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
bedd742c93
Started on Request/Response packets for the Boat customization to begin the boat customization process.
...
tags: #story[1142]
2017-08-14 13:26:51 +12:00
add6856727
Merge remote-tracking branch 'origin/Story64_SailsAnimations' into Story64_SailsAnimations
...
# Conflicts:
# src/main/java/seng302/model/Yacht.java
2017-08-14 13:22:56 +12:00
4dc6b2af2b
Merge fix
2017-08-14 13:20:15 +12:00
e65558b8ac
Merge branch 'develop' into Story40_Zooming
...
# Conflicts:
# src/main/java/seng302/model/Yacht.java
# src/main/java/seng302/visualiser/GameClient.java
2017-08-14 13:17:39 +12:00
e4cc5a0950
Fixing develop (sort of)
2017-08-14 12:52:58 +12:00
4b4f8a25a3
Merge branch 'issue38_irregular_key_event_packets' into 'develop'
...
Issue38 irregular key event packets
A timed loop is now created on button press for sending out packets when a button is held down.
Removed the lists in LobbyController and replaced them with text objects to avoid the nested lists of single element lists.
Unit tests are in tests.java.seng302.visualiser.ClientToServerTets.RegularPacketsTest
**EDIT -** Tests fail due to some kind of error with reading from sockets in VM environment. Unable to fix at present.
See merge request !57
2017-08-14 12:49:52 +12:00
c77adf385e
Terminating client thread before server thread to prevent alert box popping up
2017-08-14 11:21:33 +12:00
9b7f4a93d8
Merge remote-tracking branch 'origin/issue38_irregular_key_event_packets' into issue38_irregular_key_event_packets
2017-08-14 11:02:19 +12:00
e780b47160
Fix javafx error on ci
2017-08-14 11:02:07 +12:00
028fc44dce
Yacht now extends observable and can notify server to client thread to broadcast message.
...
#story[1124]
2017-08-14 10:48:11 +12:00
a185c9dc96
Implemented a factory class that creates mark arrows as needed. Needs to integrated with the real world data and tested to work. Works with all test data so far.
...
#implement #story[1118]
2017-08-14 03:44:46 +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
f2f750298c
Added print statements for determining where javaFX is accessed from in the test.
2017-08-13 21:05:28 +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
0ee12021e2
Fixed bug that stopped clients from getting updated xml data.
...
#issue[46] #bug
2017-08-13 20:29:10 +12:00
Kusal Ekanayake
Alistair McIntyre
Haoming Yin
Calum
Zhi You Tan
William Muir
Peter Galloway