BTH/depthsbelow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into astar

Browse Source 
Conflicts:
	DepthsBelow/DepthsBelow/Core.cs
	DepthsBelow/DepthsBelow/MouseInput.cs
	DepthsBelow/DepthsBelowContent/maps/Cave.Level1.tmx
This commit is contained in:
Simon Holmberg
2012-09-29 00:45:30 +02:00
parent cf100c95f1 11b2af46ff
commit 2d71eb3e0a
8 changed files with 197 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DepthsBelow/DepthsBelowContent/DepthsBelowContent.contentproj
+1
View File
@@ -89,6 +89,7 @@
<Name>Cave.Level1</Name>
<Processor>MapProcessor</Processor>
<Importer>TmxImporter</Importer>
<SubType>Designer</SubType>
</Compile>
</ItemGroup>
<ItemGroup>
DepthsBelow/DepthsBelowContent/maps/Cave.Level1.tmx
+7
View File
@@ -214,4 +214,11 @@
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
</data>
</layer>
<objectgroup name="Object Layer 1" width="100" height="100">
<object name="Spawn1" type="SquadStart" gid="143" x="288" y="256"/>
<object name="Spawn2" type="SquadStart" gid="143" x="288" y="192"/>
<object name="Spawn4" type="SquadStart" gid="143" x="224" y="160"/>
<object name="Spawn3" type="SquadStart" gid="143" x="224" y="224"/>
<object name="Spawn5" type="SquadStart" gid="143" x="160" y="192"/>
</objectgroup>
</map>