b05580f018
Worked on making a visual component to the stats. Need to implement acceleration.
...
#story[1274]
2017-09-22 16:45:10 +12:00
faeece27ff
Started working on individual boat stats. Already modified turning rate. Need to add a vsual component.
...
#story[1274]
2017-09-22 13:52:35 +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
76a1a3c7a0
Merge remote-tracking branch 'origin/story1266_3d_model_factory' into NewUI_merge
...
# Conflicts:
# pom.xml
# src/main/java/seng302/App.java
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/MainServerThread.java
# src/main/java/seng302/gameServer/ServerToClientThread.java
# src/main/java/seng302/utilities/XMLGenerator.java
# src/main/java/seng302/visualiser/GameClient.java
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
# src/main/resources/views/RaceView.fxml
# src/main/resources/views/StartScreenView.fxml
2017-09-11 15:29:33 +12:00
3f910b8db7
Fixed JavaDoc errors by adding missing parameters
2017-09-01 16:13:18 +12:00
4bd7291a4a
WIP: Yachts now power up upon collecting an item
...
Power up is speed boost x2 multiplier
Lasts 10 seconds
Do not stack
#story[1250]
2017-08-29 22:11:37 +12:00
ace48a8404
Refactored MainServer Class in prep for better sending out of XML messages
...
All messages are now created through MessageFactory class
Minor tweaks to improve code base server side
Removed observer from Server to Client threads
#story[1250]
2017-08-29 21:23:46 +12:00
39cfaf6780
Merge remote-tracking branch 'origin/develop' into Story80_BoatCustomization
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/ServerPacketParser.java
# src/main/java/seng302/gameServer/ServerToClientThread.java
# src/main/java/seng302/gameServer/messages/ChatterMessage.java
# src/main/java/seng302/gameServer/messages/MarkRoundingMessage.java
# src/main/java/seng302/model/ServerYacht.java
# src/main/java/seng302/visualiser/ClientToServerThread.java
# src/main/java/seng302/visualiser/GameClient.java
# src/main/java/seng302/visualiser/GameView.java
2017-08-17 13:31:27 +12:00
faf4600f51
Fixed some weird bug with the messages package, trying to add some small QoL changes with potential interaction bugs with the customization/lobby menu.
...
tags : #story[1142]
2017-08-17 13:13:07 +12:00
6e02d3e533
Added some general UI improvements such as autofilling the color field of the form, and looked at how best to deal with response packets, as it should be part of the spec.
...
tags: #story[1142]
2017-08-17 01:20:16 +12:00
87acce71ea
Merge branch 'develop' into story1118_map_arrows
...
# Conflicts:
# src/main/java/seng302/gameServer/MainServerThread.java
# src/main/java/seng302/model/RaceState.java
# src/main/java/seng302/visualiser/GameClient.java
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
2017-08-17 00:52:41 +12:00
9727e86249
Merge remote-tracking branch 'origin/story1118_map_arrows' into 1124_Fixing_Order_And_Finish_Screen
...
# Conflicts:
# src/main/java/seng302/gameServer/MainServerThread.java
# src/main/java/seng302/visualiser/GameClient.java
# src/main/java/seng302/visualiser/controllers/RaceViewController.java
# src/main/resources/server_config/xml_templates/race.ftlh
2017-08-16 22:40:32 +12:00
c103595bba
Merge branch 'develop' into story1118_map_arrows
...
# Conflicts:
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/MainServerThread.java
# src/main/java/seng302/model/RaceState.java
# src/main/java/seng302/visualiser/GameClient.java
2017-08-16 20:34:27 +12:00
02a7b804c1
Boat Names Change. Colors Change too. Updates clients during lobby when a change is made.
...
tags: #story[1142]
2017-08-16 19:31:27 +12:00
6d045e9976
Merge branch 'develop' into Story80_BoatCustomization
...
# Conflicts:
# src/main/java/seng302/visualiser/GameClient.java
# src/main/java/seng302/visualiser/controllers/LobbyController.java
2017-08-16 17:59:11 +12:00
4fc00f8a3c
Boat names now change, just the issue of the lobby not updating unless another person joins/leaves to try and fix.
...
tags: #story[1142]
2017-08-16 17:57:22 +12:00
7f3d66d01d
Checked if a boat has crossed the boundary/course limit, if so, bounce the boat back.
...
#story[1117] #pair[hyi25, zyt10]
2017-08-16 16:33:14 +12:00
bf016356a6
Finish screen now displays correctly on finishing.
...
GameState update now checks for finishing the race
Can now go back to main menu from finish screen
Labeled all threads for better debugging
Still need to implement race list ordering and finish screen ordering
2017-08-16 13:04:34 +12:00
ac47e9d88a
Game state now updates based on boat position. Arrows drawn as boat travels course. Currently do not point in correct direction, also the sparkline does not work.
...
#bug #refactor #implement #story[1118]
2017-08-16 03:51:48 +12:00
720ce0ae5b
Merged with develop. Moved all collision logic into game state.
...
#refactor
2017-08-16 01:04:16 +12:00
23a04facbe
ServerYachts now send now have their own boat status.
...
This allows clients to know when this boat has finished
tags: #story[1124]
2017-08-15 20:24:51 +12:00
c125708a4a
Final commit for yacht refactor
...
tags: #story[1124] #pair[hyi25, wmu16]
2017-08-15 14:49:16 +12:00
2dc0ba07d9
WIP: Second commit for seperating server and client yacht classes
...
tags: #story[1124]
2017-08-15 14:30:39 +12:00
Kusal Ekanayake
Michael Rausch
William Muir
Alistair McIntyre
alistairjmcintyre
Calum
Zhi You Tan
Haoming Yin