d99055901f
Removed Music
2017-07-26 11:38:29 +12:00
0135426dfe
Changed lobby player profile to a lower risk pictures
...
#story[1055]
2017-07-25 23:05:52 +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
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
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
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
df2efa3329
Lobby controller list view is able to react to changes in client state boats and update the list view appropriately.
...
#story[1055]
2017-07-24 11:15:10 +12:00
9d754c8819
Implemented list views initialisation which will set the first pane to be your source id (after three way handshake) and the remaining pane to be the source id of other players based on boats.xml received.
...
Updated client parser and client state to save a list of player's boat
WIP: refresh list view to show the latest update in players
#story[1055]
2017-07-23 20:42:21 +12:00
ffc61942a9
Fixed broken pipe error.
...
Was caused by boat ids being over 1000 and when turned into xml having a comma placed between the hundreds and the thousands? So to fix, I just mad the max id number 999 so there should not be any issues regarding that if another broken pipe error occurs. Also switched to use the correct yacht constructor.
#story[1047]
2017-07-23 17:10:18 +12:00
f542dbb61e
Changed the competitors list view to eight individual list view.
...
Added eight individual image view to support future player icon implementation.
#story[1055]
2017-07-23 03:00:29 +12:00
33fae9d69a
Added race boats to XML Generator
...
Tags: #story[1047]
2017-07-21 16:56:46 +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
2fff73c075
Merge remote-tracking branch 'origin/984_Xml_Generation' into Broadcasting_GameState
...
# Conflicts:
# src/main/java/seng302/controllers/FinishScreenViewController.java
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/gameServer/GameServerThread.java
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/models/Yacht.java
2017-07-21 12:31:35 +12:00
322ff740e2
Added race start time to race XML
...
- Added race start time to race XML
- Added documentation
- Removed test code in MainServerThread
Tags: #story[984]
2017-07-20 14:28:59 +12:00
82b219cdba
Boat and race XML now generated dynamically
...
- Removed course from XML Generator as it was not needed
- Boat and race XML added
- Method names in Yacht class updated to follow JavaBean standard so they can be read by the template engine
Tags: #story[984]
2017-07-20 13:30:55 +12:00
dbbb41e12f
Multiple clients are now shown in lobby of host.
...
When multiple clients connect to the host, the lobby table now fills up with the names of the threads (will need to be changed later). Re-enabled multiple people connecting and the lobby table. Formatting changes in the lobby screen also made.
#story[1047]
2017-07-19 16:05:21 +12:00
45053ba507
Added XML Generation
...
- Implemented a wrapper for Apache Freemake
- Implemented the regatta XML generator
Tags: #story[984]
2017-07-19 14:47:16 +12:00
102b5f3ca1
Added a program icon that I snipped from the logo using photoshop.
2017-07-18 10:46:41 +12:00
63958a6717
WIP: Implemented a temporary workaround to send an instance test to client server upon connection.
...
Still needs reengineering to change socket channels for sending to ouput stream in the message class.
Only client to server "working".
#story[1047] #pair[hyi25, wmu16] #pair[cir27, zyt10]
2017-07-17 17:00:04 +12:00
355f8543f5
Implemented a more reliable way for keystroke input and added boat action packet type so stream parser is able to read and decode the message appropriately.
...
#story[988] #pair[hyi25, zyt10]
2017-07-14 18:23:07 +12:00
2809d0d832
Merge branch '1047_Hosting_Game' into Story62_Reading_Keystrokes
...
# Conflicts:
# src/main/resources/views/RaceView.fxml
2017-07-14 16:28:42 +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
ef61a687d6
Researched and implemented a way for the game to listen for key presses. When one of the valid key controls are pressed, feedback is given in the console. Has yet to be connected to a method which will create and send a message to the server.
...
#pair[kre39,zyt10] #story[988]
2017-07-11 16:32:15 +12:00
1a3e330eb4
Created some basic UI for new start screen (host and connect) and a lobby
...
tags: #story[1047] #pair[wmu16, zyt10]
2017-07-10 13:43:25 +12:00
fe76ef9cdc
Merge remote-tracking branch 'origin/develop'
2017-05-25 16:58:01 +12:00
20b79b40f2
Fix the button position #story[923]
2017-05-25 16:45:35 +12:00
72e2776b7e
Fix the finish screen size #story[923]
2017-05-25 16:41:59 +12:00
ca22615c08
Add scroll bar to the side panel to cater for smaller screen.
2017-05-25 16:18:47 +12:00
559a9f38c0
Merge remote-tracking branch 'origin/develop' into issue#8_create_finish_screen
...
# Conflicts:
# src/main/java/seng302/controllers/CanvasController.java
# src/main/java/seng302/models/stream/StreamParser.java
2017-05-25 16:12:44 +12:00
cec7014856
Set axis ons parkline style
2017-05-25 14:54:34 +12:00
6e903bfbed
Merge branch 'develop' into 38b_LayLines
...
# Conflicts:
# src/main/java/seng302/App.java
# src/main/java/seng302/models/Yacht.java
# src/main/java/seng302/models/stream/StreamParser.java
2017-05-25 14:16:55 +12:00
53f6a6b8c5
Implimented a new way to determine positions
...
#story[952]
2017-05-25 14:06:33 +12:00
5ed02a1fe1
Merge remote-tracking branch 'origin/develop' into issue#8_create_finish_screen
...
# Conflicts:
# src/main/java/seng302/controllers/CanvasController.java
2017-05-25 12:32:10 +12:00
67b5650288
Merge branch 'develop' into 38b_LayLines
...
# Conflicts:
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/models/Yacht.java
2017-05-25 09:19:42 +12:00
34c3899ec4
Removed unused css for charts
2017-05-24 18:51:52 +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
e7060d4b6f
Finish screen will show when race finishes, added functionality to return to start screen when in finish screen, updated finishScreenView.fxml to have controller and also four corner anchors to fit to parent
2017-05-24 16:17:56 +12:00
641039720e
Merge remote-tracking branch 'origin/develop' into issue#8_create_finish_screen
2017-05-24 16:12:37 +12:00
c42942430f
Fixed bug that grid panel pushes annotation panel up out of window.
...
#story[928]
2017-05-24 14:57:06 +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
c449da2916
[WIP] created finishScreenView.fxml, finishScreenViewController.java
2017-05-24 14:24:14 +12:00
397f7d003a
Fixed the size of race canvas and race view so that canvas won't be stretched
...
- canvas view is set to 1280 * 960
#story[928]
2017-05-24 13:54:05 +12:00
189ba93e64
Created a canvas map class to fetch map image from google
...
- also added Bound class to encapsulate map boundary.
- created TestMapView and its controller just for testing.
#story[928]
2017-05-24 00:49:03 +12:00
William Muir
Haoming Yin
Michael Rausch
Kusal Ekanayake
Zhi You Tan
Zhi You Tan