 Calum
|
65223ceaaf
|
shifted annotation layers. Merged with dev.
|
2017-05-25 16:29:27 +12:00 |
|
|
Calum
|
b73e4c89db
|
Merge remote-tracking branch 'origin/develop' into remove_observers
# Conflicts:
# src/main/java/seng302/controllers/CanvasController.java
# src/main/java/seng302/controllers/RaceViewController.java
# src/main/java/seng302/fxObjects/BoatGroup.java
# src/main/java/seng302/fxObjects/MarkGroup.java
# src/main/java/seng302/models/Yacht.java
|
2017-05-25 14:52:54 +12:00 |
|
|
Calum
|
4d29354797
|
Merge branch 'develop' into remove_observers
# Conflicts:
# src/main/java/seng302/controllers/CanvasController.java
# src/main/java/seng302/fxObjects/BoatGroup.java
# src/main/java/seng302/models/stream/StreamParser.java
|
2017-05-25 10:25:54 +12:00 |
|
|
Calum
|
765ea06c3b
|
Several tweaks and improvements to a annotations and other visual aspects of them program. Fixed bug causing minimization crashes.
#implement #refactor #issue[23]
|
2017-05-25 01:02:33 +12:00 |
|
|
Calum
|
14a7305a2d
|
Made FPS marker not draw on canvas.
Have to revert the use of the observer pattern since there is no time to change how and when data is passed.
|
2017-05-24 17:17:06 +12:00 |
|
|
Calum
|
d22d758757
|
Fix issues caused by not updating the time since last mark value frequently. BoatAnnotations now has an update() function that must be called somewhat regularly.
|
2017-05-24 03:23:02 +12:00 |
|
|
Calum
|
acbde5aad8
|
Moved boat annotations into their own class. Implemented observer pattern.
Observer pattern appears to have caused issues with updating Text objects.
Made annotations look nicer. Kinda.
#refactor
|
2017-05-24 03:09:11 +12:00 |
|