merge

2018-02-26 00:26:09 +01:00 · 2018-02-26 00:26:09 +01:00 · faa2990c7b
parent 5895b54eac 735f942eed
commit faa2990c7b
8 changed files with 6 additions and 0 deletions
--- a/P3D/Content/Data/Scripts/trainer/tohjo/Giovanni.trainer
+++ b/P3D/Content/Data/Scripts/trainer/tohjo/Giovanni.trainer
--- a/P3D/Content/Data/maps/ilexforest.dat
+++ b/P3D/Content/Data/maps/ilexforest.dat
--- a/P3D/Content/Data/maps/routes/route22.dat
+++ b/P3D/Content/Data/maps/routes/route22.dat
--- a/P3D/Content/Data/maps/tohjofalls/hideout.dat
+++ b/P3D/Content/Data/maps/tohjofalls/hideout.dat
--- a/P3D/Content/Textures/NPC/Giovanni.png
+++ b/P3D/Content/Textures/NPC/Giovanni.png
--- a/P3D/P3D.vbproj
+++ b/P3D/P3D.vbproj
@ -25909,6 +25909,12 @@
    <Content Include="Content\Data\Scripts\ilex\shrine.dat">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
+    <Content Include="Content\Textures\NPC\Giovanni.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Data\Scripts\trainer\tohjo\Giovanni.trainer">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
    <Content Include="Pokemon3D.ico" />
    <Content Include="credits.txt">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
--- a/lib/build/Content/Fonts/BMP/miniFont.xnb
+++ b/lib/build/Content/Fonts/BMP/miniFont.xnb
--- a/lib/build/GameDevCommon.dll
+++ b/lib/build/GameDevCommon.dll