c01111038f
Merge branch 'develop' into loading_screens
...
# Conflicts:
# src/main/resources/views/RaceView.fxml
2017-09-27 14:05:46 +13:00
6f62efcc93
Updated the icons to be more uniform and transparent
...
#story[1293]
2017-09-27 12:44:22 +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
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
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
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
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
44275aec04
Merge branch 'develop' into Story1278_keybindings
...
# Conflicts:
# src/main/java/seng302/model/ServerYacht.java
2017-09-25 11:06:28 +13:00
066557584f
Implemented turning mode toggle
...
- when the mode is toggled, a boat action package will be sent to notify server
to change the boat's turning mode
- turning mode toggle is now fully functional
#story[1245]
2017-09-23 19:37:13 +12:00
4011295b8b
Slightly optimised code style and add more functionality
...
- optimised UI
- check conflicts when change key bind if the key has already been in use
- abstract keybind as a separate singleton class so all class can access it
- [WIP] turning mode is need to be finished
#story[1245]
2017-09-23 17:52:48 +12:00
957821f1f2
[WIP] Created a snackbar for notification. Currently used for keybinding success/fail. Need to show red if fails.
...
#story[1278]
2017-09-23 01:39:26 +12:00
094eb4c1cf
Merge remote-tracking branch 'origin/develop' into Story1278_keybindings
...
# Conflicts:
# src/main/resources/views/RaceView.fxml
2017-09-22 21:22:06 +12:00
a3c555d5fe
Merge remote-tracking branch 'origin/develop' into 1293_PowerUps
...
# Conflicts:
# src/main/java/seng302/model/ClientYacht.java
2017-09-22 21:18:58 +12:00
b05580f018
Worked on making a visual component to the stats. Need to implement acceleration.
...
#story[1274]
2017-09-22 16:45:10 +12:00
c20c6fb264
[WIP] Added new toggle for steer turning mode and submit and reset button (restore the setting to default)
...
- minor fix of UI elements to make the font smaller
- centred labels and buttons
tags: #story[1246]
2017-09-22 13:53:36 +12:00
410d765745
Started working on the boat selection screen.
...
Customised the boat customisation UI to contain it. Need to have another boat to test whether we can switch boats and also if the messages get sent correctly.
#story[1274]
2017-09-20 16:36:27 +12:00
a1933c2869
- Created keybindingcontroller which can detect keypress and can save the keybind throughout the app
...
- Changed keybindingglyph to keyboard icon
- Fix button hover CSS to change text fill
#story[1278]
2017-09-20 02:42:02 +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
03f5f91043
Done some CSS on keybindingdialog
...
#story[1278]
2017-09-19 19:49:36 +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
78596ea111
Initial commit for Power Up story
...
Made new preliminary models for each power up. Currently just different colour balls
Added new YachtEventTypes in the enum for each pick up to be sent out to clients
Tokens now not only randomise location but also randomise which type of token will be sent out
Added new methods to the MessageFactory class - Make collision and Make pickup Message
Game Client now checks what type of Yacht Event code has come in to respond appropriately rather than just generic collision / token.. although this has not been implemented yet
Game View loads appropriate token models depending on what is in XML
#story[1245]
2017-09-19 17:47:05 +12:00
da263355f4
Changed raceview background.
...
#fix
2017-09-19 14:55:26 +12:00
3a671d4ed0
- Added Values to Finish Dialog.
...
Tags: #story[1245]
2017-09-14 15:24:58 +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
7d0a47446d
- Fixed bug in customize dialog.
...
tags : #story[1245]
2017-09-14 13:02:31 +12:00
7ee6a09626
Fixed that wind speed did not updated frequently and UI polishing.
...
- added shadow for raceview boxes
- split up message history and input text block
- changed timer font
#story[1245]
2017-09-13 21:11:40 +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
167545cbef
- Deleted old controllers that didn't do anything anymore.
...
tags : #story[1245]
2017-09-12 17:45:39 +12:00
3455321f01
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
2017-09-12 16:54:55 +12:00
7e9e96c091
- Added documentation to controllers
...
tags : #story[1245]
2017-09-12 16:54:40 +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
99f38fa05f
[WIP] Added wind image to the bottom left of the race view.
...
tags: #story[1245]
2017-09-12 15:52:22 +12:00
bc9f0ea924
Injected a simple toggle into the decorator for the window for the sound.
...
Unsure if this is the best way to do it but not a bad thing to try for now.
tags : #story[1245] #story[1249]
2017-09-12 13:53:24 +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
235d6c9cef
Added 3D element to lobby screen to show the player their boat before the race.
...
tags: #story[1245]
2017-09-12 03:57:29 +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
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
0d7201e235
Race view is default to be full screen now and minor bug fixes.
...
- race view is force to be full screen and run in a new stage
- fixed button animations in lobby view
- polished UI element is boat customization dialog
#story[1245]
2017-09-11 23:04:41 +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
1ce8df976c
changed name: contentanchorpane to contentgridpane
...
#story[1248]
2017-09-11 16:08:24 +12:00
Kusal Ekanayake
William Muir
Zhi You Tan
Haoming Yin
Zhi You Tan
Calum
Alistair McIntyre
alistairjmcintyre
Michael Rausch
Haoming Yin