8c7f9a878d
Created Boat bumper logic. Refactored logic for powering up / dpwn
...
YachtEventType: Added some new events, a generic power down event and a bumper_crash event for an affected boat
GameState: Implemented boat bumper logic
MessageFactory: Made new messages for powerdown and status effect
ClientYacht: Had to create another powerDown functional interface to inform the race view controller when to turn off the icon
RaceViewController/GameClient: Now waits for a message about powering down before turning off rather than waiting time client side
#story[1293]
2017-09-23 13:23:16 +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
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
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
fba522d0c3
Fixed BoatMeshType enum names.
...
#fix
2017-09-20 16:44:38 +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
9d61a43bd7
Added catamaran mesh to possible boat meshes. Made catamaran the default boat.
...
#implement #story[1274]
2017-09-20 15:58:22 +12:00
034e4c252a
Icons now display, blink when they are about to run off, and turn off after their time out
...
TokenType Enum now also has a timeout construction field
#story[1245]
2017-09-20 13:09:09 +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
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
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
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
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
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
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
20d73d8f2f
Removed dead code from fxObjects and GameView 3D
...
#chore
2017-09-14 12:05:20 +12:00
0a62c538ca
Added 3D mark arrows and cleaned up other classes.
2017-09-14 11:28:50 +12:00
d9247eb031
Added player position, boat speed, boat heading to race view.
...
#story[1245]
2017-09-13 11:21:33 +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
c8dc448a52
Added tests for sounds and modified the transparency for the chat history window.
...
#story[1245]
2017-09-12 18:11:32 +12:00
167545cbef
- Deleted old controllers that didn't do anything anymore.
...
tags : #story[1245]
2017-09-12 17:45:39 +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
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
634322de3f
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
2017-09-12 17:08:22 +12:00
6f534a430d
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
...
# Conflicts:
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
# src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelFactory.java
2017-09-12 17:04:37 +12:00
17b0864815
Moved transformation of boat icon view from controller class to model factory class.
...
#implement #story[1266] #refactor
2017-09-12 17:03:50 +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
9dad88e56a
Fixed bug where server creation dialog validation was not working
...
#story[1245]
2017-09-12 16:45:52 +12:00
6a4547f3f9
Minor fix so no lag when token is picked up
...
upon receiving a new RaceXML when one has been recieved we no longer update the course. Just update tokens
#story[1245]
2017-09-12 16:37:29 +12:00
71f626f57e
fixed sail rotation broken from port to 3d #story[1266]
2017-09-12 16:30:20 +12:00
bb3ee424cc
Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge
2017-09-12 15:52:34 +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
da3613fe36
Split off marker classes.
2017-09-12 14:48:30 +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
William Muir
Kusal Ekanayake
Peter Galloway
Calum
Alistair McIntyre
Michael Rausch
Zhi You Tan
Zhi You Tan
Haoming Yin