tyler.durden/P3D-Legacy
1
0
Fork 0
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git synced 2025-07-28 16:24:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy

Browse Source
This commit is contained in:
CaptainSegis 2018-03-03 21:19:39 -05:00
commit edfa110fb3
12 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
P3D/Content/Data/Scripts/furniture/barktown/yourroom/tv.dat
View File

Binary file not shown.

BIN
P3D/Content/Data/Scripts/ilex/shrine.dat
View File

Binary file not shown.

BIN
P3D/Content/Data/Scripts/mtsilver/red.dat
View File

Binary file not shown.

BIN
P3D/Content/Data/Scripts/quest/tanoby/rock.dat
View File

Binary file not shown.

BIN
P3D/Content/Data/Scripts/trainer/tohjo/Giovanni.trainer
View File

Binary file not shown.

BIN
P3D/Content/Data/maps/embtower/main.dat
View File

Binary file not shown.

BIN
P3D/Content/Data/maps/routes/route22.dat
View File

Binary file not shown.

BIN
P3D/Content/Data/maps/tohjofalls/hideout.dat
View File

Binary file not shown.

BIN
P3D/Content/Data/maps/yourroom.dat
View File

Binary file not shown.

BIN
P3D/Content/Textures/EmbeddedTower.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.4 KiB

BIN
P3D/Content/Textures/switch.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

12
P3D/P3D.vbproj
View File

@ -1624,9 +1624,6 @@
<Content Include="Content\Data\maps\elmlab.dat"> <Content Include="Content\Data\maps\elmlab.dat">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\Data\maps\embtower\main.dat">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Data\maps\faraway\exterior.dat"> <Content Include="Content\Data\maps\faraway\exterior.dat">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
@ -24766,9 +24763,6 @@
<Content Include="Content\Textures\ecruteak.png"> <Content Include="Content\Textures\ecruteak.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\Textures\EmbeddedTower.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Content\Textures\Emblem\alph.png"> <Content Include="Content\Textures\Emblem\alph.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
@ -25951,6 +25945,9 @@
<Content Include="Content\Data\maps\structures\stairs\3\e.dat"> <Content Include="Content\Data\maps\structures\stairs\3\e.dat">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Content\Textures\switch.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Pokemon3D.ico" /> <Content Include="Pokemon3D.ico" />
<Content Include="credits.txt"> <Content Include="credits.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@ -27640,6 +27637,9 @@
<Name>GameDevCommon</Name> <Name>GameDevCommon</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<Folder Include="Content\Data\maps\embtower\" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
<Import Condition=" '$(Configuration)' != 'DebugNoContent' Or '$(Configuration)' != 'ReleaseNoContent' " Project="$(MSBuildExtensionsPath)\MonoGame\v3.0\MonoGame.Content.Builder.targets" /> <Import Condition=" '$(Configuration)' != 'DebugNoContent' Or '$(Configuration)' != 'ReleaseNoContent' " Project="$(MSBuildExtensionsPath)\MonoGame\v3.0\MonoGame.Content.Builder.targets" />
<PropertyGroup> <PropertyGroup>