s444524
/
JoelForkTest
forked from s425077/PotatoPlan
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of s425077/PotatoPlan into dev

This commit is contained in:
Oskar Nastały 2020-04-08 18:24:40 +00:00 committed by Gogs
parent 4d1b20b32f 938be83d9c
commit 90d7f1afbd
19 changed files with 10781 additions and 10175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Tractor_VS/.vs/Game1/v15/.suo
View File

Binary file not shown.

BIN
Tractor_VS/.vs/Game1/v15/Server/sqlite3/storage.ide-shm
View File

Binary file not shown.

BIN
Tractor_VS/.vs/Game1/v15/Server/sqlite3/storage.ide-wal
View File

Binary file not shown.

BIN
Tractor_VS/Game1/Content/bin/Windows/Content/Font.xnb
View File

Binary file not shown.

16
Tractor_VS/Game1/Content/obj/Windows/Content/.mgcontent
View File

@ -4,14 +4,14 @@
<Platform>Windows</Platform>
<Config />
<SourceFiles>
<File>D:/Ny mapp (2)/Ny mapp (2)/PotatoPlan/Tractor_VS/Game1/Content/Crop.png</File>
<File>D:/Ny mapp (2)/Ny mapp (2)/PotatoPlan/Tractor_VS/Game1/Content/Font.spritefont</File>
<File>D:/Ny mapp (2)/Ny mapp (2)/PotatoPlan/Tractor_VS/Game1/Content/house.png</File>
<File>D:/Ny mapp (2)/Ny mapp (2)/PotatoPlan/Tractor_VS/Game1/Content/Plantable.png</File>
<File>D:/Ny mapp (2)/Ny mapp (2)/PotatoPlan/Tractor_VS/Game1/Content/Planted.png</File>
<File>D:/Ny mapp (2)/Ny mapp (2)/PotatoPlan/Tractor_VS/Game1/Content/Tile.png</File>
<File>D:/Ny mapp (2)/Ny mapp (2)/PotatoPlan/Tractor_VS/Game1/Content/tileunplantable.png</File>
<File>D:/Ny mapp (2)/Ny mapp (2)/PotatoPlan/Tractor_VS/Game1/Content/Tractor.png</File>
<File>C:/Users/Oskar/Source/Repos/s425077/PotatoPlan/Tractor_VS/Game1/Content/Crop.png</File>
<File>C:/Users/Oskar/Source/Repos/s425077/PotatoPlan/Tractor_VS/Game1/Content/Font.spritefont</File>
<File>C:/Users/Oskar/Source/Repos/s425077/PotatoPlan/Tractor_VS/Game1/Content/house.png</File>
<File>C:/Users/Oskar/Source/Repos/s425077/PotatoPlan/Tractor_VS/Game1/Content/Plantable.png</File>
<File>C:/Users/Oskar/Source/Repos/s425077/PotatoPlan/Tractor_VS/Game1/Content/Planted.png</File>
<File>C:/Users/Oskar/Source/Repos/s425077/PotatoPlan/Tractor_VS/Game1/Content/Tile.png</File>
<File>C:/Users/Oskar/Source/Repos/s425077/PotatoPlan/Tractor_VS/Game1/Content/tileunplantable.png</File>
<File>C:/Users/Oskar/Source/Repos/s425077/PotatoPlan/Tractor_VS/Game1/Content/Tractor.png</File>
</SourceFiles>
<DestFiles>
<File xsi:nil="true" />

8
Tractor_VS/Game1/Content/obj/Windows/Content/.mgstats
View File

