alysbrooks-public » games » isometric-park-fna

Commit r134:9193c3358ecd public

parent | child
Description:
Merge in changes.
Commit status:
[Not Reviewed]
References:
m2-procgen
Diff options:
Raw Diff | Patch Diff | Download Diff
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Add another comment
Browse Files

r134:9193c3358ecd -

Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
@@ -1,1 +1,1
1 ccf73b859df7dddc357676bd95436a0b13bdd512
1 8ee6b95dcd628b76a0d5ee914132625645a90707
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
@@ -1,1 +1,1
1 eb53a31a465d1700585a27323fb9618e935e3337
1 0d126f771b88f01f6a28944a5ac1d8a59fabfd62
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
@@ -1,14 +1,14
1 {
1 {
2 "format": 1,
2 "format": 1,
3 "restore": {
3 "restore": {
4 "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj": {}
4 "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj": {}
5 },
5 },
6 "projects": {
6 "projects": {
7 "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj": {
7 "/home/alys/repos/isometric-park-fna/FNA/FNA.csproj": {
8 "restore": {
8 "restore": {
9 "projectUniqueName": "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj",
9 "projectUniqueName": "/home/alys/repos/isometric-park-fna/FNA/FNA.csproj",
10 "projectName": "FNA",
10 "projectName": "FNA",
11 "projectPath": "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj",
11 "projectPath": "/home/alys/repos/isometric-park-fna/FNA/FNA.csproj",
12 "frameworks": {
12 "frameworks": {
13 "net48": {
13 "net48": {
14 "projectReferences": {}
14 "projectReferences": {}
@@ -19,17 +19,20
19 "net48": {}
19 "net48": {}
20 }
20 }
21 },
21 },
22 "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj": {
22 "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj": {
23 "version": "1.0.0",
23 "version": "1.0.0",
24 "restore": {
24 "restore": {
25 "projectUniqueName": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj",
25 "projectUniqueName": "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj",
26 "projectName": "SpriteFontPlus",
26 "projectName": "SpriteFontPlus",
27 "projectPath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj",
27 "projectPath": "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj",
28 "packagesPath": "/Users/alys/.nuget/packages/",
28 "packagesPath": "/home/alys/.nuget/packages/",
29 "outputPath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/",
29 "outputPath": "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/",
30 "projectStyle": "PackageReference",
30 "projectStyle": "PackageReference",
31 "fallbackFolders": [
32 "/usr/share/dotnet/sdk/NuGetFallbackFolder"
33 ],
31 "configFilePaths": [
34 "configFilePaths": [
32 "/Users/alys/.config/NuGet/NuGet.Config"
35 "/home/alys/.config/NuGet/NuGet.Config"
33 ],
36 ],
34 "originalTargetFrameworks": [
37 "originalTargetFrameworks": [
35 "net45"
38 "net45"
@@ -40,8 +43,8
40 "frameworks": {
43 "frameworks": {
41 "net45": {
44 "net45": {
42 "projectReferences": {
45 "projectReferences": {
43 "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj": {
46 "/home/alys/repos/isometric-park-fna/FNA/FNA.csproj": {
44 "projectPath": "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj"
47 "projectPath": "/home/alys/repos/isometric-park-fna/FNA/FNA.csproj"
45 }
48 }
46 }
49 }
47 }
50 }
@@ -53,9 +56,7
53 }
56 }
54 },
57 },
55 "frameworks": {
58 "frameworks": {
56 "net45": {
59 "net45": {}
57 "runtimeIdentifierGraphPath": "/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/Current/bin/RuntimeIdentifierGraph.json"
58 }
59 }
60 }
60 }
61 }
61 }
62 }
Show file before | Show file after | Show commentsHide comments
@@ -4,8 +4,8
4 <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
4 <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
5 <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
5 <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
6 <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
6 <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
7 <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/Users/alys/.nuget/packages/</NuGetPackageRoot>
7 <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/home/alys/.nuget/packages/</NuGetPackageRoot>
8 <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/Users/alys/.nuget/packages/</NuGetPackageFolders>
8 <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/home/alys/.nuget/packages/;/usr/share/dotnet/sdk/NuGetFallbackFolder</NuGetPackageFolders>
9 <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
9 <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
10 <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.6.0</NuGetToolVersion>
10 <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.6.0</NuGetToolVersion>
11 </PropertyGroup>
11 </PropertyGroup>
Show file before | Show file after | Show commentsHide comments
@@ -26,19 +26,23
26 ]
26 ]
27 },
27 },
28 "packageFolders": {
28 "packageFolders": {
29 "/Users/alys/.nuget/packages/": {}
29 "/home/alys/.nuget/packages/": {},
30 "/usr/share/dotnet/sdk/NuGetFallbackFolder": {}
30 },
31 },
31 "project": {
32 "project": {
32 "version": "1.0.0",
33 "version": "1.0.0",
33 "restore": {
34 "restore": {
34 "projectUniqueName": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj",
35 "projectUniqueName": "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj",
35 "projectName": "SpriteFontPlus",
36 "projectName": "SpriteFontPlus",
36 "projectPath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj",
37 "projectPath": "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj",
37 "packagesPath": "/Users/alys/.nuget/packages/",
38 "packagesPath": "/home/alys/.nuget/packages/",
38 "outputPath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/",
39 "outputPath": "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/",
39 "projectStyle": "PackageReference",
40 "projectStyle": "PackageReference",
41 "fallbackFolders": [
42 "/usr/share/dotnet/sdk/NuGetFallbackFolder"
43 ],
40 "configFilePaths": [
44 "configFilePaths": [
41 "/Users/alys/.config/NuGet/NuGet.Config"
45 "/home/alys/.config/NuGet/NuGet.Config"
42 ],
46 ],
43 "originalTargetFrameworks": [
47 "originalTargetFrameworks": [
44 "net45"
48 "net45"
@@ -49,8 +53,8
49 "frameworks": {
53 "frameworks": {
50 "net45": {
54 "net45": {
51 "projectReferences": {
55 "projectReferences": {
52 "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj": {
56 "/home/alys/repos/isometric-park-fna/FNA/FNA.csproj": {
53 "projectPath": "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj"
57 "projectPath": "/home/alys/repos/isometric-park-fna/FNA/FNA.csproj"
54 }
58 }
55 }
59 }
56 }
60 }
@@ -62,9 +66,7
62 }
66 }
63 },
67 },
64 "frameworks": {
68 "frameworks": {
65 "net45": {
69 "net45": {}
66 "runtimeIdentifierGraphPath": "/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/Current/bin/RuntimeIdentifierGraph.json"
67 }
68 }
70 }
69 }
71 }
70 } No newline at end of file
72 }
Show file before | Show file after | Show commentsHide comments
@@ -1,8 +1,8
1 {
1 {
2 "version": 2,
2 "version": 2,
3 "dgSpecHash": "kUPsWi+W/I8KOuiF0fQ9nWh1vVsW3b0wAQVjldBK6JNRF3usvNENwsXcLXddNG6Wh/129HHhkfaanQmLUK7wcA==",
3 "dgSpecHash": "3AWDv+MZriwMxBTBDorp8FiSvyrXQqppePDYsTfATqNGlipF/pJObt6DcBo8NzTLP21oSN3cyqBrcDukFLx64w==",
4 "success": true,
4 "success": true,
5 "projectFilePath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj",
5 "projectFilePath": "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj",
6 "expectedPackageFiles": [],
6 "expectedPackageFiles": [],
7 "logs": []
7 "logs": []
8 } No newline at end of file
8 }
You need to be logged in to leave comments. Login now