Skip to content

Commit

Permalink
squash merge from da32106
Browse files Browse the repository at this point in the history
  • Loading branch information
ilmatematico committed Apr 18, 2019
1 parent 97c9646 commit 56db1c9
Show file tree
Hide file tree
Showing 9,320 changed files with 1,178,215 additions and 0 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
39 changes: 39 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
[Ll]ibrary/
[Tt]emp/
[Oo]bj/
[Bb]uild/
[Bb]uilds/
Assets/AssetStoreTools*
Assets/Scenes/Level*/*
Assets/Scenes/Training*/*
Assets/StatisticsData/*

# Visual Studio cache directory
.vs/

# Autogenerated VS/MD/Consulo solution and project files
ExportedObj/
.consulo/
*.csproj
*.unityproj
*.sln
*.suo
*.tmp
*.user
*.userprefs
*.pidb
*.booproj
*.svd
*.pdb
*.opendb

# Unity3D generated meta files
*.pidb.meta
*.pdb.meta

# Unity3D Generated File On Crash Reports
sysinfo.txt

# Builds
*.apk
*.unitypackage
8 changes: 8 additions & 0 deletions Assets/!SCI_FI_Modular_Pack_Free.meta

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

20 changes: 20 additions & 0 deletions Assets/!SCI_FI_Modular_Pack_Free/AdditiveTint.shader
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
Shader "Additive Tint" {

Properties {
_Color ("Main Color", Color) = (1,1,1,1)
_MainTex ("Texture", 2D) = ""
}

SubShader {
Tags {Queue = Transparent}
Blend One One
ZWrite Off
Pass {
SetTexture[_MainTex] {
constantColor [_Color]
Combine texture * constant
}
}
}

}
7 changes: 7 additions & 0 deletions Assets/!SCI_FI_Modular_Pack_Free/AdditiveTint.shader.meta

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

9 changes: 9 additions & 0 deletions Assets/!SCI_FI_Modular_Pack_Free/FBX.meta

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

Binary file not shown.
76 changes: 76 additions & 0 deletions Assets/!SCI_FI_Modular_Pack_Free/FBX/Sample_LightCone.FBX.meta

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

Binary file not shown.
Loading

0 comments on commit 56db1c9

Please sign in to comment.