@ -1 +1,9 @@
Source File,Dest File,Processor Type,Content Type,Source File Size,Dest File Size,Build Seconds
"C:/Users/Oskar/Source/Repos/s425077/PotatoPlan/Tractor_VS/Game1/Content/Crop.png","C:/Users/Oskar/Source/Repos/s425077/PotatoPlan/Tractor_VS/Game1/Content/bin/Windows/Content/Crop.xnb","TextureProcessor","Texture2DContent",3681,262229,0.2164986
"C:/Users/Oskar/Source/Repos/s425077/PotatoPlan/Tractor_VS/Game1/Content/Font.spritefont","C:/Users/Oskar/Source/Repos/s425077/PotatoPlan/Tractor_VS/Game1/Content/bin/Windows/Content/Font.xnb","FontDescriptionProcessor","SpriteFontContent",2008,21524,0.1952166
"C:/Users/Oskar/Source/Repos/s425077/PotatoPlan/Tractor_VS/Game1/Content/house.png","C:/Users/Oskar/Source/Repos/s425077/PotatoPlan/Tractor_VS/Game1/Content/bin/Windows/Content/house.xnb","TextureProcessor","Texture2DContent",1226,40085,0.003001
"C:/Users/Oskar/Source/Repos/s425077/PotatoPlan/Tractor_VS/Game1/Content/Plantable.png","C:/Users/Oskar/Source/Repos/s425077/PotatoPlan/Tractor_VS/Game1/Content/bin/Windows/Content/Plantable.xnb","TextureProcessor","Texture2DContent",776,262229,0.0060014
"C:/Users/Oskar/Source/Repos/s425077/PotatoPlan/Tractor_VS/Game1/Content/Planted.png","C:/Users/Oskar/Source/Repos/s425077/PotatoPlan/Tractor_VS/Game1/Content/bin/Windows/Content/Planted.xnb","TextureProcessor","Texture2DContent",3958,262229,0.0060017
"C:/Users/Oskar/Source/Repos/s425077/PotatoPlan/Tractor_VS/Game1/Content/Tile.png","C:/Users/Oskar/Source/Repos/s425077/PotatoPlan/Tractor_VS/Game1/Content/bin/Windows/Content/Tile.xnb","TextureProcessor","Texture2DContent",828,262229,0.008001
"C:/Users/Oskar/Source/Repos/s425077/PotatoPlan/Tractor_VS/Game1/Content/tileunplantable.png","C:/Users/Oskar/Source/Repos/s425077/PotatoPlan/Tractor_VS/Game1/Content/bin/Windows/Content/tileunplantable.xnb","TextureProcessor","Texture2DContent",1823,1000085,0.0220053
"C:/Users/Oskar/Source/Repos/s425077/PotatoPlan/Tractor_VS/Game1/Content/Tractor.png","C:/Users/Oskar/Source/Repos/s425077/PotatoPlan/Tractor_VS/Game1/Content/bin/Windows/Content/Tractor.xnb","TextureProcessor","Texture2DContent",573,12853,0.0020008

10
Tractor_VS/Game1/Content/obj/Windows/Content/Font.mgcontent
View File

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<PipelineBuildEvent xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<SourceFile>D:/Ny mapp (2)/Ny mapp (2)/PotatoPlan/Tractor_VS/Game1/Content/Font.spritefont</SourceFile>
<SourceFile>C:/Users/Oskar/Source/Repos/s425077/PotatoPlan/Tractor_VS/Game1/Content/Font.spritefont</SourceFile>
<SourceTime>2018-12-08T17:35:46+01:00</SourceTime>
<DestFile>D:/Ny mapp (2)/Ny mapp (2)/PotatoPlan/Tractor_VS/Game1/Content/bin/Windows/Content/Font.xnb</DestFile>
<DestTime>2020-04-08T19:58:28.9131631+02:00</DestTime>
<DestFile>C:/Users/Oskar/Source/Repos/s425077/PotatoPlan/Tractor_VS/Game1/Content/bin/Windows/Content/Font.xnb</DestFile>
<DestTime>2020-04-08T20:07:48.1912196+02:00</DestTime>
<Importer>FontDescriptionImporter</Importer>
<ImporterTime>2018-12-08T17:35:54+01:00</ImporterTime>
<ImporterTime>2020-02-26T06:46:56+01:00</ImporterTime>
<Processor>FontDescriptionProcessor</Processor>
<ProcessorTime>2018-12-08T17:35:54+01:00</ProcessorTime>
<ProcessorTime>2020-02-26T06:46:56+01:00</ProcessorTime>
<Parameters>
<Key>PremultiplyAlpha</Key>
<Value>True</Value>

12
Tractor_VS/Game1/Content/obj/Windows/Content/Tile.mgcontent
View File

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<PipelineBuildEvent xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<SourceFile>D:/Ny mapp (2)/Ny mapp (2)/PotatoPlan/Tractor_VS/Game1/Content/Tile.png</SourceFile>
<SourceTime>2020-04-07T14:11:48.0383577+02:00</SourceTime>
<DestFile>D:/Ny mapp (2)/Ny mapp (2)/PotatoPlan/Tractor_VS/Game1/Content/bin/Windows/Content/Tile.xnb</DestFile>
<DestTime>2020-04-08T19:58:29.046164+02:00</DestTime>
<SourceFile>C:/Users/Oskar/Source/Repos/s425077/PotatoPlan/Tractor_VS/Game1/Content/Tile.png</SourceFile>
<SourceTime>2020-04-08T20:07:05.8428994+02:00</SourceTime>
<DestFile>C:/Users/Oskar/Source/Repos/s425077/PotatoPlan/Tractor_VS/Game1/Content/bin/Windows/Content/Tile.xnb</DestFile>
<DestTime>2020-04-08T20:07:48.2152249+02:00</DestTime>
<Importer>TextureImporter</Importer>
<ImporterTime>2018-12-08T17:35:54+01:00</ImporterTime>
<ImporterTime>2020-02-26T06:46:56+01:00</ImporterTime>
<Processor>TextureProcessor</Processor>
<ProcessorTime>2018-12-08T17:35:54+01:00</ProcessorTime>
<ProcessorTime>2020-02-26T06:46:56+01:00</ProcessorTime>
<Parameters>
<Key>ColorKeyColor</Key>
<Value>255,0,255,255</Value>

