0e2946f20b
Added ocean object
2017-09-09 12:34:08 +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
cadf995bf7
Added area rounding area to mark assets.
...
#implement
2017-09-08 13:32:17 +12:00
0bf6dd9e6b
Added 3D window to GameView3D to begin adding assets to. Used it to refine all 3D assets implemented by ModelFactory and manually test that they work.
...
#implement #test
2017-09-08 01:50:56 +12:00
eed5f56690
Created factory class for making different views for 3d models of boats.
...
#implement
2017-09-07 19:23:07 +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
c39499cee7
Fixed 3d tests
2017-09-07 18:17:42 +12:00
64811354e3
added peters boat
2017-09-07 17:09:52 +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
d87dcaa4fe
Merged with remote changes
2017-09-07 14:54:23 +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
0650ba30e2
Fixed chat tests
...
#story[1246]
2017-09-05 17:27:34 +12:00
04518c35b0
Created new yacht shape and altered the number of lights.
...
#implement
2017-09-05 17:17:42 +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
396098e009
Added finish noise.
...
#story[1249]
2017-09-05 13:44:14 +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
81afad1bcc
Wrote tests that are currently broken for sending server commands through text chat.
...
#tests
2017-09-04 14:43:13 +12:00
67f39e9049
Tested several methods of creating 3D assets. Added a 3D file importer to library of project and replaced some assets with temporary 32 ones to test creating 32 objects.
...
#implement
2017-09-03 16:54:53 +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
201405d070
WIP: Marks randomly appear in course now. Mark arrows broken.
...
Something about sending raceXML during the course of the race breaks the mark rounding arrows functionallity, crashing the game.
#story[1250]
2017-08-29 19:13:48 +12:00
1c866ea8c2
GameClient now extracts Tokens client side
...
#story[1250]
2017-08-29 16:50:31 +12:00
23027705da
Sample Tokens are now sent out in RaceXML correctly
...
Token and TokenType class created
#story[1250]
2017-08-29 15:37:01 +12:00
c15f13bc2c
Refactored some of the XMLGenerator code. Added tokens to the generated XML
...
Refactor not complete. Generation needs some tidying.
#story[1250]
2017-08-29 14:56:06 +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
2331942bf9
Merge branch 'Story1124_Sparkline' into 'develop'
...
Fixing Ordering
# Changes
* Fixed ordering which was broken from a previous commit
* Removed Sparkline as we could not get it working in time
# Testing
* Manual testlog only
See merge request !65
2017-08-17 14:25:32 +12:00
5a2a78a7d5
Bug fixes for final commit
2017-08-17 13:43:31 +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
ac279583df
Small documentation changes.
...
tags: #story[1142]
2017-08-17 12:31:15 +12:00
95b1c8a01f
Arrows now work as intended. Case added for interior angles.
...
#implement #story[1118]
2017-08-17 00:43: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
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
21e6819f16
Arrows now rendered in correct orientation but rounding arc sometimes inverted.
...
#implement #story[1118]
2017-08-16 20:17:25 +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
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
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
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
Calum
Michael Rausch
Kusal Ekanayake
Zhi You Tan
Peter Galloway
William Muir
Alistair McIntyre
Zhi You Tan