47798b19fe
Added player position, boat speed, boat heading to race view.
...
#story[1245]
2017-09-13 11:22:05 +12:00
7b0d31438e
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge_ryan
2017-09-13 09:44:17 +12:00
f0fc75feec
[WIP] Adding player position, boat speed, boat heading
...
#story[1245]
2017-09-12 18:25:46 +12:00
167545cbef
- Deleted old controllers that didn't do anything anymore.
...
tags : #story[1245]
2017-09-12 17:45:39 +12:00
3455321f01
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
2017-09-12 16:54:55 +12:00
7e9e96c091
- Added documentation to controllers
...
tags : #story[1245]
2017-09-12 16:54:40 +12:00
b25c3367a9
Reimplemented wind. Wind arrow will rotate based on wind direction. Added labels for wind direction and wind speed.
...
#story[1245]
2017-09-12 16:52:44 +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
99f38fa05f
[WIP] Added wind image to the bottom left of the race view.
...
tags: #story[1245]
2017-09-12 15:52:22 +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
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
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
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
d4826739e3
Merge branch 'develop' into Story1248_Game_App_Scaling
2017-09-11 16:56:49 +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
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
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
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
e3ccb570ed
Merge remote-tracking branch 'origin/story1266_3d_model_factory' into story1266_3d_model_factory
2017-09-10 22:54:49 +12:00
470bf121a5
Added assets for borders.
2017-09-10 22:54:40 +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
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
0e2946f20b
Added ocean object
2017-09-09 12:34:08 +12:00
cf4f8813d2
re-implemented existing functionality in UI
...
- Correct player count is shown in server list
- Servers now advertise their capacity and number of players connected
- Players can click join on the servers in the server list
- Direct connect works
- Can set max players / server name in host dialog
- Server starts correctly when host clicked
- Implemented boat customization
- Implemented 'begin race button', and disabled it for players that aren't hosts
- Added countdown timer in lobby
- Fixed bug where app wouldn't close
Tags: #story[1245]
2017-09-08 18:00:09 +12:00
cadf995bf7
Added area rounding area to mark assets.
...
#implement
2017-09-08 13:32:17 +12:00
0bf6dd9e6b
Added 3D window to GameView3D to begin adding assets to. Used it to refine all 3D assets implemented by ModelFactory and manually test that they work.
...
#implement #test
2017-09-08 01:50:56 +12:00
eed5f56690
Created factory class for making different views for 3d models of boats.
...
#implement
2017-09-07 19:23:07 +12:00
b35126ff4e
Added server list updates, and added lobby
...
- Server list updates when a server is added/removed
- Player can host a server
- Lobby view shows players connected
Tags: #pair[mra106, hyi25] #story[1245]
2017-09-07 19:20:36 +12:00
c39499cee7
Fixed 3d tests
2017-09-07 18:17:42 +12:00
64811354e3
added peters boat
2017-09-07 17:09:52 +12:00
Zhi You Tan
Zhi You Tan
Alistair McIntyre
Michael Rausch
Haoming Yin
alistairjmcintyre
cir27
Haoming Yin
William Muir
Kusal Ekanayake