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
607acff7c6
Merge branch 'Custom_boat_selection' into 'develop'
...
Custom boat selection
# Story 1274 Feature Custom Boat Selection
## Changes
- 2 new boats!
- A boat selector in the customisation for boat dialog
- The potential for everyone to use whatever boats and for everyone to see
## Testing
- Basic JUnit tests added to test basic util methods added to the BoatMeshType class
- Manual testing completed
See merge request !71
2017-09-22 21:14:12 +12:00
22fdf1e4ac
Changed the boatType attribute from all around the place from String lit to enum
...
#story[1274]
2017-09-22 21:00:28 +12:00
da8c91f5c1
Review fixes for merge request.
...
PlayerCell now takes in the yacht for construction rather than taking in a whole lot of values extracted from the yacht
Reduced boiler plate in BoatCustomizeController
#story[1274]
2017-09-22 20:44:06 +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
c4a6113f6c
Minor bug fixes (like all enemy sails being toggled in when they should be out)
...
#story[1274]
2017-09-20 21:07:49 +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
ea0be5e952
Added pirate ship meshes to application. Updated boat model to allow for jib sails and a fixed sail. #story[1274]
2017-09-20 17:56:07 +12:00
7197bc2bee
created meshes for pirate ship #story[1274]
2017-09-20 17:33:32 +12:00
fba522d0c3
Fixed BoatMeshType enum names.
...
#fix
2017-09-20 16:44:38 +12:00
0e829874c2
Fixed BoatMeshType enum names.
...
#fix
2017-09-20 16:43:04 +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
d4d7ddf8e2
Keybinding now works in the actual race. A map of keybind is shared between GameClient and KeyBindDialogController.
...
#story[1278]
2017-09-20 11:02:13 +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
8084a61333
Fix keybinding dialog creating on top of another keybinding dialog.
...
#story[1278]
2017-09-19 23:41:06 +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
da263355f4
Changed raceview background.
...
#fix
2017-09-19 14:55:26 +12:00
ebecd25ed2
Merge remote-tracking branch 'origin/develop' into develop
2017-09-19 14:54:15 +12:00
0f5137c2b6
Fixed the orientation of .stl files.
...
#fix
2017-09-19 14:52:02 +12:00
73799954e4
Fixed tests that failed when running on lower end computers. Needed to add a couple of thread.sleeps
2017-09-15 12:47:40 +12:00
edfeb2b287
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
2017-09-14 15:40:26 +12:00
0355784000
Broadcast messages when boats pass legs or a token is picked up or expired.
...
tags: #story[1250] #pair[hyi25, zyt10]
2017-09-14 15:40:12 +12:00
02df69b7b4
- Merged Dev into branch
...
Tags: #story[1245]
2017-09-14 15:27:10 +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
3a671d4ed0
- Added Values to Finish Dialog.
...
Tags: #story[1245]
2017-09-14 15:24:58 +12:00
482d987839
- Fixed Null Pointer
...
- Build Should pass
Tags: #story[1245]
2017-09-14 15:10:48 +12:00
cc124b2d19
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
2017-09-14 14:50:49 +12:00
b3320ad805
Fixed server message sender
...
tags: #story[1246]
2017-09-14 14:49:25 +12:00
33779ad5c1
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
...
# Conflicts:
# src/main/resources/views/RaceView.fxml
2017-09-14 14:42:57 +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
eb188495ce
Fixed position issues on exit arrows.
...
#implement #story[1266] #fix
2017-09-14 14:32:45 +12:00
62a7e2b8fa
Fixed position issues on entry arrows.
...
#implement #story[1266] #fix
2017-09-14 14:21:04 +12:00
acd0e790fe
Added method to send server debug messages to players
...
Tags: #story[1246]
2017-09-14 14:14:21 +12:00
46013474c0
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
2017-09-14 13:37:01 +12:00
bf427f24d3
- Created a Race Finish Dialog.
...
tags : #story[1245]
2017-09-14 13:34:48 +12:00
7d0a47446d
- Fixed bug in customize dialog.
...
tags : #story[1245]
2017-09-14 13:02:31 +12:00
889098bb50
- Commented out broken test (non-deterministic thing)
...
- Merged 3d factory branch in
tags : #story[1245]
2017-09-14 12:46:17 +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
391bd33548
Fixed position issues on first 2 mark arrows.
...
#implement #story[1266]
2017-09-14 12:38:36 +12:00
7e0c2abbfd
- Fixed a shutdown bug that left the game process running long after the window shut
...
- Changed SVG Icon for volume toggle to something a bit nicer
tags : #story[1245]
2017-09-14 12:31:49 +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
Zhi You Tan
William Muir
Haoming Yin
Kusal Ekanayake
Peter Galloway
Calum
Zhi You Tan
Alistair McIntyre
Michael Rausch