Collider fix

-fix colliders for apollo iu and csm dec
KSP-RO · Jun 26, 2016 · 00dcfa8 · 00dcfa8
1 parent 5f4c308
commit 00dcfa8
Show file tree

Hide file tree

Showing 35 changed files with 223 additions and 5 deletions.
diff --git a/GameData/FASA/Apollo/ApolloCSM/FASA_Apollo_CSM_Dec.mu b/GameData/FASA/Apollo/ApolloCSM/FASA_Apollo_CSM_Dec.mu
diff --git a/GameData/FASA/Apollo/FASA_Apollo_Str/Apollo_IU.mu b/GameData/FASA/Apollo/FASA_Apollo_Str/Apollo_IU.mu
diff --git a/Source/Unity Projects/FASA_SHARE/Assets/Apollo/Apollo_CM.unity b/Source/Unity Projects/FASA_SHARE/Assets/Apollo/Apollo_CM.unity
diff --git a/Source/Unity Projects/FASA_SHARE/Assets/Apollo/FBX/Apollo_CSM_Dec.FBX b/Source/Unity Projects/FASA_SHARE/Assets/Apollo/FBX/Apollo_CSM_Dec.FBX
diff --git a/Source/Unity Projects/FASA_SHARE/Assets/Apollo/FBX/Apollo_CSM_Dec.FBX.meta b/Source/Unity Projects/FASA_SHARE/Assets/Apollo/FBX/Apollo_CSM_Dec.FBX.meta
diff --git a/Source/Unity Projects/FASA_SHARE/Assets/Apollo/FBX/Apollo_IU.FBX b/Source/Unity Projects/FASA_SHARE/Assets/Apollo/FBX/Apollo_IU.FBX
diff --git a/Source/Unity Projects/FASA_SHARE/Assets/Apollo/FBX/Apollo_IU.FBX.meta b/Source/Unity Projects/FASA_SHARE/Assets/Apollo/FBX/Apollo_IU.FBX.meta
diff --git a/Source/Unity Projects/FASA_SHARE/Assets/Apollo/FBX/Apollo_IU.fbm.meta b/Source/Unity Projects/FASA_SHARE/Assets/Apollo/FBX/Apollo_IU.fbm.meta
diff --git a/Source/Unity Projects/FASA_SHARE/Assets/Apollo/FBX/Materials/FueltankShortMat.mat b/Source/Unity Projects/FASA_SHARE/Assets/Apollo/FBX/Materials/FueltankShortMat.mat
diff --git a/Source/Unity Projects/FASA_SHARE/Assets/Apollo/FBX/Materials/FueltankShortMat.mat.meta b/Source/Unity Projects/FASA_SHARE/Assets/Apollo/FBX/Materials/FueltankShortMat.mat.meta
diff --git a/Source/Unity Projects/FASA_SHARE/Assets/Apollo/FBX/Materials/FueltankShortMat_ncl1_1.mat b/Source/Unity Projects/FASA_SHARE/Assets/Apollo/FBX/Materials/FueltankShortMat_ncl1_1.mat
diff --git a/...ce/Unity Projects/FASA_SHARE/Assets/Apollo/FBX/Materials/FueltankShortMat_ncl1_1.mat.meta b/...ce/Unity Projects/FASA_SHARE/Assets/Apollo/FBX/Materials/FueltankShortMat_ncl1_1.mat.meta
diff --git a/Source/Unity Projects/FASA_SHARE/Assets/Apollo/Thumbs.db b/Source/Unity Projects/FASA_SHARE/Assets/Apollo/Thumbs.db
diff --git a/Source/Unity Projects/FASA_SHARE/Assets/Gemini/Textures/Gemini_BigG_Sci_Props_Int.zip.meta b/Source/Unity Projects/FASA_SHARE/Assets/Gemini/Textures/Gemini_BigG_Sci_Props_Int.zip.meta
diff --git a/Source/Unity Projects/FASA_SHARE/Assets/Gemini/Textures/Gemini_Pod_Int.zip.meta b/Source/Unity Projects/FASA_SHARE/Assets/Gemini/Textures/Gemini_Pod_Int.zip.meta
diff --git a/...ARE/Assets/Mercury/Textures/Atlas_LFT_Long (Nick V's conflicted copy 2016-02-19).psd.meta b/...ARE/Assets/Mercury/Textures/Atlas_LFT_Long (Nick V's conflicted copy 2016-02-19).psd.meta
diff --git a/Source/Unity Projects/FASA_SHARE/Library/CurrentLayout.dwlt b/Source/Unity Projects/FASA_SHARE/Library/CurrentLayout.dwlt
diff --git a/Source/Unity Projects/FASA_SHARE/Library/InspectorExpandedItems.asset b/Source/Unity Projects/FASA_SHARE/Library/InspectorExpandedItems.asset
diff --git a/Source/Unity Projects/FASA_SHARE/Library/assetDatabase3 b/Source/Unity Projects/FASA_SHARE/Library/assetDatabase3
diff --git a/Source/Unity Projects/FASA_SHARE/Library/expandedItems b/Source/Unity Projects/FASA_SHARE/Library/expandedItems
diff --git a/Source/Unity Projects/FASA_SHARE/Library/guidmapper b/Source/Unity Projects/FASA_SHARE/Library/guidmapper
diff --git a/Source/Unity Projects/FASA_SHARE/Library/metadata/1d/1d51d8bafb1b508438e9f71255eaa038 b/Source/Unity Projects/FASA_SHARE/Library/metadata/1d/1d51d8bafb1b508438e9f71255eaa038
diff --git a/Source/Unity Projects/FASA_SHARE/Library/metadata/25/25f1d12dccf5bef4e9b562e5bc111fac b/Source/Unity Projects/FASA_SHARE/Library/metadata/25/25f1d12dccf5bef4e9b562e5bc111fac
diff --git a/Source/Unity Projects/FASA_SHARE/Library/metadata/2b/2b0a12f55a43e1b4e96db97381fc29c5 b/Source/Unity Projects/FASA_SHARE/Library/metadata/2b/2b0a12f55a43e1b4e96db97381fc29c5
diff --git a/Source/Unity Projects/FASA_SHARE/Library/metadata/2d/2dbaaad399d0cd540909d5cc12fb00a4 b/Source/Unity Projects/FASA_SHARE/Library/metadata/2d/2dbaaad399d0cd540909d5cc12fb00a4
diff --git a/Source/Unity Projects/FASA_SHARE/Library/metadata/43/43370d99fbd43634183b6b1e24ffadf6 b/Source/Unity Projects/FASA_SHARE/Library/metadata/43/43370d99fbd43634183b6b1e24ffadf6
diff --git a/Source/Unity Projects/FASA_SHARE/Library/metadata/4d/4dfd2e55a0825564089770d391015a88 b/Source/Unity Projects/FASA_SHARE/Library/metadata/4d/4dfd2e55a0825564089770d391015a88
diff --git a/Source/Unity Projects/FASA_SHARE/Library/metadata/6c/6c9488270a43d394cb31d8a5a67a81e8 b/Source/Unity Projects/FASA_SHARE/Library/metadata/6c/6c9488270a43d394cb31d8a5a67a81e8
diff --git a/Source/Unity Projects/FASA_SHARE/Library/metadata/92/92fc2cdee8a2b7847b6722bbe5456fca b/Source/Unity Projects/FASA_SHARE/Library/metadata/92/92fc2cdee8a2b7847b6722bbe5456fca
diff --git a/Source/Unity Projects/FASA_SHARE/Library/metadata/9d/9db5a15e1f6357247986df3814afd868 b/Source/Unity Projects/FASA_SHARE/Library/metadata/9d/9db5a15e1f6357247986df3814afd868
diff --git a/...201 (Nick V's conflicted copy 2016-02-19) → ...adata/bc/bcffe0a4e27ad5a4ca1fc5a17fdf4597 b/...201 (Nick V's conflicted copy 2016-02-19) → ...adata/bc/bcffe0a4e27ad5a4ca1fc5a17fdf4597
diff --git a/Source/Unity Projects/FASA_SHARE/Library/metadata/e6/e61c071fa588b884290b30c650aa9ef3 b/Source/Unity Projects/FASA_SHARE/Library/metadata/e6/e61c071fa588b884290b30c650aa9ef3
diff --git a/Source/Unity Projects/FASA_SHARE/Library/metadata/ec/eca815ed7cd0f684cb8ba789bc2d79fb b/Source/Unity Projects/FASA_SHARE/Library/metadata/ec/eca815ed7cd0f684cb8ba789bc2d79fb
diff --git a/Source/Unity Projects/FASA_SHARE/Library/metadata/fc/fc5fbe85b5dc1114f8b90269c6da423e b/Source/Unity Projects/FASA_SHARE/Library/metadata/fc/fc5fbe85b5dc1114f8b90269c6da423e
diff --git a/Source/Unity Projects/FASA_SHARE/Library/shadercompiler-1.log b/Source/Unity Projects/FASA_SHARE/Library/shadercompiler-1.log
@@ -1,3 +1,3 @@
 Base path: C:/Program Files (x86)/Unity/Editor/Data
-Pipe name: \\.\pipe\UnityShaderCompiler-1-9052
+Pipe name: \\.\pipe\UnityShaderCompiler-1-10420
 Cmd: getPlatforms