d4826739e3
Merge branch 'develop' into Story1248_Game_App_Scaling
2017-09-11 16:56:49 +12:00
fdfb5959fa
Minor change so that boats still are checked for collision after passing the finish line
...
#story[1250]
2017-09-11 16:53:12 +12:00
1ce8df976c
changed name: contentanchorpane to contentgridpane
...
#story[1248]
2017-09-11 16:08:24 +12:00
6fcd4ae4cc
updated raceview javafx after develop merge to bring in text chat pane.
...
#story[1248]
2017-09-11 16:01:07 +12:00
534eaee8ce
Merge remote-tracking branch 'origin/develop' into develop
2017-09-11 15:54:30 +12:00
ab35e3506d
fixed bug
...
#story[1250]
2017-09-11 15:54:16 +12:00
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
58512fdbdf
Replaced hover sound to work in .jar.
...
#story[1249]
2017-09-11 15:40:13 +12:00
1b8c503712
fixed bug
...
#story[1250]
2017-09-11 15:29:08 +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
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
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
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
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
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
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
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
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
William Muir
Zhi You Tan
Kusal Ekanayake
Zhi You Tan
Calum
Peter Galloway