0b61dffe71
Fixed some docstrings to make build work.
...
#story[1246]
2017-09-07 14:50:08 +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
488ab47c8d
Finished off chat cucumber test.
...
#story[1246]
2017-09-05 18:00:43 +12:00
0650ba30e2
Fixed chat tests
...
#story[1246]
2017-09-05 17:27:34 +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
e4dbbd05c7
Merged with remote changes
2017-09-04 23:42:10 +12:00
a1e3ec54c7
Merge remote-tracking branch 'origin/text_chat' into text_chat
2017-09-04 23:11:02 +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
fce7aa4f9a
Started making a cucumber test for allchat.
...
Will need to incorporate mockito in order to mock controller input. Have commented out the tests as they are not working correctly yet.
#story[1246]
2017-09-04 19:43:05 +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
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
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
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
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
Kusal Ekanayake
Calum
Peter Galloway
William Muir
Alistair McIntyre
Michael Rausch
Haoming Yin
Zhi You Tan