499acb9733
Merge branch '1293_PowerUps_TokenInfo' into develop
2017-09-28 12:21:12 +13:00
5688e10e6f
Tokens now display on the right and are clickable for further information
...
#story[1293]
2017-09-28 12:20:16 +13:00
5cbd729214
Tokens now display on the right and are clickable for further information
...
#story[1293]
2017-09-28 12:08:14 +13:00
37e4fe4ce7
Issue #83 : Server creation dialog need to be polished
...
- rearranged the layout of all the nodes
- set CSS files for the dialog
- added close button
tags: #story[1273]
2017-09-28 11:13:02 +13:00
705669ad07
centered icons #fix
2017-09-28 07:23:25 +13:00
b9cb6fa5b4
Added token information to the lobby screen.
...
#implement #story[1293]
2017-09-28 05:09:54 +13:00
ba768deabc
Initial commit for The Token info panel in the lobby controller
...
- Having some mad issues with front end formatting with JFX.
- Icons are put in boxes
#story[1293]
2017-09-28 02:17:39 +13:00
8b7407bf89
Various bug fixes
...
- Closed socket when discovery server crashes, so it can be restarted
- Flattened water on terrain mesh
- Added checks to ensure server is started before connecting
- Added a check to ensure client has started before connecting to the server
- Fixed concurrency issue in server-> client thread list
Tags: #story[1281]
2017-09-28 01:58:49 +13:00
df24fe072a
Added animation for wind turning.
...
- enlarged the wind image size to centre the compass
- added animation to smooth the turning
2017-09-28 00:13:45 +13:00
ff4c2cd5b6
Merge branch '1273_Skybox' into 'develop'
...
1273 skybox
Server Discovery:
- Created server discovery server.
- Implemented protocols to support matchmaking & room code connection
- Improved error handling for server disconnections
Skybox:
- Added a skybox
- Added a terrain mesh
See merge request !79
2017-09-27 21:52:34 +13:00
5cc4898ab5
Fixed failing tests & other bug fixes
...
- Fixed server capacity in server list
- Fixed failing unit tests for chat
Tags: #story[1281] #pair[mra106, cir27]
2017-09-27 20:37:29 +13:00
22e1e57c24
Issue #73 : If you change controls to 'Continuously turning' before moving into game, it is not applied
...
- always send turning mode packet when race starts to sync the steering mode
#story[1278]
2017-09-27 20:18:06 +13:00
efc71f2003
Resolved issue #69 and added dock icon for splash screen.
2017-09-27 19:27:13 +13:00
2b3a972ed5
Various bug fixes
...
- Fixed bug where an invalid port number would crash the program
- Closed the stage before cleaning up resources. This speeds up closing the app.
- Added error handling for when the client looses connection to the server.
Tags: #story[1281]
2017-09-27 17:14:55 +13:00
67f3124cfb
Merge branch 'develop' into 1273_Skybox
2017-09-27 15:32:54 +13:00
7db387bdec
Merged Host Customisation onto 1273_Skybox
2017-09-27 15:31:54 +13:00
00ff771fc3
Merge remote-tracking branch 'origin/story1275_host_customization' into 1273_Skybox
...
# 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/ClientToServerThread.java
# src/main/java/seng302/visualiser/GameView.java
# src/main/java/seng302/visualiser/GameView3D.java
# src/main/java/seng302/visualiser/controllers/dialogs/ServerCreationController.java
2017-09-27 14:56:09 +13:00
78f64557c3
Merged dev onto 1273_Skybox
2017-09-27 14:46:12 +13:00
982fac38a0
Merge remote-tracking branch 'origin/develop' into 1273_Skybox
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/MainServerThread.java
# src/main/java/seng302/gameServer/MessageFactory.java
# src/main/java/seng302/gameServer/ServerToClientThread.java
# src/main/java/seng302/model/ClientYacht.java
# src/main/java/seng302/model/mark/MarkOrder.java
# src/main/java/seng302/visualiser/GameClient.java
# src/main/java/seng302/visualiser/GameView3D.java
# src/main/java/seng302/visualiser/controllers/ServerListController.java
# src/main/java/seng302/visualiser/controllers/dialogs/ServerCreationController.java
# src/main/resources/icons/bumperIcon.png
# src/main/resources/icons/handlingIcon.png
# src/main/resources/icons/velocity.png
# src/main/resources/icons/windWalkerIcon.png
# src/main/resources/views/RaceView.fxml
# src/main/resources/views/dialogs/ServerCreationDialog.fxml
2017-09-27 14:23:38 +13:00
edbfb2f84f
Modified timings for load screen.
2017-09-27 14:16:27 +13:00
c01111038f
Merge branch 'develop' into loading_screens
...
# Conflicts:
# src/main/resources/views/RaceView.fxml
2017-09-27 14:05:46 +13:00
daf3867433
Server discovery bug fixes & error handling improvements
...
- Fixed concurrency bug that prevented players from connecting to servers
- Discovery server can restart itself if it crashes
- Added nicer error handling for server discovery.
- Using AWS to get servers external IP address.
Tags: #story[1281]
2017-09-27 12:32:17 +13:00
c54a1e141d
Merge remote-tracking branch 'origin/develop' into 1293_PowerUps
...
# Conflicts:
# src/main/resources/views/RaceView.fxml
2017-09-27 01:49:18 +13:00
d56468e4aa
- Fixed snackbar not showing on race view
...
- Added close label on server creation dialog
#story[1273]
2017-09-27 00:38:42 +13:00
ab5ad58237
Merge branch 'develop' into story1275_host_customization
...
# Conflicts:
# src/main/java/seng302/visualiser/GameView3D.java
2017-09-26 23:37:59 +13:00
df7264cc1f
Added per map max player count. Handles case when map cannot fit players behind start mark. Added initial implementation for spacing out yachts.
...
#implement.
2017-09-26 23:34:19 +13:00
5248921576
Multiple fixes:
...
- fix last button no longer default focused when loading keybinding dialog
- fix click and mouse exit still focused on button
- closing keybinding does not focus on chat anymore
#story[1273]
2017-09-26 22:52:58 +13:00
330ccd272d
The random token now has a 50% chance of causing your boat to have a speed penalty
...
#story[1293]
2017-09-26 21:13:35 +13:00
4b7dfe38c4
Fixed Boats powering up and down correctly. Icons respond correctly
...
#story[1293]
2017-09-26 19:43:32 +13:00
ab07c7f298
Merge remote-tracking branch 'origin/develop' into 1293_PowerUps
...
# Conflicts:
# src/main/java/seng302/visualiser/GameView3D.java
2017-09-26 19:01:53 +13:00
98abe64f00
Added splash and loading screen
2017-09-26 17:07:02 +13:00
132a729758
Temporarily added more options in key binding dialog. But still need to implement binding after camera story has been merged into develop
...
tags: #story[1273]
2017-09-26 15:49:16 +13:00
1bd4db73cd
Issue 66: client side error pop ups use default javaFx style
...
- created JFeonix style pop up to replace the default one
tags: #story[1273]
2017-09-26 14:44:37 +13:00
735699dc85
Changed default number of legs.
2017-09-26 01:53:33 +13:00
06e5f4ae00
Merge remote-tracking branch 'origin/1273_Skybox' into 1273_Skybox
2017-09-26 01:35:07 +13:00
cd2b4cb93c
fixed anchor pane issues
2017-09-26 01:34:59 +13:00
d9c832168b
Merge branch 'story1275_host_customization' into 1273_Skybox
...
# Conflicts:
# src/main/java/seng302/visualiser/GameView3D.java
# src/main/java/seng302/visualiser/controllers/LobbyController.java
# src/main/java/seng302/visualiser/controllers/ViewManager.java
# src/main/resources/views/LobbyView.fxml
# src/main/resources/views/RaceView.fxml
2017-09-26 01:19:47 +13:00
9cfb3b9e5d
Added functionality to automatically select a server
...
- Added functionality on the DiscoveryServer to return a random server to the player
- Added elements to the UI to support auto-selecting a server
- Added client side code to request a random server
Tags: #story[1281]
2017-09-26 01:14:02 +13:00
51747e2d13
Refactored the 2D and 3D game view class setups. Made scaling more logical.
...
#refactor #story[1275]
2017-09-26 00:55:28 +13:00
b3981b19e0
Merge branch 'develop' into story1275_host_customization
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/ServerToClientThread.java
# src/main/java/seng302/model/ServerYacht.java
# src/main/java/seng302/visualiser/ClientToServerThread.java
# src/main/java/seng302/visualiser/controllers/LobbyController.java
# src/test/java/seng302/models/YachtTest.java
2017-09-25 23:25:33 +13:00
3d7a64068f
Fixed scaling issues.
...
#fix
2017-09-25 23:19:03 +13:00
c12f7408ad
experimenting with map scaling
...
#implement
2017-09-25 22:57:45 +13:00
7027de80c4
Fixed issues with correct protocol implementation.
...
#issue[64] #fix #testmanual
2017-09-25 22:09:26 +13:00
35b50d1436
Refactored 2d game view distance calculations to better size and sale the map,
...
#implement #refactor #story[1275]
2017-09-25 21:06:18 +13:00
9ca39d1a7c
Merge branch '1273_Changing_Cameras' into 1273_Skybox
2017-09-25 18:40:15 +13:00
30dad8509e
Added skybox & cleaned up server list UI
...
- Moved direct connect fields to a dialog as there was not enough room
- Moved room code to its own label
- Added a skybox texture to the game view
- Added the land mesh to the game view
2017-09-25 18:25:24 +13:00
dba5a5680f
Merge remote-tracking branch 'origin/develop' into 1293_PowerUps
...
# Conflicts:
# src/main/java/seng302/model/ServerYacht.java
# src/main/resources/views/RaceView.fxml
2017-09-25 17:20:25 +13:00
0e93be7b36
Fixed send button traversable issue.
...
- removed sensitive characters.
#story[1278] #pair[hyi25, zyt10]
2017-09-25 17:06:36 +13:00
191b818e38
Added close button for keyBindingDialog.
...
- fixed that you cannot bind the key you are using.
#story[1278] #pair[hyi25, zyt10]
2017-09-25 16:31:28 +13:00
8a0ad8d6a9
Merge remote-tracking branch 'origin/develop' into 1293_PowerUps
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/model/ServerYacht.java
2017-09-25 11:19:10 +13:00
William Muir
Haoming Yin
Calum
Michael Rausch
Kusal Ekanayake
Zhi You Tan
Zhi You Tan