6fcd4ae4cc
updated raceview javafx after develop merge to bring in text chat pane.
...
#story[1248]
2017-09-11 16:01:07 +12:00
00100eb991
Merge remote-tracking branch 'origin/develop' into Story1248_Game_App_Scaling
...
# Conflicts:
# src/main/java/seng302/visualiser/GameView.java
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
# src/main/resources/views/RaceView.fxml
2017-09-11 15:47:47 +12:00
e764caee60
- Learned how JFX Validators work and implemented them for direct connection.
...
- Aside from the error message when a server cannot be found (which is the default javafx one) I think the serverlist is pretty much done.
tags: #story[1245]
2017-09-11 02:53:41 +12:00
1516e817b7
Fixed some UI bugs, and redesigned some UI elements.
...
- Changed class structure (added dialogs, cells folder)
- Changed font to Baloo as it has better font height
- Figured out a way to change the font color of max player slider thumb
- Added cursor effect when mouse hover on any button
- Fixed drop shadow bug for lobby view player cell
- Moved drop shadow effect from player cell controller to css
#story[1245]
2017-09-09 15:00:32 +12:00
cf4f8813d2
re-implemented existing functionality in UI
...
- Correct player count is shown in server list
- Servers now advertise their capacity and number of players connected
- Players can click join on the servers in the server list
- Direct connect works
- Can set max players / server name in host dialog
- Server starts correctly when host clicked
- Implemented boat customization
- Implemented 'begin race button', and disabled it for players that aren't hosts
- Added countdown timer in lobby
- Fixed bug where app wouldn't close
Tags: #story[1245]
2017-09-08 18:00:09 +12:00
b35126ff4e
Added server list updates, and added lobby
...
- Server list updates when a server is added/removed
- Player can host a server
- Lobby view shows players connected
Tags: #pair[mra106, hyi25] #story[1245]
2017-09-07 19:20:36 +12:00
3364f8b516
Made chat history transparent.
...
#story[1246]
2017-09-07 17:02:42 +12:00
0feccdc8b9
Replaced existing views with new views and controllers from the test repository.
...
Tags: #pair[mra106, ajm412] #story[1245]
2017-09-07 16:32:34 +12:00
d67566e217
[WIP]
...
- changed contentAnchorPane to Grid Pane temporarily so added child will be able to resize natively
- implemented zooming when resizing
Bugs:
- horizontal resizing works as intended, but vertical resizing will result in canvas moving far too left
- need to solve the right and bottom empty space when resizing
#story[1248]
2017-09-06 01:26:12 +12:00
f33e4cc137
Added finish music and merged with text chat.
...
#story[1249]
2017-09-05 15:24:56 +12:00
7a4b3f0ad9
Merge branch 'text_chat' into Story1249_SoundsAndMusic
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/visualiser/GameClient.java
# src/main/java/seng302/visualiser/controllers/StartScreenController.java
2017-09-05 14:42:20 +12:00
1619c95098
Added mark rounding noise and hover button noise.
...
#story[1249]
2017-09-05 14:33:37 +12:00
47f3f6e27d
Created a new chat history class that allows for rich formatting of individual messages. Current implementation allows for bold and coloured text only. Has been manually tested. Fixed 3/5 chat command tests.
...
#implement #test #story[1246]
2017-09-04 23:10:54 +12:00
0fcdf41419
fixed broken fps counter #story[1246]
2017-08-30 20:56:28 +12:00
4ebf7d6104
chat packets sent to server and then sent back to all clients. #story[1246]
2017-08-30 20:42:11 +12:00
353dd48829
sending chatter packets to server #story[1246]
2017-08-30 19:14:47 +12:00
6ee2517f74
Added most sound functionality.
...
There is not background music and sound effects (button clicking, ocean noises, crashes for collisions). Can mute the sound and the music independently of each other from the main menu.
#story[1249]
2017-08-28 16:37:09 +12:00
75155fe481
implemented basic single client proof of concept for the chat history #story[1246]
2017-08-25 17:57:45 +12:00
2fcff65dd6
Fixed null pointer when cant find a server
...
tags: #fix
2017-08-17 15:44:05 +12:00
39cfaf6780
Merge remote-tracking branch 'origin/develop' into Story80_BoatCustomization
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/ServerPacketParser.java
# src/main/java/seng302/gameServer/ServerToClientThread.java
# src/main/java/seng302/gameServer/messages/ChatterMessage.java
# src/main/java/seng302/gameServer/messages/MarkRoundingMessage.java
# src/main/java/seng302/model/ServerYacht.java
# src/main/java/seng302/visualiser/ClientToServerThread.java
# src/main/java/seng302/visualiser/GameClient.java
# src/main/java/seng302/visualiser/GameView.java
2017-08-17 13:31:27 +12:00
faf4600f51
Fixed some weird bug with the messages package, trying to add some small QoL changes with potential interaction bugs with the customization/lobby menu.
...
tags : #story[1142]
2017-08-17 13:13:07 +12:00
67f0c213c2
Everything works. Needs a bit of polish, and possibly look at boat shapes next.
...
tags: #story[1142]
2017-08-16 20:38:11 +12:00
6d045e9976
Merge branch 'develop' into Story80_BoatCustomization
...
# Conflicts:
# src/main/java/seng302/visualiser/GameClient.java
# src/main/java/seng302/visualiser/controllers/LobbyController.java
2017-08-16 17:59:11 +12:00
9c2bac36b6
Merge branch 'develop' into Story40_Zooming
2017-08-16 17:27:09 +12:00
1db75a8ae4
Request Messages now sending to server, need to update game and send response packet.
...
tags: #story[1142]
2017-08-16 14:54:50 +12:00
8fb5ea2223
Merge branch 'develop' into StartScreen
...
# 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/utilities/StreamParser.java
# src/main/java/seng302/visualiser/GameClient.java
# src/main/java/seng302/visualiser/controllers/LobbyController.java
2017-08-16 14:31:14 +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
bd213bcd9e
Merge branch 'develop' into Story80_BoatCustomization
2017-08-16 13:06:31 +12:00
9cb5956f3c
Updated lobby controller to pass the player ID through, and the lobby view to have a customize button.
...
tags: #story[1142]
2017-08-15 16:48:23 +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
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
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
d2fd9ebaea
Started work on start screen
...
- Server now sends out race start status messages during lobby & pre-start stages
- Added timer in lobby
Tags: #story[1109]
2017-08-11 19:03:57 +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
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
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
7917a2584b
Fixed alignment for wind direction
2017-07-26 20:28:13 +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
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
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
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
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
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
526c12127f
Merging game lobby with game state broadcast. Merge conflicts resolved.
...
Port numbers updated to 4942.
2017-07-24 15:26:51 +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
Zhi You Tan
alistairjmcintyre
Haoming Yin
Michael Rausch
Kusal Ekanayake
Zhi You Tan
Calum
Peter Galloway
William Muir
Alistair McIntyre