Merge branch 'master' of https://bitbucket.org/Regalis11/repo
Conflicts: Subsurface_Solution.v12.suo
This commit is contained in:
@@ -124,9 +124,12 @@
|
||||
<Compile Include="Map\Entity.cs" />
|
||||
<Compile Include="Map\Explosion.cs" />
|
||||
<Compile Include="Map\IDamageable.cs" />
|
||||
<Compile Include="Map\Level.cs" />
|
||||
<Compile Include="Map\Lights\ConvexHull.cs" />
|
||||
<Compile Include="Map\Lights\LightManager.cs" />
|
||||
<Compile Include="Map\MapHash.cs" />
|
||||
<Compile Include="Map\Voronoi.cs" />
|
||||
<Compile Include="Map\VoronoiElements.cs" />
|
||||
<Compile Include="Physics\PhysicsBody.cs" />
|
||||
<Compile Include="Networking\NetworkEvent.cs" />
|
||||
<Compile Include="Networking\NetworkMember.cs" />
|
||||
|
||||
Reference in New Issue
Block a user