b56fa5cba3
refactored to make boat trails work again #fix #refactor
2017-07-26 22:42:37 +12:00
9cedbeb6f6
Fixed latency issues caused by clientside movement packets queueing up but currently the trails aren't working anymore #fix #refactor
2017-07-26 22:02:46 +12:00
4c6d107102
Merge remote-tracking branch 'origin/develop' into develop
2017-07-26 20:28:21 +12:00
7917a2584b
Fixed alignment for wind direction
2017-07-26 20:28:13 +12:00
f99f8a0d7c
Merge remote-tracking branch 'origin/develop' into develop
2017-07-26 20:13:09 +12:00
7db716f51c
Boat should move towards optimal angle upwind and downwind when pressing spacebar (VMG)
...
#story[988]
2017-07-26 20:12:57 +12:00
592e5a088f
Merge remote-tracking branch 'origin/develop' into develop
2017-07-26 19:58:45 +12:00
2d6850950c
Merge branch 'develop' into Documenting_client_and_server
...
# Conflicts:
# src/main/java/seng302/client/ClientToServerThread.java
2017-07-26 19:57:43 +12:00
ef6821a0cd
Updated and added more documentations
...
#story[1047]
2017-07-26 19:55:35 +12:00
6e9535d78f
Fixed race timer & Added boats to team position list
...
- Race status messages are sent at regular intervals instead of once at race start
- Boat positions are initialised on the Team Position list
- Timer counts up from when host clicks ready
Tags: #story[377]
2017-07-26 19:35:59 +12:00
72a45f5984
Fixed a bug where if boatMaxSpeed was 0 and sails were up, boat would not decelerate.
...
#story[986]
2017-07-26 17:11:34 +12:00
de600fa062
Merge remote-tracking branch 'origin/develop' into develop
2017-07-26 17:10:29 +12:00
87e3b4f246
Merge branch 'story61_player_highlighting' into 'develop'
...
Story61 player highlighting
Added some highlighting for the players boat and a random name generator to help distinguish clients. The highlighting implementation is pretty hackish since they will be replaced by the visualiser overhaul anyways. To avoid refactoring a lot of code I just made some unused javaFX elements invisible rather than removing them, I can do it properly if requested.
See merge request !48
2017-07-26 16:31:53 +12:00
7b47d72ef0
Merge branch 'develop' of /home/cosc/student/ajm412/Documents/SENG302/team-13 with conflicts.
2017-07-26 16:22:01 +12:00
7392bdb80d
Added documentation
...
#document
2017-07-26 16:03:11 +12:00
af9f1417f1
Documented client packet parser, client state, client state querying runnable, client to server thread and replaced e.printStackTrace() with client log messages.
2017-07-26 16:01:41 +12:00
8fc00fd750
Enabled boat path for only the player.
...
#story[987]
2017-07-26 16:01:01 +12:00
4e5b67abfa
Merge branch 'develop' into story61_player_highlighting
2017-07-26 15:52:29 +12:00
84e8ac89fc
Added random name generator until players can chose how to identify themselves.
2017-07-26 15:52:02 +12:00
12d081a1af
Added highlighting for the player and moved all their assets to the foreground
...
#story[987]
2017-07-26 15:49:00 +12:00
5e6b402bf5
Minor structural changes. GameState now has a thread which updates itself so its update
...
rate can be independent of sending packets to the client in the MainServerThread
#story[986] #pair[wmu16, ptg19]
2017-07-26 14:48:32 +12:00
2bfa6cb038
Adjusted the velocity calculations to allow for Acceleration/Deceleration of the boats, rather than just coming to a complete halt when the sails are pulled in.
...
#story[986]
2017-07-26 14:01:51 +12:00
8ac44d13df
Began fixing conflicts with LobbyController
...
#bug
2017-07-26 12:05:03 +12:00
d99055901f
Removed Music
2017-07-26 11:38:29 +12:00
9c9f6e4e80
Merge branch 'develop' into story61_player_perspective
...
# Conflicts:
# src/main/java/seng302/fxObjects/BoatAnnotations.java
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/ServerToClientThread.java
# src/main/java/seng302/model/Yacht.java
# src/main/java/seng302/visualiser/controllers/LobbyController.java
2017-07-26 02:56:46 +12:00
08e369f1ae
Merged with develop. Fixed many bugs in Visualiser.
...
#bugs
2017-07-26 02:49:31 +12:00
b0e99ab444
Merge remote-tracking branch 'origin/develop' into develop
...
# Conflicts:
# src/main/java/seng302/server/ServerThread.java
2017-07-25 23:10:41 +12:00
c77a48f589
Merge remote-tracking branch 'origin/develop' into develop
2017-07-25 23:06:06 +12:00
0135426dfe
Changed lobby player profile to a lower risk pictures
...
#story[1055]
2017-07-25 23:05:52 +12:00
37c745c139
Polar velocities should now work as intended.
...
Snapping to VMG still needs to be implemented.
Still an issue of not being able to pass the total upwind or downwind point
tags: #story[986]
2017-07-25 22:27:26 +12:00
7880039801
Merge remote-tracking branch 'origin/develop' into develop
2017-07-25 22:19:19 +12:00
a56dac1e87
Polar velocities should now work as intended.
...
Snapping to VMG still needs to be implemented.
Still an issue of not being able to pass the total upwind or downwind point
tags: #story[986]
2017-07-25 22:19:03 +12:00
4ae422b47b
When a player connects to the server, lobby will now show their user id and profile instead of showing all the profile gif at the beginning,
...
#story[1055] #pair[hyi25, zyt10]
2017-07-25 21:50:23 +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
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
c8a96dcce9
Fixed XML Loading error, used VMG to calculate boat velocity
...
- XML read from stream instead of file
- Started implementing VMG to calculate boat velocity dynamically
Tags: #pair[wmu16, mra106] #story[986]
2017-07-25 20:14:50 +12:00
4f2dca7ecf
Added proper the starting locations for marks and boats.
2017-07-25 18:48:33 +12:00
e569574c01
Merge remote-tracking branch 'origin/develop' into develop
2017-07-25 17:17:45 +12:00
f544734b4d
Fixed sending wrong race xml when a player disconnected because xml is getting data from gamestate yacht but the yachts are not updated is player disconnect.
...
Heartbeat packet was sent out at wrong rate which cause the player disconnect detection to be slow. Heartbeat packet is send out every 200ms now.
#story[1055] #pair[hyi25, zyt10]
2017-07-25 17:17:36 +12:00
80b439470b
Merge remote-tracking branch 'origin/develop' into develop
2017-07-25 15:22:56 +12:00
539197cef5
Added a visual indicator of wind speed during race (text box)
...
#pair[kre39,mra106] #story[1040]
2017-07-25 15:22:46 +12:00
1a867be387
Added keystroke frequency limit
...
Updated client and server log format
#story[988] #pair[hyi25, zyt10]
2017-07-25 15:13:48 +12:00
3785cd705f
Fixed wind speed and direction being sent correctly.
...
#pair[kre39,mra106] #story[1036]
2017-07-25 15:08:10 +12:00
5d7a438080
Changed default ip back to non local host.
2017-07-25 14:28:21 +12:00
2f12f3e34f
Fixed bug to let multiple people play at the same time.
2017-07-25 14:27:52 +12:00
52bfa3ad34
Merge remote-tracking branch 'origin/Story1055_Send_Race_Status_When_Host_Ready' into develop
...
# Conflicts:
# src/main/java/seng302/controllers/LobbyController.java
2017-07-25 00:03:58 +12:00
d1d659b698
Lobby view will switch to race view when received race status packet with race start type.
...
Ready button can only be pressed by host. Once pressed, it will send out race status packet with race start to all clients.
#story[1055]
2017-07-25 00:01:59 +12:00
cdb9337aed
Deleted GameServerThread after being re merged in
...
#chore
2017-07-24 23:20:47 +12:00
8b0af5bb62
Updated observer so it sends out updated boats.xml when client disconnects
...
#story[1047] #pair[wmu16, zyt10]
2017-07-24 21:35:31 +12:00
83232a935e
Merge remote-tracking branch 'origin/Story984_Send_XML_After_Clients_Connect' into develop
...
# Conflicts:
# src/main/java/seng302/gameServer/ServerToClientThread.java
2017-07-24 21:30:12 +12:00
Peter Galloway
Michael Rausch
Alistair McIntyre
Haoming Yin
Calum
Zhi You Tan
William Muir
Kusal Ekanayake