Merge the two flip-platform branches

AxlLind / Strive

Infinite jumper mobile game created in Unity.

6 stars 1 forks source link

Merge the two flip-platform branches #72

Closed AxlLind closed 7 years ago

AxlLind commented 7 years ago

There are two branches for the flip-platform. Since we already have a pull request for the main one I'll just merge this into that pull request.

Jontpan commented 7 years ago

Yeah, problem with that was that flips-with-pause was much more of a testing branch, and i believe master now has flips in the first platformscheme...

Jontpan commented 7 years ago

I'll fix this in this commit I'm pushing now.

AxlLind commented 7 years ago

Oh sorry, my bad.

Jontpan commented 7 years ago

we should maybe create a testing branch? Where the first platformscheme is always the latest platformtype and never delete the branch