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
dad2ebf693
Fixed double thread issue! :D
2017-08-16 20:09:05 +12:00
02a7b804c1
Boat Names Change. Colors Change too. Updates clients during lobby when a change is made.
...
tags: #story[1142]
2017-08-16 19:31:27 +12:00
711c94001b
Fixed game crash, and improved timer
...
- Fixed the null pointer exception that happened on slower computers
- Made the timer start counting down when the host clicks ready
Tags: #story[1109]
2017-08-16 16:34:31 +12:00
5843fc9212
The merge went well!!
...
Tags: #story[1109]
2017-08-16 14:51:44 +12:00
bf016356a6
Finish screen now displays correctly on finishing.
...
GameState update now checks for finishing the race
Can now go back to main menu from finish screen
Labeled all threads for better debugging
Still need to implement race list ordering and finish screen ordering
2017-08-16 13:04:34 +12:00
76a750a764
Moved sendRaceStatus Message out of S2C Thread into MS Thread (minor refactor)
2017-08-16 11:53:29 +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
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
ce5424cc79
Fixed develop merge and now collision works
2017-08-15 14:53:15 +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
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
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
c52c345e53
Merge branch 'develop' into Story64_SailsAnimations
...
# Conflicts:
# src/main/java/seng302/visualiser/GameClient.java
2017-08-14 14:04:53 +12:00
6218d5506b
Fixed bug that stopped clients from getting updated xml data.
...
#issue[48] #bug
2017-08-13 20:24:03 +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
30a6cb98ec
Action packets now sent at regular 20ms intervals
...
#issue[38] #implement
2017-08-09 14:03:21 +12:00
5ec67d0b80
Added junit for update yacht (after collision implementation). Removed another version of initialise boat positions.
...
#story[1117]
2017-08-08 16:51:29 +12:00
97696cc95b
Started work on cucumber tests. Trying to sort through threads, getting inconsistent results.
...
#story[1111] #pair[kre39,ptg19]
2017-08-07 17:54:34 +12:00
a4b22190c0
Changed the spawn point to behind start line and calculated quadrant to make sure yachts spawn behind start line in different map scenario.
...
#story[1117]
2017-08-07 11:50:07 +12:00
a470cb66a2
Updated initialise boat function so it can now initialise boats with distance apart in meters.
...
Created a second prototype function which is more testable compared to the initial design. New function takes in parameters (starting marks, yacht starting position, yacht) and initialise yacht correctly with position.
#story[1117]
2017-08-06 21:16:14 +12:00
a727014fcb
Implemented boats spawning in parallel at the start line with spacing.
...
Added two more colours to support up to eight boats.
#story[1117]
2017-08-05 00:31:36 +12:00
8af80e6c3a
WIP: Connected game client to main server thread to pass compound mark variable.
...
Boats are initialised in main server thread behind start line before game starts.
#story[1117]
2017-08-03 18:39:15 +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
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
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
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
08e369f1ae
Merged with develop. Fixed many bugs in Visualiser.
...
#bugs
2017-07-26 02:49:31 +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
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
1a867be387
Added keystroke frequency limit
...
Updated client and server log format
#story[988] #pair[hyi25, zyt10]
2017-07-25 15:13:48 +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
a30a1aa7c7
Tweaking to server loop making it send packets at 5Hz
...
Commented out some smoothing code in BoatGroup that was dependend on FPS screwing with movement
2017-07-24 21:14:17 +12:00
45bf65a3d3
Made clients receive new xml after new clients connect.
...
#pair[kre39,zyt10] #story[984]
2017-07-24 16:15:19 +12:00
526c12127f
Merging game lobby with game state broadcast. Merge conflicts resolved.
...
Port numbers updated to 4942.
2017-07-24 15:26:51 +12:00
3e4a6f0f2e
Merge remote-tracking branch 'origin/Story1055_Lobby_View_Update' into Merging_GameState_With_Lobby
...
# Conflicts:
# src/main/java/seng302/client/ClientPacketParser.java
# src/main/java/seng302/client/ClientToServerThread.java
# src/main/java/seng302/controllers/LobbyController.java
# src/main/java/seng302/controllers/StartScreenController.java
# src/main/java/seng302/gameServer/ServerToClientThread.java
2017-07-24 14:58:14 +12:00
e11ceed28c
Merge remote-tracking branch 'origin/Story62_Creating_Game_Loop' into Story1055_Lobby_View_Update
...
# Conflicts:
# src/main/java/seng302/controllers/StartScreenController.java
# src/main/java/seng302/gameServer/ServerToClientThread.java
2017-07-23 19:59:30 +12:00
41851ee925
Merge branch 'Story62_Creating_Game_Loop' into Merging_GameLoop_with_Broadcast
...
# Conflicts:
# src/main/java/seng302/controllers/StartScreenController.java
# src/main/java/seng302/gameServer/ServerListenThread.java
# src/main/java/seng302/gameServer/ServerToClientThread.java
# src/main/java/seng302/models/Yacht.java
2017-07-23 17:34:24 +12:00
3ec930491f
Minor refactor, threads now start themselves
...
tags: #story[989] #refactor
2017-07-22 16:45:24 +12:00
e891ed8a64
LobbyView now can change to RaceView upon race start packet received.
...
Added port number text field in start screen controller.
Created a client state.
#story[1055] #pair[hyi25, zyt10]
2017-07-21 16:14:45 +12:00
Calum
William Muir
Alistair McIntyre
Michael Rausch
Zhi You Tan
Zhi You Tan
Kusal Ekanayake
Peter Galloway