b3981b19e0
Merge branch 'develop' into story1275_host_customization
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/ServerToClientThread.java
# src/main/java/seng302/model/ServerYacht.java
# src/main/java/seng302/visualiser/ClientToServerThread.java
# src/main/java/seng302/visualiser/controllers/LobbyController.java
# src/test/java/seng302/models/YachtTest.java
2017-09-25 23:25:33 +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
44275aec04
Merge branch 'develop' into Story1278_keybindings
...
# Conflicts:
# src/main/java/seng302/model/ServerYacht.java
2017-09-25 11:06:28 +13:00
9b00ba654a
Added a race importer. Added imported races to visualizer. Made it so that the host sets the race. Refactored server to no longer be dependant on a specific race. Tested functionality of map manually. Some bugs found and listed below.
...
#implement #testmanual #story[1275]
Known bugs:
* Can't move
* Map is off center in lobby view.
* 3D Map is off center
2017-09-23 22:45:53 +12: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
0a885dd8fd
Clean up changes
...
#story[1274]
2017-09-23 15:37:16 +12:00
364264377a
Fixed merge errors and reimplemented handling multiplier
...
#story[1274]
2017-09-23 15:04:11 +12:00
9112183ac3
Merge branch 'develop' into Story1274_custom_boat_stats
...
# Conflicts:
# src/main/java/seng302/model/ServerYacht.java
# src/main/java/seng302/visualiser/controllers/dialogs/BoatCustomizeController.java
2017-09-23 14:48:50 +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
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
52dc7a956d
Turned handling into a multiplier.
...
#story[1274]
2017-09-22 17:42:32 +12:00
9f64b2380d
Implemented acceleration and full loading bars.
...
#story[1274]
2017-09-22 17:28:42 +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
6ca75b2cac
Changed default race
2017-09-21 15:08:39 +12:00
40a7f9bc5b
New server creation view created. Added templates for custom races. Updated xml generator to remove all hard coded values. Updated XMLParser to parse custom race files. No unit tests exists currently.
...
#implement #story[1275]
2017-09-21 12:59:37 +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
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
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
02df69b7b4
- Merged Dev into branch
...
Tags: #story[1245]
2017-09-14 15:27:10 +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
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
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
e375efb8e9
- Added documentation to controllers
...
- Moved Customization Dialog logic into LobbyController
tags : #story[1245]
2017-09-12 17:19:18 +12:00
7e9e96c091
- Added documentation to controllers
...
tags : #story[1245]
2017-09-12 16:54:40 +12:00
9dad88e56a
Fixed bug where server creation dialog validation was not working
...
#story[1245]
2017-09-12 16:45:52 +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
3d0209300e
- Validation completely done
...
- Some documentation added.
tags : #story[1245]
2017-09-11 19:36:16 +12:00
1fec620427
Merged 3d branch into new UI
...
Tags: #story[1245]
2017-09-11 15:50:22 +12:00
40408cff27
-Validation on server list screen and server creation dialog done.
...
tags : #story[1245]
2017-09-11 15:08:34 +12:00
2b53e0d5b4
Validation fixed on server list screen.
...
Server List Screen done.
tags : #story[1245]
2017-09-11 13:51:29 +12:00
f077486e22
- Added methods for validating direct connection, Port Number Complete, Host Name not Complete.
...
- Added No Servers found Message
- Found a potential bug with windows machines not running the correct service to handle Bonjour Service Addresses.
tags: #story[1245]
2017-09-10 18:24:15 +12:00
1516e817b7
Fixed some UI bugs, and redesigned some UI elements.
...
- Changed class structure (added dialogs, cells folder)
- Changed font to Baloo as it has better font height
- Figured out a way to change the font color of max player slider thumb
- Added cursor effect when mouse hover on any button
- Fixed drop shadow bug for lobby view player cell
- Moved drop shadow effect from player cell controller to css
#story[1245]
2017-09-09 15:00:32 +12:00
Calum
Zhi You Tan
Haoming Yin
Kusal Ekanayake
Zhi You Tan
William Muir
Alistair McIntyre
Michael Rausch
alistairjmcintyre