Skip to content

Commit

Permalink
fixed light
Browse files Browse the repository at this point in the history
  • Loading branch information
@darkstrauss
darkstrauss committed Nov 3, 2015
1 parent bbeeb3e commit b0ac28c
Show file tree
Hide file tree
Showing 124 changed files with 1,507 additions and 71 deletions.
6 changes: 0 additions & 6 deletions Prototype/Assembly-CSharp-Editor.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,6 @@
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_Antialiasing\FXAAPreset2.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BlurAndFlares.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BlendForBloom.shader" />
<Reference Include="UnityEngine.Advertisements">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Advertisements/UnityEngine.Advertisements.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.Advertisements">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Advertisements/Editor/UnityEditor.Advertisements.dll</HintPath>
</Reference>
Expand All @@ -194,9 +191,6 @@
<Reference Include="UnityEditor.Networking">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Networking/Editor/UnityEditor.Networking.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Analytics">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
</Reference>
<Reference Include="LeapCSharp.NET3.5">
<HintPath>C:/Users/USBLabPC1/Documents/GitHub/Operation-OPERATION/Prototype/Assets/Plugins/LeapCSharp.NET3.5.dll</HintPath>
</Reference>
Expand Down
6 changes: 0 additions & 6 deletions Prototype/Assembly-CSharp-firstpass.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,18 +244,12 @@
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_Antialiasing\FXAAPreset2.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BlurAndFlares.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BlendForBloom.shader" />
<Reference Include="UnityEngine.Advertisements">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Advertisements/UnityEngine.Advertisements.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.UI">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Networking">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Analytics">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
</Reference>
<Reference Include="LeapCSharp.NET3.5">
<HintPath>C:/Users/USBLabPC1/Documents/GitHub/Operation-OPERATION/Prototype/Assets/Plugins/LeapCSharp.NET3.5.dll</HintPath>
</Reference>
Expand Down
7 changes: 1 addition & 6 deletions Prototype/Assembly-CSharp.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@
<Compile Include="Assets\Scripts\LevelLoadingScript.cs" />
<Compile Include="Assets\Scripts\OpenAED.cs" />
<Compile Include="Assets\Scripts\SetDown.cs" />
<Compile Include="Assets\Scripts\StartScene.cs" />
<None Include="Assets\Standard Assets\Effects\GlassRefraction\Shaders\GlassStainedBumpDistort.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BlendOneOne.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\NoiseEffectShaderRGB.shader" />
Expand Down Expand Up @@ -289,18 +290,12 @@
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_Antialiasing\FXAAPreset2.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BlurAndFlares.shader" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BlendForBloom.shader" />
<Reference Include="UnityEngine.Advertisements">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Advertisements/UnityEngine.Advertisements.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.UI">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Networking">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Analytics">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
</Reference>
<Reference Include="LeapCSharp.NET3.5">
<HintPath>C:/Users/USBLabPC1/Documents/GitHub/Operation-OPERATION/Prototype/Assets/Plugins/LeapCSharp.NET3.5.dll</HintPath>
</Reference>
Expand Down
Binary file modified Prototype/Assets/Materials/MIKE.mat
View file
Binary file not shown.
5 changes: 5 additions & 0 deletions Prototype/Assets/Models/Henry.obj.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Prototype/Assets/Prefabs/Interactable AED.prefab
View file
Binary file not shown.
9 changes: 9 additions & 0 deletions Prototype/Assets/Resources.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions Prototype/Assets/Resources/AEDLines.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 Prototype/Assets/Sounds/AEDVOICE/Line1.mp3 → ...otype/Assets/Resources/AEDLines/Line1.mp3
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions Prototype/Assets/Sounds/HeartBeat.mp3.meta → .../Assets/Resources/AEDLines/Line1.mp3.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 Prototype/Assets/Sounds/AEDVOICE/Line11.mp3 → ...type/Assets/Resources/AEDLines/Line10.mp3
View file
File renamed without changes.
22 changes: 22 additions & 0 deletions Prototype/Assets/Resources/AEDLines/Line10.mp3.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 Prototype/Assets/Sounds/AEDVOICE/Line12.mp3 → ...type/Assets/Resources/AEDLines/Line11.mp3
View file
File renamed without changes.
22 changes: 22 additions & 0 deletions Prototype/Assets/Resources/AEDLines/Line11.mp3.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 Prototype/Assets/Sounds/AEDVOICE/Line13.mp3 → ...type/Assets/Resources/AEDLines/Line12.mp3
View file
File renamed without changes.
22 changes: 22 additions & 0 deletions Prototype/Assets/Resources/AEDLines/Line12.mp3.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 Prototype/Assets/Sounds/AEDVOICE/Line14.mp3 → ...type/Assets/Resources/AEDLines/Line13.mp3
View file
File renamed without changes.
22 changes: 22 additions & 0 deletions Prototype/Assets/Resources/AEDLines/Line13.mp3.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 Prototype/Assets/Sounds/AEDVOICE/Line2.mp3 → ...otype/Assets/Resources/AEDLines/Line2.mp3
View file
File renamed without changes.
22 changes: 22 additions & 0 deletions Prototype/Assets/Resources/AEDLines/Line2.mp3.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Prototype/Assets/Resources/AEDLines/Line20.mp3
View file
Binary file not shown.
22 changes: 22 additions & 0 deletions Prototype/Assets/Resources/AEDLines/Line20.mp3.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Prototype/Assets/Resources/AEDLines/Line21.mp3
View file
Binary file not shown.
22 changes: 22 additions & 0 deletions Prototype/Assets/Resources/AEDLines/Line21.mp3.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 Prototype/Assets/Sounds/AEDVOICE/Line3.mp3 → ...otype/Assets/Resources/AEDLines/Line3.mp3
View file
File renamed without changes.
22 changes: 22 additions & 0 deletions Prototype/Assets/Resources/AEDLines/Line3.mp3.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 Prototype/Assets/Sounds/AEDVOICE/Line4.mp3 → ...otype/Assets/Resources/AEDLines/Line4.mp3
View file
File renamed without changes.
22 changes: 22 additions & 0 deletions Prototype/Assets/Resources/AEDLines/Line4.mp3.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 Prototype/Assets/Sounds/AEDVOICE/Line6.mp3 → ...otype/Assets/Resources/AEDLines/Line5.mp3
View file
File renamed without changes.
22 changes: 22 additions & 0 deletions Prototype/Assets/Resources/AEDLines/Line5.mp3.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 Prototype/Assets/Sounds/AEDVOICE/Line7.mp3 → ...otype/Assets/Resources/AEDLines/Line6.mp3
View file
File renamed without changes.
22 changes: 22 additions & 0 deletions Prototype/Assets/Resources/AEDLines/Line6.mp3.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 Prototype/Assets/Sounds/AEDVOICE/Line8.mp3 → ...otype/Assets/Resources/AEDLines/Line7.mp3
View file
File renamed without changes.
Loading

0 comments on commit b0ac28c

Please sign in to comment.