Merge diverged develop back into master

Terasology / LightAndShadow

Light & Shadow is an experimental game type set in a quirky Alice in Wonderland inspired setting

Apache License 2.0

8 stars 22 forks source link

Merge diverged develop back into master #66

Closed Cervator closed 6 years ago

Cervator commented 6 years ago

This might just be a throwaway PR considering #65 exists and @dacharya64 might be a better person to do this. I rushed conflict resolution a bit too and at first still had the behavior test tools in.

I wanted to see how relatively straight forward this merge would be and it seems like this could be done just about any time now.

Let me know what you think @dacharya64 :-)

Cervator commented 6 years ago

Oh this would go with https://github.com/Terasology/Cities/pull/34 as well

devibri commented 6 years ago

Seems like it would work to me too!