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
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
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
534eaee8ce
Merge remote-tracking branch 'origin/develop' into develop
2017-09-11 15:54:30 +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
40408cff27
-Validation on server list screen and server creation dialog done.
...
tags : #story[1245]
2017-09-11 15:08:34 +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
2b53e0d5b4
Validation fixed on server list screen.
...
Server List Screen done.
tags : #story[1245]
2017-09-11 13:51:29 +12:00
1210f9342b
Removed rounding in GameView that caused objects to be rendered at incorrect positions.
...
#bug
2017-09-11 11:37:50 +12:00
f136a970db
Added placeholder assets for velocity pickups.
2017-09-11 03:11:42 +12:00
800ae2864f
- Fixed a missing validation call.
...
tags: #story[1245]
2017-09-11 02:55:47 +12:00
e764caee60
- Learned how JFX Validators work and implemented them for direct connection.
...
- Aside from the error message when a server cannot be found (which is the default javafx one) I think the serverlist is pretty much done.
tags: #story[1245]
2017-09-11 02:53:41 +12:00
78b4786482
Added assets for the border and for gates. Drew them in correct locations.
...
#implement
2017-09-11 02:50:31 +12:00
f077486e22
- Added methods for validating direct connection, Port Number Complete, Host Name not Complete.
...
- Added No Servers found Message
- Found a potential bug with windows machines not running the correct service to handle Bonjour Service Addresses.
tags: #story[1245]
2017-09-10 18:24:15 +12:00
717f7558d9
Fixed issue that when go back to start screen, start view doesn't fit
...
in to the decorator properly.
- Moved start screen view initialization logic into ViewManager.
- When go back to start screen view, a new stage within the start screen
view will be initialized.
#story[1245]
2017-09-10 12:43:17 +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
06a4dde216
Ported game rendering to 3d environment for boats and markers.
...
#implement
2017-09-09 17:34:18 +12:00
1516e817b7
Fixed some UI bugs, and redesigned some UI elements.
...
- Changed class structure (added dialogs, cells folder)
- Changed font to Baloo as it has better font height
- Figured out a way to change the font color of max player slider thumb
- Added cursor effect when mouse hover on any button
- Fixed drop shadow bug for lobby view player cell
- Moved drop shadow effect from player cell controller to css
#story[1245]
2017-09-09 15:00:32 +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
Michael Rausch
Haoming Yin
cir27
Alistair McIntyre
hyi25
Haoming Yin
William Muir
Zhi You Tan
Kusal Ekanayake
alistairjmcintyre
Zhi You Tan