73861b2ef3
Merge branch 'develop' into 1276_Next_Mark_Indicator
2017-09-28 02:06:18 +13:00
4018dd783e
- Fixed Merge Errors and some broken lighting
...
#tags [1276]
2017-09-28 02:05:47 +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
00ddf117b2
Merge remote-tracking branch 'origin/develop' into develop
...
# Conflicts:
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
# src/main/resources/images/wind-180.png
2017-09-28 00:26:09 +13:00
a266779709
Added new Wind Waker mesh
...
#implement #story[1293]
2017-09-28 00:24:34 +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
a1a34b9bd7
Merge branch 'develop' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into develop
2017-09-27 23:36:14 +13:00
42d490d6fd
Added new Wind Waker mesh
...
#implement #story[1293]
2017-09-27 23:35:51 +13:00
cd4a2f8da3
Merge remote-tracking branch 'origin/develop' into develop
2017-09-27 22:47:08 +13:00
287cfd77d0
Fix: smoothing wind rotation
...
- added animation for wind rotation
- enlarged wind image's background to centre the compass
#story[1273]
2017-09-27 22:45:56 +13:00
810dde6a21
Merge branch 'develop' into 1276_Next_Mark_Indicator
...
# Conflicts:
# src/main/java/seng302/visualiser/GameView3D.java
# src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelType.java
2017-09-27 22:15:02 +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
c5e6302f86
- Added circle to boat to indicate which boat is the players and to show where the arrow is pointing.
...
#tags [1276]
2017-09-27 21:31:02 +13:00
cd199767ae
created new models for all pickups #story[1293]
2017-09-27 20:40:40 +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
be72062c8e
Merge branch 'develop' into 1276_Next_Mark_Indicator
...
# Conflicts:
# src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelFactory.java
2017-09-27 19:25:08 +13:00
0d212a4a1d
- Indicator works correctly, sits in the right place, rotates around the boat correctly and sits on top of the water now.
...
tags : #story[1276]
2017-09-27 19:20:33 +13:00
aded794a67
- Added new indicator for direction to next mark.
...
- Marker rotates towards a given heading.
tags : #story[1276]
2017-09-27 17:17:50 +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
2a523a5664
Added a duck boat mesh.
...
#implement #story[1274]
2017-09-27 17:03:02 +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
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
fd53fd52a4
Forgot to git add the new icon.. again.. sorree
...
#story[1293]
2017-09-27 12:44:50 +13:00
6f62efcc93
Updated the icons to be more uniform and transparent
...
#story[1293]
2017-09-27 12:44:22 +13:00
658a342118
Added the bad random to git sorree forgot to git add
...
#story[1293]
2017-09-27 03:01:23 +13:00
e9881bb24a
Added per map max player count. Handles case when map cannot fit players behind start mark. Added initial implementation for spacing out yachts.
...
#implement #story[1275]
2017-09-27 02:04:24 +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
671efcaf08
Adding spinners to the loading screen.
2017-09-26 17:25:57 +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
81e791bd1a
Fixed issues with showing race view controller. Added missing icons. Added a smooth version of land.
...
#fix
2017-09-26 01:49:43 +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
83871a0336
Fixed boat trials rendering abnormally
...
#issue[65] #fix
2017-09-26 01:07:02 +13:00
6cba024d64
Made changes to the shape of boat trials.
2017-09-26 00:59:04 +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
alistairjmcintyre
Michael Rausch
Calum
Haoming Yin
William Muir
Peter Galloway
Alistair McIntyre
Kusal Ekanayake
Zhi You Tan