9b00f76907
removed print statements and added documentation.
...
tags : #story[1273]
2017-09-26 18:36:13 +13:00
f11c457d28
removed print statements
...
tags : #story[1273]
2017-09-26 18:31:47 +13:00
9e4fa30787
Merge branch 'issue68_boat_not_turning_on_starbord_vmg' into 'develop'
...
the boat can now turn after snapping to starboard vmg #story[1273]
See merge request !75
2017-09-26 18:11:24 +13:00
99ce4fa11d
Merged develop in and reimplemented keybindings for moving the camera.
...
tags : #story[1273]
2017-09-26 18:01:39 +13:00
69d1fa9488
Merge branch 'develop' into 1273_Changing_Cameras
2017-09-26 17:36:40 +13:00
66e6a8a2a4
- Small Changes
...
tags : #story[1273]
2017-09-26 17:35:36 +13:00
671efcaf08
Adding spinners to the loading screen.
2017-09-26 17:25:57 +13:00
8ba44d7476
Minor commit for testing
...
#story[1293]
2017-09-26 17:19:45 +13:00
dd43097677
the boat can now turn after snapping to starboard vmg #story[1273]
2017-09-26 17:07:55 +13:00
98abe64f00
Added splash and loading screen
2017-09-26 17:07:02 +13:00
1a53579317
- Isometric Camera
...
- Zoom Bounds added.
- Camera Panning Bounds added. Need to be tested with extra maps.
tags : #story[1273]
2017-09-26 16:57:07 +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
870d7a6e82
added a check in the start logic to make sure a boat can't cross the start line prematurely (they will have to go back and go through it again) #fix #refactor
2017-09-26 15:25:24 +13:00
2e7487fdfc
- Chase Camera:
...
- Has panning bounds, zoom bounds, and general tidy up.
- Now correctly observes the boat object rather than getting information from both the boat object AND the client yacht model.
Top Down Camera:
- Can only pan within certain bounds now, and will continue to follow the boat regardless.
- Can only zoom within certain bounds now.
Isometric Camera:
- Nothing changed.
#tags [1273]
2017-09-26 15:06:21 +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
7a4cdbe0c9
Fixed WindWalker
...
#story[1293]
2017-09-26 11:12:29 +13:00
735699dc85
Changed default number of legs.
2017-09-26 01:53:33 +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
dde1c82dbb
merge with host customization and dev.
2017-09-26 01:21:55 +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
e990c68d40
#document
2017-09-26 01:12:43 +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
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
d0844e861d
Changed water color to blue
2017-09-25 19:25:03 +13:00
5d32d76d9d
Added local skybox texture, and changed water color
...
- Changed water color to a more sea-like blue
- Added an extra sun
- Moved skybox texture to the resources folder
2017-09-25 19:19:46 +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
0211f2df38
Merged dev back on
...
#story[1293]
2017-09-25 17:38:09 +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
5c50e77efa
Merge branch 'Story1278_keybindings' into 'develop'
...
Story1278 keybindings
# Changes
- Added customised action key binding for all boat actions
- Users can select the turning mode (continuously turning mode, and the default turning mode)
- Refined UI design for key bindings
- Added animation which mouse enters/exits the setting button, and also prompt text to guide users to press key
- Popup window to inform users if their key assignment is successful or not
# Testing
## Manual testing log as below (all passed according to the assigner)
- if a player toggles the turning mode toggle button, the labels for upwind and downwind will be changed correspondingly
- if a player clicks the "reset" button, all the key binding settings will be reset to default
- if a player assigns a key which is already is in use, a popup box will inform the assignment is failed, and action will be changed back
- if a player assigns a key successfully, a popup will inform the success, and the new key binding will appear on the button
- A player can change their key bindings before the race starts and during the race
See merge request !73
2017-09-25 17:11:12 +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
00b09997b0
- Added Camera panning to chase camera mode.
...
tags : #story[1273]
2017-09-25 16:28:37 +13:00
d250c635d8
- Adjusted server tick rate to test smoothing
...
tags : #story[1273]
2017-09-25 15:32:13 +13:00
376c4d25a8
Merge branch 'develop' into 1273_Changing_Cameras
...
# Conflicts:
# src/main/java/seng302/model/ClientYacht.java
2017-09-25 14:40:19 +13:00
e66abb4340
- An attempt at chase cam smoothing. needs work.
...
tags : #story[1273]
2017-09-25 14:39:09 +13:00
a19e191684
- Chase cam kind of working, need to find a fix for the abrupt direction change.
...
tags : #story[1273]
2017-09-25 14:03:47 +13:00
29b97a194d
Merged dev back on
...
#story[1293]
2017-09-25 11:26:44 +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
19db6668da
Fixed merge conflicts in server yacht
...
tags #story[1278]
2017-09-25 11:09:14 +13:00
44275aec04
Merge branch 'develop' into Story1278_keybindings
...
# Conflicts:
# src/main/java/seng302/model/ServerYacht.java
2017-09-25 11:06:28 +13:00
Alistair McIntyre
Michael Rausch
Kusal Ekanayake
William Muir
Peter Galloway
Haoming Yin
alistairjmcintyre
Calum
Zhi You Tan