Skip to content
This repository has been archived by the owner on Oct 25, 2021. It is now read-only.

Corrected paused state and time scaling #33

Merged
merged 4 commits into from
Apr 30, 2019
Merged

Corrected paused state and time scaling #33

merged 4 commits into from
Apr 30, 2019

Conversation

sunreef
Copy link
Collaborator

@sunreef sunreef commented Apr 30, 2019

Same as the previous PR but rebased on the changes with the combat system.

@marotili marotili merged commit 6744082 into amethyst:master Apr 30, 2019
@sunreef sunreef deleted the upstream_master branch April 30, 2019 13:08
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants