00100eb991
Merge remote-tracking branch 'origin/develop' into Story1248_Game_App_Scaling
...
# Conflicts:
# src/main/java/seng302/visualiser/GameView.java
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
# src/main/resources/views/RaceView.fxml
2017-09-11 15:47:47 +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
05236337ba
Fixed horizontal and vertical resizing not to draw larger than scene.
...
#story[1248]
2017-09-10 03:17:26 +12:00
1b76d59acb
Removed drawGoogleMap()
...
#story[1248]
2017-09-10 02:21:30 +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
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
f66ef3c208
[WIP]
...
- Horizontal and vertical resizing works fine now.
- Issue: Have to implement maximum horizontal and vertical scaling.
#story[1248]
2017-09-09 03:14:10 +12:00
cff15ba07d
Added missing button click.
...
#story[1249]
2017-09-07 17:54:28 +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
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
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
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
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
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
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
4c730ea890
Fixed null pointer when cant find a server
...
tags: #fix
2017-08-17 15:40:55 +12:00
d867a4b7a2
Fixed bug, should fix disconnection issues.
...
tags : #issue[47]
2017-08-17 14:53:54 +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
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
Zhi You Tan
William Muir
Zhi You Tan
Calum
Kusal Ekanayake
Peter Galloway
Alistair McIntyre