Merge branch 'developer' into feature/Controller

# Conflicts: # CrystalPoint.cpp # Player.cpp
2016-06-21 15:14:08 +02:00
parent 36dc74a39e e848780535
commit 942b068851
21 changed files with 174 additions and 30 deletions
@@ -214,6 +214,7 @@
  <ItemGroup>
    <None Include="worlds\fire.json" />
    <None Include="worlds\ice.json" />
+    <None Include="worlds\rock.json" />
    <None Include="worlds\small.json" />
    <None Include="worlds\worlds.json" />
  </ItemGroup>