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
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
2a523a5664
Added a duck boat mesh.
...
#implement #story[1274]
2017-09-27 17:03:02 +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
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
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
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
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
44275aec04
Merge branch 'develop' into Story1278_keybindings
...
# Conflicts:
# src/main/java/seng302/model/ServerYacht.java
2017-09-25 11:06:28 +13:00
1042817e4e
Snackbar's color can be changed according to the message type
...
- load a separate css file to change the color
- if the assignment failed, the snackbar prompt will be red, otherwise theme color
#story[1278]
2017-09-23 20:59:29 +12: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
307e79ecfc
Completed working boat selection screen.
...
When a user selects a different boat, it is sent to all other clients and updates accordingly. Boats are all shown with their correct models in game.
#story[1274]
2017-09-20 20:46:23 +12:00
7d8a6afa5f
Merge branch 'new_meshes' into Custom_boat_selection
2017-09-20 19:40:43 +12:00
7197bc2bee
created meshes for pirate ship #story[1274]
2017-09-20 17:33:32 +12:00
66d9a06f9e
Adding icon files to git
...
#story[1245]
2017-09-20 17:19:14 +12:00
c5d56065b6
Fixed cat ate a meringue sail rotation.
...
#fix #story[1274]
2017-09-20 16:42:26 +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
fe76e85c71
Merge branch 'develop' into new_meshes
2017-09-20 15:59:01 +12:00
9d61a43bd7
Added catamaran mesh to possible boat meshes. Made catamaran the default boat.
...
#implement #story[1274]
2017-09-20 15:58:22 +12:00
c39582de5c
Updated PartyParrot logo
2017-09-20 15:41:20 +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
9ed52a1225
created catamaran mesh #story[1274]
2017-09-19 19:43:03 +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
alistairjmcintyre
Alistair McIntyre
Calum
Kusal Ekanayake
William Muir
Zhi You Tan
Haoming Yin
Zhi You Tan
Peter Galloway