3542c646f8
Marker class can now store and show multiple arrows sequentially
...
#implement #story[1118]
2017-08-16 14:51:05 +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
000d562ffe
SailIn / out animation on client is now correct again
2017-08-16 11:27:46 +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
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
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
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
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
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
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
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
2e892f35ea
Merge branch 'develop' into Story64_SailsAnimations
...
# Conflicts:
# src/main/java/seng302/visualiser/GameClient.java
2017-08-14 13:32:57 +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
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
0b978593d4
Solved the fps counter zoom together with canvas problem. Workaround used was changing fps counter on game view to race view.
...
#story[1117] #pair[ptg19, zyt10]
2017-08-13 18:52:42 +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
8ec6490627
Started trying to get the zoomed in gave view to follow the boat.
...
Can easily make the boat stay put at the origin. can make it perfectly center, also weary of the weird jittery effect that is present when tracking. Tracking is active when the zoom scale is greater than 1.
#story[1121]
2017-08-13 17:02:35 +12:00
c58cb1a476
WIP: Researched and implemented a simple right of way calculation (might be wrong).
...
#story[1117]
2017-08-11 23:57:27 +12:00
7e1686a980
Packets are sent out when collision happens and receiver is able to interpret and display as visual alert. Updated visual alert to looks better.
...
- Created yacht event code message to be sent out as packet.
- Added observers to main server thread on yacht so when collision detected, main server thread will send out yacht event message to all server to client threads.
- Updated collision visual alert using circle and animation timer.
#story[1117]
2017-08-10 19:50:30 +12:00
2c5fddb695
Implemented zooming and clipping of race border. Implementation is still hackish.
...
#pair[ptg19, cir27] #story[1121]
2017-08-09 16:56:46 +12:00
8813d06010
Created a simple red blink on a top of a yacht given source id.
...
Created and updated methods reading yacht event packet to translate to collision alert on visualiser.
WIP: sending yacht event packet to inform collision
#story[1117]
2017-08-09 01:26:59 +12:00
421ef3c65a
Started progress on zooming, can now use z and x keys to zoom into map.
...
Nothing scales correctly asides from the map itself (the boats stay in the same position).
#story[1121]
2017-08-08 19:41:51 +12:00
c7857872ce
Luffing sails animation working correctly, working on sailsin animation now.
...
#story[1111] #pair[kre39,ptg19]
2017-08-07 15:24:01 +12:00
a3ce5998ff
Action packets now sent at regular 20ms intervals
...
#issue[38] #implement
2017-08-07 10:58:07 +12:00
8a40119a98
Action packets now sent at regular 20ms intervals
...
#issue[38] #implement
2017-08-06 22:17:08 +12:00
ecf2c52cfa
Added tests, and sails to all clients.
...
#story[1111]
2017-08-06 15:43:22 +12:00
99d5545ed3
Made the sails work properly by toggling.
...
Need to remove the unneeded code I added.
#story[1111]
2017-08-03 16:33:51 +12:00
c655cb3fab
Fixed build. (Actually this time)
...
All doc string annotations were required to be fixed for all methods
tags: #issue[34]
2017-08-03 11:45:14 +12:00
8e24c204fd
Fixed build.
...
Google map does not work
tags: #issue[34]
2017-08-03 11:26:44 +12:00
87ef37a689
Fixed connecting to hosts. Fixed issue34 and 35 to the point where they can be developed off of.
...
#refactor #bug #issue[34, 35]
2017-08-02 00:26:57 +12:00
908c0749cf
Boats now move on screen as intended.
...
TODO - Make the client connect to the server.
2017-08-01 02:37:55 +12:00
47c5e6f155
Reverting some new graphics classes back to how they were on master.
2017-07-31 23:35:28 +12:00
b82d0d0137
Boats and map are now updated using the observer pattern.
...
#implement
2017-07-31 05:23:41 +12:00
f1ad03e913
Refactored the setup for MarkObjects (now renamed Markers) and made the CompoundMark + Mark + GeoPoint classes the standard across all classes instead of GateMark + SingleMark + Mark.
...
#refactor
2017-07-31 02:19:19 +12:00
6cae338c1e
Began fixing bugs with caused by asynchronous listener calls.
...
#bug
2017-07-30 20:12:19 +12:00
7894e31926
Merge branch 'develop' into story61_player_perspective
...
# Conflicts:
# src/main/java/seng302/App.java
# src/main/java/seng302/client/ClientPacketParser.java
# src/main/java/seng302/client/ClientState.java
# src/main/java/seng302/client/ClientStateQueryingRunnable.java
# src/main/java/seng302/controllers/Controller.java
# src/main/java/seng302/controllers/LobbyController.java
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/controllers/StartScreenController.java
# src/main/java/seng302/fxObjects/BoatAnnotations.java
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/MainServerThread.java
# src/main/java/seng302/model/Yacht.java
# src/main/java/seng302/model/stream/StreamReceiver.java
# src/main/java/seng302/visualiser/ClientToServerThread.java
# src/main/java/seng302/visualiser/GameView.java
# src/main/java/seng302/visualiser/fxObjects/BoatObject.java
# src/test/java/seng302/model/stream/StreamReceiverTest.java
2017-07-30 18:07:28 +12:00
8ac44d13df
Began fixing conflicts with LobbyController
...
#bug
2017-07-26 12:05:03 +12:00
08e369f1ae
Merged with develop. Fixed many bugs in Visualiser.
...
#bugs
2017-07-26 02:49:31 +12:00
6242ab0b2e
Implemented observer and strategy pattern in BoatAnnotations, now renamed AnnotationsBox.
...
Also implemented various other small fixes and further refactored code.
#refactor
2017-07-25 20:45:27 +12:00
aad93d8913
Parsing classes now static utilities. Data now moved to model via controller class. Race logic shifted out of grpahics classes. Several improvements to code readability.
...
#story[986] #refactor
2017-07-24 12:14:08 +12:00
881f7f8e30
Changed package heirachy. Merged Controller and StartScreenController.
...
#refactor
2017-07-21 09:22:55 +12:00
Calum
Kusal Ekanayake
William Muir
Zhi You Tan
Haoming Yin