10
Tractor_VS/Game1/Content/obj/Windows/Content/Tractor.mgcontent
View File

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<PipelineBuildEvent xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<SourceFile>D:/Ny mapp (2)/Ny mapp (2)/PotatoPlan/Tractor_VS/Game1/Content/Tractor.png</SourceFile>
<SourceFile>C:/Users/Oskar/Source/Repos/s425077/PotatoPlan/Tractor_VS/Game1/Content/Tractor.png</SourceFile>
<SourceTime>2020-04-06T14:11:32.7941423+02:00</SourceTime>
<DestFile>D:/Ny mapp (2)/Ny mapp (2)/PotatoPlan/Tractor_VS/Game1/Content/bin/Windows/Content/Tractor.xnb</DestFile>
<DestTime>2020-04-08T19:58:29.1251636+02:00</DestTime>
<DestFile>C:/Users/Oskar/Source/Repos/s425077/PotatoPlan/Tractor_VS/Game1/Content/bin/Windows/Content/Tractor.xnb</DestFile>
<DestTime>2020-04-08T20:07:48.2392297+02:00</DestTime>
<Importer>TextureImporter</Importer>
<ImporterTime>2018-12-08T17:35:54+01:00</ImporterTime>
<ImporterTime>2020-02-26T06:46:56+01:00</ImporterTime>
<Processor>TextureProcessor</Processor>
<ProcessorTime>2018-12-08T17:35:54+01:00</ProcessorTime>
<ProcessorTime>2020-02-26T06:46:56+01:00</ProcessorTime>
<Parameters>
<Key>ColorKeyColor</Key>
<Value>255,0,255,255</Value>

BIN
Tractor_VS/Game1/bin/Windows/x86/Debug/Content/Font.xnb
View File

Binary file not shown.

BIN
Tractor_VS/Game1/bin/Windows/x86/Debug/Game1.exe
View File

Binary file not shown.

BIN
Tractor_VS/Game1/bin/Windows/x86/Debug/Game1.pdb
View File

Binary file not shown.

BIN
Tractor_VS/Game1/bin/Windows/x86/Debug/MonoGame.Framework.dll
View File

Binary file not shown.

20869
Tractor_VS/Game1/bin/Windows/x86/Debug/MonoGame.Framework.xml
View File

File diff suppressed because it is too large Load Diff

2
Tractor_VS/Game1/obj/x86/Debug/Game1.csproj.CoreCompileInputs.cache
View File

@ -1 +1 @@
e5b74bdf7392fcaaa637d1f384c05bda540e10ba
cf25c9cac4cef71798408758988dea8332b39a3d

29
Tractor_VS/Game1/obj/x86/Debug/Game1.csproj.FileListAbsolute.txt
View File

