Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
allista committed May 3, 2020
2 parents 3cdf51e + 1d968a2 commit e9e530b
Show file tree
Hide file tree
Showing 479 changed files with 37,079 additions and 44 deletions.
86 changes: 45 additions & 41 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,57 +1,61 @@
/C:
/KSP_test*
/KSP_API
/Resources
/Sounds
/Temp
/Routes
/GameData/Hangar/Plugins/PluginData/Hangar/config.xml
/Releases/*
/Screenshots/**
/UserManual/**
/Debugging/**
/AssetsVariants/**
/DesaturatedTexturePack/GameData/**
/EngineSim/**
/**/obj/**
/**/cache/**
/**/bin/**
/Assets/**/Materials/*__*.mat
C:
KSP_test*
KSP_API
Resources
Sounds
Temp
Routes
GameData/Hangar/Plugins/PluginData/Hangar/config.xml
Releases/*
Screenshots/**
UserManual/**
Debugging/**
AssetsVariants/**
DesaturatedTexturePack/GameData/**
EngineSim/**
**/obj/**
**/cache/**
**/bin/**
Assets/**/Materials/*__*.mat*
Assets/Tests/
*~
*.swp
*.blend1
*.log
*.meta
*.mdb
*.pyc
*.bak
*.pdb
/vessel_positioning.txt
/Source/Hangar.userprefs
/Assembly-CSharp.dump
*.blend1.meta
vessel_positioning.txt
Source/Hangar.userprefs
Assembly-CSharp.dump

/Assets/Textures/*.png
/Assets/Textures/sources/
/Assets/Plugins/
/Assets/SquadCore/
/Assets/bbox/
/Assets/ThirdParty/
/Assets/PartTools*
/Library/
/ProjectSettings/
/PartTools.cfg
Assets/Textures/*.png
Assets/Textures/sources/
Assets/Plugins/KSPAssets/
Assets/Plugins/KSPAssets.meta
Assets/SquadCore/
Assets/SquadCore.meta
Assets/bbox/
Assets/ThirdParty/
Assets/PartTools*
Library/
ProjectSettings/
PartTools.cfg

.idea/
/MassCalc/*_map.py
/MassCalc/Kerbin*.py
/MassCalc/path.py
/Assets/GroundConstruction
/Development-files
/GameData/Hangar/Plugins/Hangar.dll
MassCalc/*_map.py
MassCalc/Kerbin*.py
MassCalc/path.py
Assets/GroundConstruction
Development-files
GameData/Hangar/Plugins/Hangar.dll

Hangar-Gendarme-Report.html
Assets/TextMesh Pro
UnityPackageManager
/Assembly-CSharp*
Assembly-CSharp*
**/UserPrefs.xml
/Hangar.sln
Hangar.sln
Packages/manifest.json
5 changes: 5 additions & 0 deletions Assets/Animations.meta

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

4 changes: 4 additions & 0 deletions Assets/Animations/asteroid-cabin-light.anim.meta

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

4 changes: 4 additions & 0 deletions Assets/Animations/asteroid-clamp.anim.meta

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

4 changes: 4 additions & 0 deletions Assets/Animations/asteroid-gateway-lights.anim.meta

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

4 changes: 4 additions & 0 deletions Assets/Animations/asteroid-hatch-fix.anim.meta

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

4 changes: 4 additions & 0 deletions Assets/Animations/asteroid-hatch-lights.anim.meta

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

8 changes: 8 additions & 0 deletions Assets/Animations/asteroid-hatch-port-adapter-light.anim.meta

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

8 changes: 8 additions & 0 deletions Assets/Animations/black-white-emissive.anim.meta

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

4 changes: 4 additions & 0 deletions Assets/Animations/converter-animation.anim.meta

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

4 changes: 4 additions & 0 deletions Assets/Animations/drill-animation.anim.meta

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

4 changes: 4 additions & 0 deletions Assets/Animations/engine.anim.meta

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

4 changes: 4 additions & 0 deletions Assets/Animations/grapple-lights.anim.meta

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

4 changes: 4 additions & 0 deletions Assets/Animations/hangar1-lights.anim.meta

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

4 changes: 4 additions & 0 deletions Assets/Animations/inflatable-door.anim.meta

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

8 changes: 8 additions & 0 deletions Assets/Animations/inflatable-space-hangar-gates.anim.meta

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

8 changes: 8 additions & 0 deletions Assets/Animations/inflatable-space-hangar-inflate.anim.meta

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

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

8 changes: 8 additions & 0 deletions Assets/Animations/inflatable-space-hangar-lights.anim.meta

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

8 changes: 8 additions & 0 deletions Assets/Animations/lamp-light.anim.meta

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

4 changes: 4 additions & 0 deletions Assets/Animations/lights.anim.meta

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

4 changes: 4 additions & 0 deletions Assets/Animations/recycler-lights.anim.meta

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

4 changes: 4 additions & 0 deletions Assets/Animations/rover-hangar1-lights.anim.meta

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

8 changes: 8 additions & 0 deletions Assets/Animations/screw-bolt.anim.meta

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

4 changes: 4 additions & 0 deletions Assets/Animations/spaceport-lights.anim.meta

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

8 changes: 8 additions & 0 deletions Assets/Animations/structural-grapple.anim.meta

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

5 changes: 5 additions & 0 deletions Assets/Editor.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/GroundConstruction.meta

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

5 changes: 5 additions & 0 deletions Assets/Materials.meta

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

4 changes: 4 additions & 0 deletions Assets/Materials/adapter.mat.meta

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

4 changes: 4 additions & 0 deletions Assets/Materials/adapters.mat.meta

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

4 changes: 4 additions & 0 deletions Assets/Materials/airbrake.mat.meta

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

4 changes: 4 additions & 0 deletions Assets/Materials/asteroid-gateway-cabin-lamp.mat.meta

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

4 changes: 4 additions & 0 deletions Assets/Materials/asteroid-gateway-cabin.mat.meta

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

77 changes: 77 additions & 0 deletions Assets/Materials/asteroid-gateway-cabins.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: asteroid-gateway-cabins
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
8 changes: 8 additions & 0 deletions Assets/Materials/asteroid-gateway-cabins.mat.meta

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

Loading

0 comments on commit e9e530b

Please sign in to comment.