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
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
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
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
3a671d4ed0
- Added Values to Finish Dialog.
...
Tags: #story[1245]
2017-09-14 15:24:58 +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
46013474c0
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
2017-09-14 13:37:01 +12:00
7d0a47446d
- Fixed bug in customize dialog.
...
tags : #story[1245]
2017-09-14 13:02:31 +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
0a62c538ca
Added 3D mark arrows and cleaned up other classes.
2017-09-14 11:28:50 +12:00
24a04aa530
Fix the wind direction arrow rotation.
...
#story[1245]
2017-09-14 01:05:52 +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
47798b19fe
Added player position, boat speed, boat heading to race view.
...
#story[1245]
2017-09-13 11:22:05 +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
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
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
2f973deacc
Merge branch 'NewUI_merge' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into NewUI_merge
2017-09-12 15:56:31 +12:00
f4c5e483ce
Merge remote-tracking branch 'origin/3D_view_working_with_maven' into NewUI_merge
2017-09-12 15:56:17 +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
8dc3e54186
Merge remote-tracking branch 'origin/story1266_3d_model_factory' into story1266_3d_model_factory
2017-09-12 14:11:11 +12:00
8fd35392b0
Added experimental assets for water.
...
#story[1266] #implement
2017-09-12 14:11:00 +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
d223d393fa
Merge branch 'story1266_3d_model_factory' into NewUI_merge
2017-09-11 23:45:31 +12:00
aa098569f3
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
2017-09-11 23:43:46 +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
Haoming Yin
Zhi You Tan
Kusal Ekanayake
Peter Galloway
Calum
Zhi You Tan
Alistair McIntyre
Michael Rausch
alistairjmcintyre