b9a2d60115
Merged dev changes back on to mini map
...
#story[1273]
2017-09-28 12:58:19 +13:00
275a2cbab7
Made continous turning the default. Added triangles to minimap. Made mark areas bigger
...
#fix #implement
2017-09-28 10:12:18 +13:00
9075d2a909
Added a minimap to the race view.
...
#implement #story[1273]
2017-09-28 03:17:33 +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
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
67f3124cfb
Merge branch 'develop' into 1273_Skybox
2017-09-27 15:32:54 +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
c01111038f
Merge branch 'develop' into loading_screens
...
# Conflicts:
# src/main/resources/views/RaceView.fxml
2017-09-27 14:05:46 +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
98abe64f00
Added splash and loading screen
2017-09-26 17:07:02 +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
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
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
8c7f9a878d
Created Boat bumper logic. Refactored logic for powering up / dpwn
...
YachtEventType: Added some new events, a generic power down event and a bumper_crash event for an affected boat
GameState: Implemented boat bumper logic
MessageFactory: Made new messages for powerdown and status effect
ClientYacht: Had to create another powerDown functional interface to inform the race view controller when to turn off the icon
RaceViewController/GameClient: Now waits for a message about powering down before turning off rather than waiting time client side
#story[1293]
2017-09-23 13:23:16 +12:00
034e4c252a
Icons now display, blink when they are about to run off, and turn off after their time out
...
TokenType Enum now also has a timeout construction field
#story[1245]
2017-09-20 13:09:09 +12:00
52d3cea592
Added preliminary icons for pickups
...
RaceView now has a grid pane to contain some icons to display power ups. These are just preliminary
ClientYacht now has a power up field that is set from recieveing messages in the Game Client, as well as observed by the RaceViewController to display the relevant icon when the powerup field is changed
#story[1245]
2017-09-19 23:04:17 +12:00
027324cc4f
- Fixed JFXDialog initialised in lobby, raceview, serverlist controller by default. Now, dialog only appears when called.
...
- [WIP] Created keybindingdialog fxml. CSS not yet done.
- Removed top most anchorpane on raceview so parent is stackpane like other views.
#story[1278]
2017-09-19 18:40:01 +12:00
242132b800
Merge remote-tracking branch 'origin/develop' into NewUI_merge
...
# Conflicts:
# src/main/resources/views/RaceView.fxml
2017-09-14 15:26:57 +12:00
482d987839
- Fixed Null Pointer
...
- Build Should pass
Tags: #story[1245]
2017-09-14 15:10:48 +12:00
3a41c27d8d
- Race Finish Dialog showing up, unsure if its actually showing the correct ordering or not.
...
tags : #story[1245]
2017-09-14 14:42:25 +12:00
e24203904b
Removed print statements.
...
#chore
2017-09-14 14:37:22 +12:00
62a7e2b8fa
Fixed position issues on entry arrows.
...
#implement #story[1266] #fix
2017-09-14 14:21:04 +12:00
6223a8fc0b
Merge remote-tracking branch 'origin/story1266_3d_model_factory' into NewUI_merge
...
# Conflicts:
# src/main/java/seng302/visualiser/GameView3D.java
2017-09-14 12:40:20 +12:00
42a5e86bf8
Merge remote-tracking branch 'origin/NewUI_merge' into story1266_3d_model_factory
...
# Conflicts:
# src/main/java/seng302/visualiser/GameView3D.java
2017-09-14 12:06:19 +12:00
0a62c538ca
Added 3D mark arrows and cleaned up other classes.
2017-09-14 11:28:50 +12:00
d9247eb031
Added player position, boat speed, boat heading to race view.
...
#story[1245]
2017-09-13 11:21:33 +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
c8dc448a52
Added tests for sounds and modified the transparency for the chat history window.
...
#story[1245]
2017-09-12 18:11:32 +12:00
20b656b16d
- Fixed a bug in new customize dialog.
...
- Chat should work correctly when pressing enter now.
tags : #story[1245]
2017-09-12 17:26:52 +12:00
d5ce61a0ff
Merge branch 'NewUI_merge' into story1266_3d_model_factory
...
# Conflicts:
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
2017-09-12 17:09:47 +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
6a4547f3f9
Minor fix so no lag when token is picked up
...
upon receiving a new RaceXML when one has been recieved we no longer update the course. Just update tokens
#story[1245]
2017-09-12 16:37:29 +12:00
71f626f57e
fixed sail rotation broken from port to 3d #story[1266]
2017-09-12 16:30:20 +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
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
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
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
6b4f7eb42b
Merge develop into NewUI, and 3D
...
tags: #story[1245]
2017-09-11 18:56:26 +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
dff261cf41
Added 3D assets for a trail and generated them at regular intervals.
...
#story[1266] #implement
2017-09-11 17:16:13 +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
1fec620427
Merged 3d branch into new UI
...
Tags: #story[1245]
2017-09-11 15:50:22 +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
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
f136a970db
Added placeholder assets for velocity pickups.
2017-09-11 03:11:42 +12:00
William Muir
Calum
Haoming Yin
Michael Rausch
Kusal Ekanayake
Zhi You Tan
Alistair McIntyre
Zhi You Tan
Peter Galloway
hyi25
Haoming Yin