 Calum
|
720ce0ae5b
|
Merged with develop. Moved all collision logic into game state.
#refactor
|
2017-08-16 01:04:16 +12:00 |
|
 Alistair McIntyre
|
76dabb8138
|
Merge remote-tracking branch 'origin/Story64_SailsAnimations' into Story64_SailsAnimations
# Conflicts:
# src/test/java/steps/ToggleSailSteps.java
|
2017-08-14 14:17:10 +12:00 |
|
|
Alistair McIntyre
|
8b543488e3
|
Fixed faulty develop merge and completed manual testing before merging back into develop.
tags: #story[1111]
|
2017-08-14 14:15:34 +12:00 |
|
 Kusal Ekanayake
|
9c1fe72f6b
|
Merge and tests fix
|
2017-08-14 13:35:18 +12:00 |
|
|
Kusal Ekanayake
|
25c2de63a2
|
Working cucumber tests for sails toggle.
When sails in will send a sails out message when sails out will send a sails in message and then checks for the new status of the sail
#story[1111]
|
2017-08-13 14:55:33 +12:00 |
|
|
Kusal Ekanayake
|
941febaf62
|
Tried to fix cucumber tests, getting closer.
#story[1111]
|
2017-08-08 16:31:27 +12:00 |
|
|
Kusal Ekanayake
|
97696cc95b
|
Started work on cucumber tests. Trying to sort through threads, getting inconsistent results.
#story[1111] #pair[kre39,ptg19]
|
2017-08-07 17:54:34 +12:00 |
|