88d1e91b6f
Added processing of input from host via chat to manually trigger race finishing or to speed up boats.
...
#implement
2017-09-03 19:18:30 +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
eb1d3f1a60
Fixed bug where discovery wasn't working under windows
...
- getLocalHost() was returning the networks public IP address, changed this to getByName() for the local IP
Tags: #story[1247]
2017-09-02 02:16:40 +12:00
54ca12f3b6
[WIP]
...
- Updated raceview.fxml to scale race view when resize.
- Implemented a listener on game view to know the current window size.
Issues:
- Border updates with resizing until a certain size and it draws out of canvas
- Marks are not drawn within border
- Trails do not scale at all
2017-09-01 17:10:00 +12:00
3f910b8db7
Fixed JavaDoc errors by adding missing parameters
2017-09-01 16:13:18 +12:00
b346d5a706
Implemented server re-registration when a server closes / updates
...
- When a server is closed, it will disappear from the server list
- When a player joins a server, the number of spaces left will decrease
- Servers now disappear instead of duplicating
- Added tests for ServerDescription
- Added documentation for new classes
Tags: #story[1247]
2017-09-01 16:05:47 +12:00
45fa73595f
fixed being able to zoom while chatting by holding shift and then pressing z and x #story[1246]
2017-08-31 17:26:02 +12:00
01ca3f3453
tweaked formatting of chat history #story[1246]
2017-08-31 17:06:13 +12:00
ba8e333d81
fixed issue with the chat history updating weirdly (made sure it run synchronously with platform.runlater) #story[1246]
2017-08-31 16:49:12 +12:00
24d4c1df15
made chat history always scroll to the bottom after a message is sent #story[1246]
2017-08-31 16:35:51 +12:00
0c5d661995
Fixed discovery bug, implemented server list, added server parameters
...
- Resolved DNS bug by updating to a newer version of JmDNS
- Added server list, this is populated with new servers as they are discovered
- Added map name and spaces remaining to server advertisement
Tags: #story[1247]
2017-08-31 01:11:17 +12:00
262f27fa8a
Added basic auto discovery functionality
...
- Servers can advertise themselves
- Clients can detect servers on their local network
Tags: #story[1247]
2017-08-30 22:53:45 +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
4bd7291a4a
WIP: Yachts now power up upon collecting an item
...
Power up is speed boost x2 multiplier
Lasts 10 seconds
Do not stack
#story[1250]
2017-08-29 22:11:37 +12:00
0d0b2e59d5
WIP: Tokens works well with collection. Dissapear upon picking up across all clients.
...
Still bug with mark ordering and arrows :/
#story[1250]
2017-08-29 21:40:25 +12:00
ace48a8404
Refactored MainServer Class in prep for better sending out of XML messages
...
All messages are now created through MessageFactory class
Minor tweaks to improve code base server side
Removed observer from Server to Client threads
#story[1250]
2017-08-29 21:23:46 +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
dc19310849
Tokens now appear client side
...
#story[1250]
2017-08-29 17:17:06 +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
4c730ea890
Fixed null pointer when cant find a server
...
tags: #fix
2017-08-17 15:40:55 +12:00
a501b21d66
Merge branch 'develop' into 'master'
...
Sprint 6.0 Merge
Merge for sprint 6.0 tag to master.
See merge request !67
2017-08-17 14:59:01 +12:00
5fb8a0c2c1
Merge branch 'issue47_disconnect_crash_rebranch' into 'develop'
...
Issue47 disconnect crash rebranch
Fix for all disconnection issues. Fix is not robust. Need consistent interface between disconnection of ServerToClientThreads and MainServerThread.
See merge request !66
2017-08-17 14:55:45 +12:00
d867a4b7a2
Fixed bug, should fix disconnection issues.
...
tags : #issue[47]
2017-08-17 14:53:54 +12:00
3c91db59f3
Changed wind change variation
2017-08-17 14:49:39 +12:00
72a390b484
Fixed build bug.
...
tags : #issue[47]
2017-08-17 14:47:20 +12:00
978def4cf7
Merge remote-tracking branch 'origin/develop' into issue47_disconnect_crash_rebranch
...
# Conflicts:
# src/main/java/seng302/gameServer/ServerToClientThread.java
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
2017-08-17 14:36:16 +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
d41bdfebbc
Merged Boat customization onto develop.
...
#bug #merge #refactor
2017-08-17 14:21:06 +12:00
d0565503e8
Merge branch 'develop' into issue47_disconnect_crash_rebranch
...
# Conflicts:
# src/main/java/seng302/gameServer/ServerToClientThread.java
# src/main/java/seng302/visualiser/ClientToServerThread.java
# src/main/java/seng302/visualiser/GameClient.java
2017-08-17 14:15:27 +12:00
f0c48e76e1
Merge branch 'Story80_BoatCustomization' into 'develop'
...
Story 80: Boat Customization
# Implementation
- Added Messages for Boat Customization Requests and Responses.
- Added functionality to handle Name and Boat Color Customization. (Shapes would be a next sprint thing)
# Testing
- Manually tested personally, will test correctly when boat shapes have also been implemented.
See merge request !64
2017-08-17 14:11:04 +12:00
3639e0d3ce
Fixed disconnection issues. Fix is only temporary until a consistent interface for disconnections exists.
...
#bug #implement
2017-08-17 14:10:38 +12:00
0276911b88
Fixed disconnection issues. Fix is only temporary until a consistent interface for disconnections exists.
...
#bug #implement
2017-08-17 14:02:18 +12:00
af3a400841
Fixed build bug.
...
tags : #story[1142]
2017-08-17 13:44:34 +12:00
5a2a78a7d5
Bug fixes for final commit
2017-08-17 13:43:31 +12:00
5fc7442359
Merged Develop into branch.
...
tags : #story[1142]
2017-08-17 13:40:00 +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
7a11b5eb77
Merge branch 'develop' into Story1124_Sparkline
2017-08-17 13:14:08 +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
3e383465a9
Attempted to fix sparklines, temporarily disabled them for end of sprint.
2017-08-17 13:12:09 +12:00
ac279583df
Small documentation changes.
...
tags: #story[1142]
2017-08-17 12:31:15 +12:00
ef2659a7b9
Merge branch 'develop' into issue47_disconnect_crash_rebranch
...
# Conflicts:
# src/main/java/seng302/visualiser/GameClient.java
# src/test/java/seng302/visualiser/ClientToServerTests/RegularPacketsTest.java
2017-08-17 12:16:14 +12:00
769d1956b3
Moved client side disconnection handling to this branch and reimplemented it with develop functionality.
...
#refactor #issue[47]
2017-08-17 12:11:36 +12:00
8ca455ed24
Fixed:
...
- Fixed regularPacketsTest unit test, which checks how regularly packets are sent from C2S thread.
- Removed misused GameClient in main server thread.
tags: #story[1124]
2017-08-17 12:03:43 +12:00
Calum
Michael Rausch
Zhi You Tan
Peter Galloway
William Muir
Kusal Ekanayake
Alistair McIntyre
Haoming Yin