9dad88e56a
Fixed bug where server creation dialog validation was not working
...
#story[1245]
2017-09-12 16:45:52 +12:00
6a4547f3f9
Minor fix so no lag when token is picked up
...
upon receiving a new RaceXML when one has been recieved we no longer update the course. Just update tokens
#story[1245]
2017-09-12 16:37:29 +12:00
71f626f57e
fixed sail rotation broken from port to 3d #story[1266]
2017-09-12 16:30:20 +12:00
1c343ec02d
Changed the lobby map view to the 2D race rather than the 3D one.
...
Stripped back game view class appropriately.
#story[1245]
2017-09-12 16:13:14 +12:00
5046ca6ffa
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
2017-09-12 16:08:39 +12:00
bd31bae586
Changed the lobby map view to the 2D race rather than the 3D one.
...
Stripped back game view class appropriately.
#story[1245]
2017-09-12 16:08:29 +12:00
2f973deacc
Merge branch 'NewUI_merge' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into NewUI_merge
2017-09-12 15:56:31 +12:00
f4c5e483ce
Merge remote-tracking branch 'origin/3D_view_working_with_maven' into NewUI_merge
2017-09-12 15:56:17 +12:00
bb3ee424cc
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
2017-09-12 15:52:34 +12:00
99f38fa05f
[WIP] Added wind image to the bottom left of the race view.
...
tags: #story[1245]
2017-09-12 15:52:22 +12:00
6a8c77c670
Made the project successfully build and deploy using new libraries on a local maven repo. Removed old unused libraries.
...
#story[1266]
2017-09-12 15:11:27 +12:00
659a521cc9
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-12 14:55:49 +12:00
da3613fe36
Split off marker classes.
2017-09-12 14:48:30 +12:00
8dc3e54186
Merge remote-tracking branch 'origin/story1266_3d_model_factory' into story1266_3d_model_factory
2017-09-12 14:11:11 +12:00
8fd35392b0
Added experimental assets for water.
...
#story[1266] #implement
2017-09-12 14:11:00 +12:00
bc9f0ea924
Injected a simple toggle into the decorator for the window for the sound.
...
Unsure if this is the best way to do it but not a bad thing to try for now.
tags : #story[1245] #story[1249]
2017-09-12 13:53:24 +12:00
6d9864e677
Fixed chat history text line spacing to a smaller amount.
...
tags: #story[1245]
2017-09-12 11:12:35 +12:00
8c2125276e
Polished race view text area and send button UI style to make them pretty
...
tags: #story[1245]
2017-09-12 10:59:08 +12:00
235d6c9cef
Added 3D element to lobby screen to show the player their boat before the race.
...
tags: #story[1245]
2017-09-12 03:57:29 +12:00
5dd936f8f1
Added chat functionality & timer back into the game + bug fixes
...
- Added chat back into the game
- Fixed a bug where the timer would show "race finished" when the race hadn't started
- Fixed a bug where resources weren't being deallocated when the game was closed
Tags: #story[1246]
2017-09-12 01:31:38 +12:00
d223d393fa
Merge branch 'story1266_3d_model_factory' into NewUI_merge
2017-09-11 23:45:31 +12:00
aa098569f3
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
2017-09-11 23:43:46 +12:00
d49e84e6d2
Fixed a bug that race view doesn't fit in decorator.
...
- recreated a new stage and decorator to fix the bug as decorator might
not be able to be reused.
#story[1245]
2017-09-11 23:42:08 +12:00
75bf92a67f
Added map image to lobby screen
...
- Lobby screen has map of the course
- Map resizes with window
Tags: #story[1245]
2017-09-11 23:24:21 +12:00
0d7201e235
Race view is default to be full screen now and minor bug fixes.
...
- race view is force to be full screen and run in a new stage
- fixed button animations in lobby view
- polished UI element is boat customization dialog
#story[1245]
2017-09-11 23:04:41 +12:00
0197de6fe3
Drawing player icon assets but line segment was not added to repo some app crashes.
...
#implement #story[1266]
2017-09-11 22:19:08 +12:00
d79ff0f1cf
Merge remote-tracking branch 'origin/story1266_3d_model_factory' into story1266_3d_model_factory
...
# Conflicts:
# src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelFactory.java
# src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelType.java
2017-09-11 22:03:52 +12:00
18f36d7ea4
Added assets to identify the player. Needs to merge with 3d player specification for code side to be implemented.
...
#story[1266] #implement
2017-09-11 22:02:21 +12:00
131cd80e02
Added button sounds on hover, click and in the lobby
...
- Started playing start & lobby sounds
- Started playing button hover & click sounds
Tags: #story[1249]
2017-09-11 19:50:17 +12:00
3d0209300e
- Validation completely done
...
- Some documentation added.
tags : #story[1245]
2017-09-11 19:36:16 +12:00
6b4f7eb42b
Merge develop into NewUI, and 3D
...
tags: #story[1245]
2017-09-11 18:56:26 +12:00
8b9b3a31bd
Trying to start getting the 3D branch to successfully build and run on git and on computers.
...
Solving maven issues.
2017-09-11 18:50:01 +12:00
0bf83aa858
Merge remote-tracking branch 'origin/develop' into NewUI_merge
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/MainServerThread.java
# src/main/java/seng302/gameServer/ServerToClientThread.java
# src/main/java/seng302/visualiser/GameClient.java
# src/main/java/seng302/visualiser/GameView.java
# src/main/java/seng302/visualiser/controllers/FinishScreenViewController.java
# src/main/java/seng302/visualiser/controllers/LobbyController.java
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
# src/main/java/seng302/visualiser/controllers/StartScreenController.java
# src/main/resources/views/LobbyView.fxml
# src/main/resources/views/RaceView.fxml
# src/main/resources/views/StartScreenView.fxml
2017-09-11 18:15:08 +12:00
dff261cf41
Added 3D assets for a trail and generated them at regular intervals.
...
#story[1266] #implement
2017-09-11 17:16:13 +12:00
83ee217cef
Merge branch 'Story1248_Game_App_Scaling' into 'develop'
...
Story1248 Race view scaling
# Changes
* Added listener to widthProperty and heightProperty in GameView.fxml.
* Changed some of the race view fxml hierarchy to support resizing.
# Testing
* Manual test log completed.
See merge request !70
2017-09-11 17:11:27 +12:00
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
878c0e0f43
Added ocean asset. Moved camera to center of race.
...
#story[1266]
2017-09-11 16:24:21 +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
1fec620427
Merged 3d branch into new UI
...
Tags: #story[1245]
2017-09-11 15:50:22 +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
76a1a3c7a0
Merge remote-tracking branch 'origin/story1266_3d_model_factory' into NewUI_merge
...
# Conflicts:
# pom.xml
# src/main/java/seng302/App.java
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/MainServerThread.java
# src/main/java/seng302/gameServer/ServerToClientThread.java
# src/main/java/seng302/utilities/XMLGenerator.java
# src/main/java/seng302/visualiser/GameClient.java
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
# src/main/resources/views/RaceView.fxml
# src/main/resources/views/StartScreenView.fxml
2017-09-11 15:29:33 +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
William Muir
Peter Galloway
Michael Rausch
Haoming Yin
Kusal Ekanayake
Calum
Alistair McIntyre
alistairjmcintyre
hyi25
Haoming Yin
Zhi You Tan