Skip to content

Commit 597782c

Browse files
MeshedMeshed
committed
Merge branch 'pr/3'
Conflicts: Project-LeftKnut/Library/InspectorExpandedItems.asset Project-LeftKnut/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll Project-LeftKnut/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb Project-LeftKnut/Library/ScriptAssemblies/Assembly-CSharp.dll Project-LeftKnut/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb Project-LeftKnut/Library/assetDatabase3 Project-LeftKnut/Library/expandedItems
2 parents d18d5ac + 28cb592 commit 597782c

File tree

98 files changed

+7561
-4
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+7561
-4
lines changed

‎Project-LeftKnut/Assembly-CSharp-Editor-vs.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
<None Include="Assets\AstarPathfindingProject\Readme_upgrading.txt" />
6868
<None Include="Assets\AstarPathfindingProject\ExampleScenes\Materials\Projector Light.shader" />
6969
<None Include="Assets\AstarPathfindingProject\Readme.txt" />
70+
<None Include="Assets\iTween\ReadMe!\ReadMe!.txt" />
7071
<None Include="Assets\AstarPathfindingProject\Plugins\JsonFx\License.txt" />
7172
<None Include="Assets\AstarPathfindingProject\Plugins\JsonFx\Readme.txt" />
7273
<None Include="Assets\Standard Assets\Tessellation Shaders\BumpedSpecularDisplacement.shader" />

‎Project-LeftKnut/Assembly-CSharp-Editor.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
<None Include="Assets\AstarPathfindingProject\Readme_upgrading.txt" />
6868
<None Include="Assets\AstarPathfindingProject\ExampleScenes\Materials\Projector Light.shader" />
6969
<None Include="Assets\AstarPathfindingProject\Readme.txt" />
70+
<None Include="Assets\iTween\ReadMe!\ReadMe!.txt" />
7071
<None Include="Assets\AstarPathfindingProject\Plugins\JsonFx\License.txt" />
7172
<None Include="Assets\AstarPathfindingProject\Plugins\JsonFx\Readme.txt" />
7273
<None Include="Assets\Standard Assets\Tessellation Shaders\BumpedSpecularDisplacement.shader" />

‎Project-LeftKnut/Assembly-CSharp-vs.csproj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,10 @@
118118
<Compile Include="Assets\Scripts\scriptNode.cs" />
119119
<Compile Include="Assets\Scripts\scriptPlayer.cs" />
120120
<Compile Include="Assets\Scripts\scriptSilo.cs" />
121+
<Compile Include="Assets\iTween\Plugins\iTween.cs" />
122+
<Compile Include="Assets\iTween\Sample\MoveSample.cs" />
123+
<Compile Include="Assets\iTween\Sample\RotateSample.cs" />
124+
<Compile Include="Assets\iTween\Sample\SampleInfo.cs" />
121125
<None Include="Assets\AstarPathfindingProject\Editor\EditorAssets\Materials\Navmesh2.shader" />
122126
<None Include="Assets\Materials\HighlightShader.shader" />
123127
<None Include="Assets\AstarPathfindingProject\Plugins\DotNetZip\License.txt" />
@@ -130,6 +134,7 @@
130134
<None Include="Assets\AstarPathfindingProject\Readme_upgrading.txt" />
131135
<None Include="Assets\AstarPathfindingProject\ExampleScenes\Materials\Projector Light.shader" />
132136
<None Include="Assets\AstarPathfindingProject\Readme.txt" />
137+
<None Include="Assets\iTween\ReadMe!\ReadMe!.txt" />
133138
<None Include="Assets\AstarPathfindingProject\Plugins\JsonFx\License.txt" />
134139
<None Include="Assets\AstarPathfindingProject\Plugins\JsonFx\Readme.txt" />
135140
<None Include="Assets\Standard Assets\Tessellation Shaders\BumpedSpecularDisplacement.shader" />

‎Project-LeftKnut/Assembly-CSharp.csproj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,10 @@
118118
<Compile Include="Assets\Scripts\scriptNode.cs" />
119119
<Compile Include="Assets\Scripts\scriptPlayer.cs" />
120120
<Compile Include="Assets\Scripts\scriptSilo.cs" />
121+
<Compile Include="Assets\iTween\Plugins\iTween.cs" />
122+
<Compile Include="Assets\iTween\Sample\MoveSample.cs" />
123+
<Compile Include="Assets\iTween\Sample\RotateSample.cs" />
124+
<Compile Include="Assets\iTween\Sample\SampleInfo.cs" />
121125
<None Include="Assets\AstarPathfindingProject\Editor\EditorAssets\Materials\Navmesh2.shader" />
122126
<None Include="Assets\Materials\HighlightShader.shader" />
123127
<None Include="Assets\AstarPathfindingProject\Plugins\DotNetZip\License.txt" />
@@ -130,6 +134,7 @@
130134
<None Include="Assets\AstarPathfindingProject\Readme_upgrading.txt" />
131135
<None Include="Assets\AstarPathfindingProject\ExampleScenes\Materials\Projector Light.shader" />
132136
<None Include="Assets\AstarPathfindingProject\Readme.txt" />
137+
<None Include="Assets\iTween\ReadMe!\ReadMe!.txt" />
133138
<None Include="Assets\AstarPathfindingProject\Plugins\JsonFx\License.txt" />
134139
<None Include="Assets\AstarPathfindingProject\Plugins\JsonFx\Readme.txt" />
135140
<None Include="Assets\Standard Assets\Tessellation Shaders\BumpedSpecularDisplacement.shader" />

‎Project-LeftKnut/Assets/Scenes/Credits.unity‎

0 Bytes
Binary file not shown.

‎Project-LeftKnut/Assets/Scenes/MainMenu.unity‎

0 Bytes
Binary file not shown.

‎Project-LeftKnut/Assets/Textures/Credits.png‎

5.72 MB
Loading

‎Project-LeftKnut/Assets/Textures/HomeScreen.png‎

5.95 MB
Loading

0 commit comments

Comments
 (0)