 Calum
|
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 |
|
|
Calum
|
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 |
|
 William Muir
|
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 |
|
 Alistair McIntyre
|
889098bb50
|
- Commented out broken test (non-deterministic thing)
- Merged 3d factory branch in
tags : #story[1245]
|
2017-09-14 12:46:17 +12:00 |
|
|
Calum
|
08f7127b69
|
Altered test to hopefully fix occasional indeterministic bug that occurred.
|
2017-09-09 13:13:45 +12:00 |
|
 Kusal Ekanayake
|
302bc91461
|
Tried to fix build by removing invalid '>' char.
#story[1246]
|
2017-09-05 18:17:20 +12:00 |
|
 alistairjmcintyre
|
d73e4f8ec5
|
Fixed a build error.
tags: #story[1142]
|
2017-08-17 01:23:34 +12:00 |
|
 Haoming Yin
|
2dc0ba07d9
|
WIP: Second commit for seperating server and client yacht classes
tags: #story[1124]
|
2017-08-15 14:30:39 +12:00 |
|
|
Calum
|
b7fe79a5cc
|
Attempted fix for build issues due to javaFX toolkit not being initialized.
|
2017-08-13 20:44:23 +12:00 |
|
|
Calum
|
2d5492601f
|
Fixed build issues caused by changes to a yacht step turn constant.
#bug
|
2017-08-13 20:40:18 +12:00 |
|
|
alistairjmcintyre
|
6ddaaa0dfa
|
Removed extra print statement from test.
|
2017-08-10 20:18:36 +12:00 |
|
|
Alistair McIntyre
|
32b231e78a
|
Added testing for the vmg autopilot
tags: #story[1107]
|
2017-08-10 19:19:41 +12:00 |
|
|
Alistair McIntyre
|
1c2870649a
|
Added testing for the tack/gybe settings.
tags: #story[1105]
|
2017-08-10 18:58:38 +12:00 |
|
|
William Muir
|
db078538ff
|
Minor cleaning in yacht class
tags: #story[1124]
|
2017-08-03 13:53:30 +12:00 |
|
|
Calum
|
f1ad03e913
|
Refactored the setup for MarkObjects (now renamed Markers) and made the CompoundMark + Mark + GeoPoint classes the standard across all classes instead of GateMark + SingleMark + Mark.
#refactor
|
2017-07-31 02:19:19 +12:00 |
|
|
Calum
|
7894e31926
|
Merge branch 'develop' into story61_player_perspective
# Conflicts:
# src/main/java/seng302/App.java
# src/main/java/seng302/client/ClientPacketParser.java
# src/main/java/seng302/client/ClientState.java
# src/main/java/seng302/client/ClientStateQueryingRunnable.java
# src/main/java/seng302/controllers/Controller.java
# src/main/java/seng302/controllers/LobbyController.java
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/controllers/StartScreenController.java
# src/main/java/seng302/fxObjects/BoatAnnotations.java
# src/main/java/seng302/gameServer/GameState.java
# src/main/java/seng302/gameServer/MainServerThread.java
# src/main/java/seng302/model/Yacht.java
# src/main/java/seng302/model/stream/StreamReceiver.java
# src/main/java/seng302/visualiser/ClientToServerThread.java
# src/main/java/seng302/visualiser/GameView.java
# src/main/java/seng302/visualiser/fxObjects/BoatObject.java
# src/test/java/seng302/model/stream/StreamReceiverTest.java
|
2017-07-30 18:07:28 +12:00 |
|
|
Alistair McIntyre
|
7b47d72ef0
|
Merge branch 'develop' of /home/cosc/student/ajm412/Documents/SENG302/team-13 with conflicts.
|
2017-07-26 16:22:01 +12:00 |
|
|
Calum
|
08e369f1ae
|
Merged with develop. Fixed many bugs in Visualiser.
#bugs
|
2017-07-26 02:49:31 +12:00 |
|
 Michael Rausch
|
c8a96dcce9
|
Fixed XML Loading error, used VMG to calculate boat velocity
- XML read from stream instead of file
- Started implementing VMG to calculate boat velocity dynamically
Tags: #pair[wmu16, mra106] #story[986]
|
2017-07-25 20:14:50 +12:00 |
|
|
Alistair McIntyre
|
da7a34fc55
|
Started adding functionality to calculate yacht velocity from the wind speed and direction using polar tables. Also began writing tests to cover this functionality, as it can't currently be tested within the game itself.
#story[986]
|
2017-07-20 14:30:13 +12:00 |
|