 Calum
|
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 |
|
 William Muir
|
a59d06fbbf
|
Finish screen
|
2017-08-16 23:36:45 +12:00 |
|
|
Calum
|
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 |
|
 Kusal Ekanayake
|
958c1e216f
|
Fixed sail toggling issues and test.
|
2017-08-16 14:30:37 +12:00 |
|
|
Calum
|
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 |
|
|
Calum
|
720ce0ae5b
|
Merged with develop. Moved all collision logic into game state.
#refactor
|
2017-08-16 01:04:16 +12:00 |
|
 Peter Galloway
|
50baf6f85b
|
implemented race finish functionality, finish screen not loading properly yet #story[1124]
|
2017-08-15 20:48:51 +12:00 |
|
 Haoming Yin
|
c125708a4a
|
Final commit for yacht refactor
tags: #story[1124] #pair[hyi25, wmu16]
|
2017-08-15 14:49:16 +12:00 |
|