Skip to content

Commit

Permalink
Merge pull request #60 from dkavolis/unity
Browse files Browse the repository at this point in the history
Platform specific shaders
  • Loading branch information
dkavolis authored May 12, 2019
2 parents 75adb1f + 0d2d258 commit 14ec1fd
Show file tree
Hide file tree
Showing 44 changed files with 2,054 additions and 259 deletions.
73 changes: 73 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,76 @@ releases

// unignore Debug build DLLs
!bin/[Dd]ebug/[Ff]erram*.dll

# Unity
# This .gitignore file should be placed at the root of your Unity project directory

Unity/FerramAerospaceResearch*/[Ll]ibrary/
Unity/FerramAerospaceResearch*/[Tt]emp/
Unity/FerramAerospaceResearch*/[Oo]bj/
Unity/FerramAerospaceResearch*/[Bb]uild/
Unity/FerramAerospaceResearch*/[Bb]uilds/
Unity/FerramAerospaceResearch*/[Ll]ogs/

# Never ignore Asset meta data
!Unity/FerramAerospaceResearch*/[Aa]ssets/**/*.meta
**/*.dll.*[Cc]ode*

# Uncomment this line if you wish to ignore the asset store tools plugin
# /[Aa]ssets/AssetStoreTools*

# TextMesh Pro files
Unity/FerramAerospaceResearch*/[Aa]ssets/TextMesh*Pro/

# Visual Studio cache directory
.vs/

# Gradle cache directory
.gradle/

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

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

# Unity3D generated file on crash reports
sysinfo.txt

# Builds
*.apk
*.unitypackage

# Crashlytics generated file
crashlytics-build.properties

# KSP
Unity/FerramAerospaceResearch*/[Aa]ssets/Plugins/KSPAssets
Unity/FerramAerospaceResearch*/[Aa]ssets/PartTools
Unity/FerramAerospaceResearch*/[Aa]ssets/SquadCore

# External editor scripts
Unity/FerramAerospaceResearch*/[Aa]ssets/Editor/**/*
!Unity/FerramAerospaceResearch*/[Aa]ssets/Editor/Bundle.cs
!Unity/FerramAerospaceResearch*/[Aa]ssets/Editor/Assets.cs

# Rider generated files in Unity directory
Unity/FerramAerospaceResearch*/[Aa]ssets/Plugins/Editor*
Unity/FerramAerospaceResearch*/.idea
115 changes: 0 additions & 115 deletions Assets/Materials/FARGraphMaterial.mat

This file was deleted.

78 changes: 0 additions & 78 deletions Assets/Materials/FARVoxelMeshMaterial.mat

This file was deleted.

Loading

0 comments on commit 14ec1fd

Please sign in to comment.