410d765745
Started working on the boat selection screen.
...
Customised the boat customisation UI to contain it. Need to have another boat to test whether we can switch boats and also if the messages get sent correctly.
#story[1274]
2017-09-20 16:36:27 +12:00
da263355f4
Changed raceview background.
...
#fix
2017-09-19 14:55:26 +12:00
3a671d4ed0
- Added Values to Finish Dialog.
...
Tags: #story[1245]
2017-09-14 15:24:58 +12:00
3a41c27d8d
- Race Finish Dialog showing up, unsure if its actually showing the correct ordering or not.
...
tags : #story[1245]
2017-09-14 14:42:25 +12:00
7d0a47446d
- Fixed bug in customize dialog.
...
tags : #story[1245]
2017-09-14 13:02:31 +12:00
7ee6a09626
Fixed that wind speed did not updated frequently and UI polishing.
...
- added shadow for raceview boxes
- split up message history and input text block
- changed timer font
#story[1245]
2017-09-13 21:11:40 +12:00
7b0d31438e
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge_ryan
2017-09-13 09:44:17 +12:00
f0fc75feec
[WIP] Adding player position, boat speed, boat heading
...
#story[1245]
2017-09-12 18:25:46 +12:00
167545cbef
- Deleted old controllers that didn't do anything anymore.
...
tags : #story[1245]
2017-09-12 17:45:39 +12:00
3455321f01
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
2017-09-12 16:54:55 +12:00
7e9e96c091
- Added documentation to controllers
...
tags : #story[1245]
2017-09-12 16:54:40 +12:00
b25c3367a9
Reimplemented wind. Wind arrow will rotate based on wind direction. Added labels for wind direction and wind speed.
...
#story[1245]
2017-09-12 16:52:44 +12:00
99f38fa05f
[WIP] Added wind image to the bottom left of the race view.
...
tags: #story[1245]
2017-09-12 15:52:22 +12:00
bc9f0ea924
Injected a simple toggle into the decorator for the window for the sound.
...
Unsure if this is the best way to do it but not a bad thing to try for now.
tags : #story[1245] #story[1249]
2017-09-12 13:53:24 +12:00
8c2125276e
Polished race view text area and send button UI style to make them pretty
...
tags: #story[1245]
2017-09-12 10:59:08 +12:00
235d6c9cef
Added 3D element to lobby screen to show the player their boat before the race.
...
tags: #story[1245]
2017-09-12 03:57:29 +12:00
5dd936f8f1
Added chat functionality & timer back into the game + bug fixes
...
- Added chat back into the game
- Fixed a bug where the timer would show "race finished" when the race hadn't started
- Fixed a bug where resources weren't being deallocated when the game was closed
Tags: #story[1246]
2017-09-12 01:31:38 +12:00
d49e84e6d2
Fixed a bug that race view doesn't fit in decorator.
...
- recreated a new stage and decorator to fix the bug as decorator might
not be able to be reused.
#story[1245]
2017-09-11 23:42:08 +12:00
0d7201e235
Race view is default to be full screen now and minor bug fixes.
...
- race view is force to be full screen and run in a new stage
- fixed button animations in lobby view
- polished UI element is boat customization dialog
#story[1245]
2017-09-11 23:04:41 +12:00
131cd80e02
Added button sounds on hover, click and in the lobby
...
- Started playing start & lobby sounds
- Started playing button hover & click sounds
Tags: #story[1249]
2017-09-11 19:50:17 +12:00
0bf83aa858
Merge remote-tracking branch 'origin/develop' into NewUI_merge
...
# 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/visualiser/GameClient.java
# src/main/java/seng302/visualiser/GameView.java
# src/main/java/seng302/visualiser/controllers/FinishScreenViewController.java
# src/main/java/seng302/visualiser/controllers/LobbyController.java
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
# src/main/java/seng302/visualiser/controllers/StartScreenController.java
# src/main/resources/views/LobbyView.fxml
# src/main/resources/views/RaceView.fxml
# src/main/resources/views/StartScreenView.fxml
2017-09-11 18:15:08 +12:00
1ce8df976c
changed name: contentanchorpane to contentgridpane
...
#story[1248]
2017-09-11 16:08:24 +12:00
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
Kusal Ekanayake
Calum
Alistair McIntyre
Haoming Yin
Zhi You Tan
Zhi You Tan
alistairjmcintyre
Michael Rausch
Haoming Yin
Peter Galloway
William Muir