diff --git a/P3D/Content/Data/maps/structures/frontier/facilities/pike.dat b/P3D/Content/Data/maps/structures/frontier/facilities/pike.dat new file mode 100644 index 000000000..0881d9aab Binary files /dev/null and b/P3D/Content/Data/maps/structures/frontier/facilities/pike.dat differ diff --git a/lib/P3D.ContentPipeline/Content/Content.mgcb b/lib/P3D.ContentPipeline/Content/Content.mgcb index b5883938f..0e6c2f520 100644 --- a/lib/P3D.ContentPipeline/Content/Content.mgcb +++ b/lib/P3D.ContentPipeline/Content/Content.mgcb @@ -88,6 +88,25 @@ /processorParam:TextureFormat=Color /build:Fonts/BMP/Unown.png +#begin Models/BattlePike/BattlePike.fbx +/importer:FbxImporter +/processor:ModelProcessor +/processorParam:ColorKeyColor=0,0,0,0 +/processorParam:ColorKeyEnabled=True +/processorParam:DefaultEffect=BasicEffect +/processorParam:GenerateMipmaps=False +/processorParam:GenerateTangentFrames=False +/processorParam:PremultiplyTextureAlpha=True +/processorParam:PremultiplyVertexColors=True +/processorParam:ResizeTexturesToPowerOfTwo=False +/processorParam:RotationX=0 +/processorParam:RotationY=0 +/processorParam:RotationZ=0 +/processorParam:Scale=1 +/processorParam:SwapWindingOrder=False +/processorParam:TextureFormat=Color +/build:Models/BattlePike/BattlePike.fbx + #begin Models/boat/ferry.obj /importer:OpenAssetImporter /processor:ModelProcessor diff --git a/lib/P3D.ContentPipeline/Content/Models/BattlePike/BattlePike.fbx b/lib/P3D.ContentPipeline/Content/Models/BattlePike/BattlePike.fbx new file mode 100644 index 000000000..587ddf627 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Models/BattlePike/BattlePike.fbx differ diff --git a/lib/P3D.ContentPipeline/Content/Models/BattlePike/BattlePike.png b/lib/P3D.ContentPipeline/Content/Models/BattlePike/BattlePike.png new file mode 100644 index 000000000..f6a49847a Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Models/BattlePike/BattlePike.png differ diff --git a/lib/P3D.ContentPipeline/P3D.ContentPipeline.csproj b/lib/P3D.ContentPipeline/P3D.ContentPipeline.csproj index e14bfed85..b110d60d0 100644 --- a/lib/P3D.ContentPipeline/P3D.ContentPipeline.csproj +++ b/lib/P3D.ContentPipeline/P3D.ContentPipeline.csproj @@ -48,6 +48,7 @@ + @@ -83,6 +84,7 @@ +