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
3364f8b516
Made chat history transparent.
...
#story[1246]
2017-09-07 17:02:42 +12:00
0feccdc8b9
Replaced existing views with new views and controllers from the test repository.
...
Tags: #pair[mra106, ajm412] #story[1245]
2017-09-07 16:32:34 +12:00
d87dcaa4fe
Merged with remote changes
2017-09-07 14:54:23 +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
0650ba30e2
Fixed chat tests
...
#story[1246]
2017-09-05 17:27:34 +12:00
04518c35b0
Created new yacht shape and altered the number of lights.
...
#implement
2017-09-05 17:17:42 +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
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
81afad1bcc
Wrote tests that are currently broken for sending server commands through text chat.
...
#tests
2017-09-04 14:43:13 +12:00
67f39e9049
Tested several methods of creating 3D assets. Added a 3D file importer to library of project and replaced some assets with temporary 32 ones to test creating 32 objects.
...
#implement
2017-09-03 16:54:53 +12:00
0fcdf41419
fixed broken fps counter #story[1246]
2017-08-30 20:56:28 +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
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
1c866ea8c2
GameClient now extracts Tokens client side
...
#story[1250]
2017-08-29 16:50:31 +12:00
23027705da
Sample Tokens are now sent out in RaceXML correctly
...
Token and TokenType class created
#story[1250]
2017-08-29 15:37:01 +12:00
c15f13bc2c
Refactored some of the XMLGenerator code. Added tokens to the generated XML
...
Refactor not complete. Generation needs some tidying.
#story[1250]
2017-08-29 14:56:06 +12:00
cir27
Michael Rausch
Haoming Yin
William Muir
Zhi You Tan
Kusal Ekanayake
Alistair McIntyre
alistairjmcintyre
Haoming Yin
Zhi You Tan
Peter Galloway