30a6cb98ec
Action packets now sent at regular 20ms intervals
...
#issue[38] #implement
2017-08-09 14:03:21 +12:00
1ab849fd0d
Added cucumber dependency.
2017-08-03 14:02:52 +12:00
1160f274ee
Reformatted code in appropriate style
...
Build fails server side only due to some dependency issue. Internet problem server side?? (M I C H A E L?)
tags: #issue[34]
2017-08-03 12:06:07 +12:00
53f5d63f15
Fixed build. (Actually this time) ((NOW WERE READY TO MERGE)))
...
All doc string annotations were required to be fixed for all methods
tags: #issue[34]
2017-08-03 11:50:07 +12:00
1150ec3e43
Merge branch 'develop' into story61_player_perspective
...
# Conflicts:
# src/main/java/seng302/App.java
2017-08-03 11:48:54 +12:00
9deba732b0
Added dependencies for slf4j
2017-07-31 18:34:55 +12:00
b82d0d0137
Boats and map are now updated using the observer pattern.
...
#implement
2017-07-31 05:23:41 +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
96ed5e445e
Replaced print stack trace with print statements
2017-07-27 12:47:18 +12:00
870dc07fd2
Slight improvements to hosting.
...
Allow a host/client to disconnect and reconnect/make lobby, leave lobby and play the game.
#pair[kre39,hyi25] #story[1047]
2017-07-27 12:45:22 +12:00
08e369f1ae
Merged with develop. Fixed many bugs in Visualiser.
...
#bugs
2017-07-26 02:49:31 +12:00
acd54dec7a
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/controllers/Controller.java
# src/main/java/seng302/controllers/RaceViewController.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/gameServer/ServerToClientThread.java
# src/main/java/seng302/model/Boat.java
# src/main/java/seng302/models/stream/XMLParser.java
# src/main/java/seng302/visualiser/ClientToServerThread.java
# src/main/java/seng302/visualiser/GameView.java
# src/main/java/seng302/visualiser/controllers/FinishScreenViewController.java
# src/main/java/seng302/visualiser/controllers/StartScreenController.java
# src/main/java/seng302/visualiser/fxObjects/BoatObject.java
# src/main/resources/views/LobbyView.fxml
# src/main/resources/views/MainView.fxml
2017-07-25 21:05:15 +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
49c0c029c3
adjusted the way the server is receiving key presses to enable them be passed through to the game state #pair[ptg19, wmu16] #story[989]
2017-07-20 19:35:59 +12:00
f02bd3b3f8
Merge remote-tracking branch 'origin/Story62_Reading_Keystrokes' into Story62_Reading_Keystrokes
2017-07-18 12:23:09 +12:00
e83eaa38e1
Upon hosting, and then creating a new instance and connecting to that IP, button transmissions work and print out on server!! :D
...
Took the send method out of the Message class as it didnt make sense to have it there. This meant taking it out of all subclasses too
tags: #story[1055] pair[wmu16, zyt10]
2017-07-18 12:22:58 +12:00
102b5f3ca1
Added a program icon that I snipped from the logo using photoshop.
2017-07-18 10:46:41 +12:00
77e7db79cc
WIP: Worked on new server thread class that would create and store multiple THREADS of connections. Researched Authorative server structures.
...
Fixed the current structure of the server to work with the old StreamReciever style and hook up to the Stream Parser
tags: #story[1047] pair[wmu16, mra106]
2017-07-14 17:09:33 +12:00
8090cd7985
WIP: Adapted the old server thread class to the GameServerThread class to allow multiple clients to connect
...
tags: #story[1047] #pair[wmu16]
2017-07-13 14:40:11 +12:00
035841f221
WIP: Adapted the old server thread class to the GameServerThread class to allow multiple clients to connect
...
tags: #story[1047] #pair[wmu16, mra106]
2017-07-11 17:03:32 +12:00
5f9da6b40a
Fixed the bug where the polar file could not be read after being packaged
...
tags: #story[955] #pair[wmu16, zyt10]
2017-07-10 12:36:32 +12:00
acbaa838ec
Change default port to 4940
...
#story[956] #pair[wmu16, mra106]
2017-05-25 16:56:41 +12:00
4231c3ccd8
Merge remote-tracking branch 'origin/develop' into remove_observers
2017-05-25 16:30:15 +12:00
65223ceaaf
shifted annotation layers. Merged with dev.
2017-05-25 16:29:27 +12:00
835f79b113
Swapped to the local stream as default
2017-05-25 15:56:02 +12:00
f1a9da83fc
Quick fixes before merge
2017-05-25 14:22:01 +12:00
53f6a6b8c5
Implimented a new way to determine positions
...
#story[952]
2017-05-25 14:06:33 +12:00
a6d9c66fc9
Removed unused import statements and class variables. Removed non error print statements.
2017-05-25 10:20:39 +12:00
46f5fc5172
Merge with develop.
...
#story[952]
2017-05-24 18:47:27 +12:00
81c021b59a
Merge branch 'develop' into Story34_Sparklines
...
# Conflicts:
# src/main/java/seng302/App.java
# src/main/resources/views/RaceView.fxml
2017-05-24 18:45:01 +12:00
7abb36c362
The axis is labeled correctly and is scaled accordingly.
...
The sparkline should work from the start of a race now also. We now have the boat in first place listed at the top along with the axis labeling and marking matching the position (eg, 1st at top. 6th at bottom). Boats picked up on the visualiser park way through the race are able to added and drawn onto the sparkline.
#story[952]
2017-05-24 14:42:41 +12:00
f85d3bf5fe
Plugged Canvas map to canvas view controller to display map
...
- rebase on the latest develop status
- optimised the scaling factor the map to fit the canvas view
- a new image containing map image is displayed under race canvas
#story[928]
2017-05-24 13:52:49 +12:00
e51c966969
Made sure only boats in participant list are replaced. Also removed mark coloring as it wasn't as accurate as was necessary.
...
#story[923]
2017-05-22 16:05:24 +12:00
78573fa837
Made start/finish lines a different color.
...
#story[923]
2017-05-22 15:10:05 +12:00
be633c0e60
Marks display correctly on the canvas, no double ups or anything like that left.
...
#[issue10]
2017-05-22 13:22:55 +12:00
5d6b356602
all marks displaying except currently gate marks are displaying as a single dot
...
#story[923] #pair[ajm412, ptg19]
2017-05-18 18:02:25 +12:00
38b44fa92b
Merge branch 'develop' into Issue#4_boat_movement
...
# Conflicts:
# src/main/java/seng302/controllers/Controller.java
# src/main/java/seng302/controllers/RaceController.java
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/models/BoatGroup.java
# src/main/java/seng302/models/mark/MarkGroup.java
# src/main/java/seng302/models/stream/StreamParser.java
# src/test/java/seng302/models/stream/StreamReceiverTest.java
2017-05-17 20:05:40 +12:00
aaa3dc93f1
boat movement working reliably now, still need to fix one bug at initialization #story[923]
2017-05-17 17:34:47 +12:00
1acb0fbac4
Merge on to develop
...
story[955]
2017-05-17 10:04:28 +12:00
2b294702a9
Merge remote-tracking branch 'origin/develop' into 38a_Select_Boats
...
# Conflicts:
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/models/BoatGroup.java
2017-05-17 09:53:18 +12:00
2d5a7a8a49
Large tidying of RaceViewController class. Fixing updating for combo boxes
...
#story[955]
2017-05-16 15:06:01 +12:00
e03e121da4
Merge branch 'develop' into Story47CourseLimits
...
Conflicts:
src/main/java/seng302/App.java
2017-05-15 18:37:31 +12:00
9c7144c918
Removed dud print statement
...
#story[889]
2017-05-15 17:55:06 +12:00
fa501460cb
Cleaned up code for merge.
...
#story[889]
2017-05-15 17:21:56 +12:00
110143ae6e
Added a dynamically updating course limits file to the model.
...
This will make manual testing of the course limits easier. When the race starts, the limits encapsulate the start line but soon after the race starts the course limits close off around the start line (this is for the model). This means the model acts in a very similar way to the actual live stream.
#story[889]
2017-05-15 17:09:12 +12:00
51f090324a
CSS on annotation selection and minor bug fixes. Changed annotation slider to only have None, important and All
...
#story[955]
2017-05-15 16:44:28 +12:00
2e914a7704
Fixed estimate time to next mark to match acceptance criteria which is countdown in minutes and seconds.
...
#story[924]
2017-05-15 15:49:21 +12:00
081d7e3dcb
Fixed the parsing of bytes being off by one byte in the stream parser fr the race status packet.
...
#story[924] #pair[kre39,zyt10]
2017-05-15 14:52:57 +12:00
Calum
Zhi You Tan
William Muir
Michael Rausch
Kusal Ekanayake
Peter Galloway
Haoming Yin
Alistair McIntyre
alistairjmcintyre
Michael Rausch
Zhi You Tan