@ -87,3 +87,32 @@ D:\Ny mapp (2)\Ny mapp (2)\PotatoPlan\Tractor_VS\Game1\obj\x86\Debug\Game1.cspro
D:\Ny mapp (2)\Ny mapp (2)\PotatoPlan\Tractor_VS\Game1\obj\x86\Debug\Game1.csproj.CopyComplete
D:\Ny mapp (2)\Ny mapp (2)\PotatoPlan\Tractor_VS\Game1\obj\x86\Debug\Game1.exe
D:\Ny mapp (2)\Ny mapp (2)\PotatoPlan\Tractor_VS\Game1\obj\x86\Debug\Game1.pdb
C:\Users\Oskar\Source\Repos\s425077\PotatoPlan\Tractor_VS\Game1\bin\Windows\x86\Debug\Content\Crop.xnb
C:\Users\Oskar\Source\Repos\s425077\PotatoPlan\Tractor_VS\Game1\bin\Windows\x86\Debug\Content\Font.xnb
C:\Users\Oskar\Source\Repos\s425077\PotatoPlan\Tractor_VS\Game1\bin\Windows\x86\Debug\Content\house.xnb
C:\Users\Oskar\Source\Repos\s425077\PotatoPlan\Tractor_VS\Game1\bin\Windows\x86\Debug\Content\Plantable.xnb
C:\Users\Oskar\Source\Repos\s425077\PotatoPlan\Tractor_VS\Game1\bin\Windows\x86\Debug\Content\Planted.xnb
C:\Users\Oskar\Source\Repos\s425077\PotatoPlan\Tractor_VS\Game1\bin\Windows\x86\Debug\Content\Tile.xnb
C:\Users\Oskar\Source\Repos\s425077\PotatoPlan\Tractor_VS\Game1\bin\Windows\x86\Debug\Content\tileunplantable.xnb
C:\Users\Oskar\Source\Repos\s425077\PotatoPlan\Tractor_VS\Game1\bin\Windows\x86\Debug\Content\Tractor.xnb
C:\Users\Oskar\Source\Repos\s425077\PotatoPlan\Tractor_VS\Game1\bin\Windows\x86\Debug\Game1.exe
C:\Users\Oskar\Source\Repos\s425077\PotatoPlan\Tractor_VS\Game1\bin\Windows\x86\Debug\Game1.pdb
C:\Users\Oskar\Source\Repos\s425077\PotatoPlan\Tractor_VS\Game1\bin\Windows\x86\Debug\MonoGame.Framework.dll
C:\Users\Oskar\Source\Repos\s425077\PotatoPlan\Tractor_VS\Game1\bin\Windows\x86\Debug\SharpDX.DXGI.dll
C:\Users\Oskar\Source\Repos\s425077\PotatoPlan\Tractor_VS\Game1\bin\Windows\x86\Debug\SharpDX.dll
C:\Users\Oskar\Source\Repos\s425077\PotatoPlan\Tractor_VS\Game1\bin\Windows\x86\Debug\SharpDX.Direct3D11.dll
C:\Users\Oskar\Source\Repos\s425077\PotatoPlan\Tractor_VS\Game1\bin\Windows\x86\Debug\SharpDX.MediaFoundation.dll
C:\Users\Oskar\Source\Repos\s425077\PotatoPlan\Tractor_VS\Game1\bin\Windows\x86\Debug\SharpDX.XAudio2.dll
C:\Users\Oskar\Source\Repos\s425077\PotatoPlan\Tractor_VS\Game1\bin\Windows\x86\Debug\SharpDX.XInput.dll
C:\Users\Oskar\Source\Repos\s425077\PotatoPlan\Tractor_VS\Game1\bin\Windows\x86\Debug\MonoGame.Framework.xml
C:\Users\Oskar\Source\Repos\s425077\PotatoPlan\Tractor_VS\Game1\bin\Windows\x86\Debug\SharpDX.DXGI.xml
C:\Users\Oskar\Source\Repos\s425077\PotatoPlan\Tractor_VS\Game1\bin\Windows\x86\Debug\SharpDX.xml
C:\Users\Oskar\Source\Repos\s425077\PotatoPlan\Tractor_VS\Game1\bin\Windows\x86\Debug\SharpDX.Direct3D11.xml
C:\Users\Oskar\Source\Repos\s425077\PotatoPlan\Tractor_VS\Game1\bin\Windows\x86\Debug\SharpDX.MediaFoundation.xml
C:\Users\Oskar\Source\Repos\s425077\PotatoPlan\Tractor_VS\Game1\bin\Windows\x86\Debug\SharpDX.XAudio2.xml
C:\Users\Oskar\Source\Repos\s425077\PotatoPlan\Tractor_VS\Game1\bin\Windows\x86\Debug\SharpDX.XInput.xml
C:\Users\Oskar\Source\Repos\s425077\PotatoPlan\Tractor_VS\Game1\obj\x86\Debug\Game1.csprojAssemblyReference.cache
C:\Users\Oskar\Source\Repos\s425077\PotatoPlan\Tractor_VS\Game1\obj\x86\Debug\Game1.csproj.CoreCompileInputs.cache
C:\Users\Oskar\Source\Repos\s425077\PotatoPlan\Tractor_VS\Game1\obj\x86\Debug\Game1.csproj.CopyComplete
C:\Users\Oskar\Source\Repos\s425077\PotatoPlan\Tractor_VS\Game1\obj\x86\Debug\Game1.exe
C:\Users\Oskar\Source\Repos\s425077\PotatoPlan\Tractor_VS\Game1\obj\x86\Debug\Game1.pdb

BIN
Tractor_VS/Game1/obj/x86/Debug/Game1.csprojAssemblyReference.cache
View File

Binary file not shown.

BIN
Tractor_VS/Game1/obj/x86/Debug/Game1.exe
View File

Binary file not shown.

BIN
Tractor_VS/Game1/obj/x86/Debug/Game1.pdb
View File

Binary file not shown.