58512fdbdf
Replaced hover sound to work in .jar.
...
#story[1249]
2017-09-11 15:40:13 +12:00
334e13295f
fixed bug
...
#story[1250]
2017-09-11 15:24:42 +12:00
0c4d001510
Merge remote-tracking branch 'origin/develop' into develop
2017-09-11 15:11:49 +12:00
24a3a54ccb
Added sounds to coin pick up
...
Refactored check for token collision to move into the generic check for collision method
Created a YachtEventType enum to differentiate between collision and pickup on client side.
Client now plays a sound when they pick up a token
#story[1250]
2017-09-11 15:11:11 +12:00
9fcb8915c2
Added sounds to coin pick up
...
Refactored check for token collision to move into the generic check for collision method
Created a YachtEventType enum to differentiate between collision and pickup on client side.
Client now plays a sound when they pick up a token
#story[1250]
2017-09-11 14:45:04 +12:00
caf910c4c5
Adjusted volume to make more balanced.
...
#story[1249]
2017-09-11 14:39:40 +12:00
4f07786449
Changed the hover noise from a mediaplayer to an audio clip.
...
Fixes #50
#story[1249]
2017-09-11 14:21:47 +12:00
02e6d2a98b
Fixed Client connection delegate bug
...
#story[1250]
2017-09-09 18:26:22 +12:00
bd7ea920b6
Fixed Client connection delegate bug
...
#story[1250]
2017-09-09 14:46:42 +12:00
4a170f8179
Merged new develop on
...
#story[1250]
2017-09-09 14:13:50 +12:00
1f9e6154ae
Merge branch 'develop' into 1250_SendingGameObjects
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/MainServerThread.java
# src/main/java/seng302/visualiser/GameView.java
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
2017-09-09 14:02:12 +12:00
5595e0439b
Merge branch 'Story1249_SoundsAndMusic' into 'develop'
...
Story1249 sounds and music AND text chat
## Changes
* Added music for the following parts of the game:
* Menu music
* Race music
* Finish screen music
* Added sound effects for the following events:
* Button clicking
* Button hovering (Although it is incredibly quiet)
* Cap gun when the countdown hits 00:00
* Ambient ocean noises
* Collisions (between boats and boats, marks, gates, boundaries)
* Boat rounding a mark
* Boat finishing the race
* Chat window now appears in lower right for all clients/host
* When the message is sent using the 'Enter' key or the send button, all clients/host receive the message in the senders boat colour
* There are two "cheat codes" which when types into chat give the following effect:
* ">speed x" - Will multiply all boats speeds by x
* ">finish" - Will make the race automatically finish and move to the finish screen
## Testing
* Manual test log completed
* Unit tests completed for chat cheat codes
* Cucumber tests completed for general sending of chat between clients
See merge request !69
2017-09-09 13:17:12 +12:00
08f7127b69
Altered test to hopefully fix occasional indeterministic bug that occurred.
2017-09-09 13:13:45 +12:00
8ba28ffda0
Minor refactor moving Spawning and token creation to game state
...
#story[1250]
2017-09-09 13:11:44 +12:00
edd52a07a7
Added logger to HeartBeatThread.
2017-09-09 13:07:04 +12:00
875a6b4e98
Merge remote-tracking branch 'origin/Story1249_SoundsAndMusic' into Story1249_SoundsAndMusic
2017-09-09 13:04:00 +12:00
faefcc7938
Fixed bug with initializing race view elements. Made chat box unselectable. Only manually tested.
...
#bugs #test #implement
2017-09-09 13:03:55 +12:00
0c956f93c8
Merge request fixes. minor refactor
...
#story[1246]
2017-09-09 12:37:31 +12:00
e2bc613c9d
Merge request fixes
...
#story[1246]
2017-09-08 15:52:01 +12:00
cff15ba07d
Added missing button click.
...
#story[1249]
2017-09-07 17:54:28 +12:00
6be7c17c40
Fixed manual test bugs in sounds.
...
#story[1249]
2017-09-07 17:39:59 +12:00
3364f8b516
Made chat history transparent.
...
#story[1246]
2017-09-07 17:02:42 +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
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
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
Kusal Ekanayake
William Muir
Calum
Peter Galloway