e2bc613c9d
Merge request fixes
...
#story[1246]
2017-09-08 15:52:01 +12:00
1a755cec33
Fixed bug that caused mark arrows to be rendered on Marker id not LegNumber
...
#bugs
2017-09-07 16:25:55 +12:00
56f1dd2efb
Reverted change, didn't work.
...
#story[1246]
2017-09-05 18:20:56 +12:00
302bc91461
Tried to fix build by removing invalid '>' char.
...
#story[1246]
2017-09-05 18:17:20 +12:00
0650ba30e2
Fixed chat tests
...
#story[1246]
2017-09-05 17:27:34 +12:00
e4dbbd05c7
Merged with remote changes
2017-09-04 23:42:10 +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
5026c568a7
Wrote tests that are currently broken for sending server commands through text chat.
...
#tests
2017-09-03 20:38:31 +12:00
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
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
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
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
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
3c91db59f3
Changed wind change variation
2017-08-17 14:49:39 +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
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
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
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
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
7bda2bc580
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 11:46:14 +12:00
6e02d3e533
Added some general UI improvements such as autofilling the color field of the form, and looked at how best to deal with response packets, as it should be part of the spec.
...
tags: #story[1142]
2017-08-17 01:20:16 +12:00
7b4a70817b
Merged onto develop.
...
#mergre #refactor
2017-08-17 01:03:14 +12:00
87acce71ea
Merge branch 'develop' into story1118_map_arrows
...
# Conflicts:
# src/main/java/seng302/gameServer/MainServerThread.java
# src/main/java/seng302/model/RaceState.java
# src/main/java/seng302/visualiser/GameClient.java
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
2017-08-17 00:52:41 +12:00
4596f1e0f8
Finish screen all done, updates during race
...
tags: #story[1124] #pair[wmu16, cir27]
2017-08-16 23:42:07 +12:00
65286f273b
Working ordering for in game AND race finish screen.
...
List in RaceState holds a sorted list of yachts.
A Listener is added to this list, listening for a permutation change, on perm change, sorts the list by comparitor of leg number of each yacht (stable sort)
2017-08-16 23:22:58 +12:00
9727e86249
Merge remote-tracking branch 'origin/story1118_map_arrows' into 1124_Fixing_Order_And_Finish_Screen
...
# Conflicts:
# src/main/java/seng302/gameServer/MainServerThread.java
# src/main/java/seng302/visualiser/GameClient.java
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
# src/main/resources/server_config/xml_templates/race.ftlh
2017-08-16 22:40:32 +12:00
db614fe845
Initial commit for Fixing order
2017-08-16 21:16:27 +12:00
85899e3fbe
Merged with develop functionality.
2017-08-16 21:11:34 +12:00
87d6799c10
Re-added wind speed & direction variations
...
- Wind speed & direction are randomly updated
- Removed two duplicate threads ;)
Tags: #story[1124]
2017-08-16 20:48:37 +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
28569506f0
Merge remote-tracking branch 'origin/develop' into develop
2017-08-16 20:09:20 +12:00
William Muir
Calum
Kusal Ekanayake
Michael Rausch
Peter Galloway
Alistair McIntyre
Zhi You Tan
Haoming Yin
alistairjmcintyre