Merge remote-tracking branch 'upstream/experimentals' into newbits
author Gerry1135
()
committer Gerry1135
()
commit a99211b1ec24ae4f3896bc56dc1d289665ca0860
tree 7eadc1274930b235b0a75cae800eddea788b8492
parent 851b5d407cc49460056c57815a3b7d83b2a01f72
parent 65b43ea1b5adfc159f5a7130f7a6b0fff54b000b
Merge remote-tracking branch 'upstream/experimentals' into newbits
103 files changed:
.gitignore
Assets/Images.meta [ new file with mode 0644 ]
Assets/Images/app-launcher-icon.psd.meta [ new file with mode 0644 ]
Assets/Images/flight-menu-background.psd.meta [ new file with mode 0644 ]
Assets/Images/ui-drop-down.psd.meta [ new file with mode 0644 ]
Assets/PartTools.meta [ new file with mode 0644 ]
Assets/PartTools/Editor.meta [ new file with mode 0644 ]
Assets/PartTools/Editor/InternalSpaceEditor.cs.meta [ new file with mode 0644 ]
Assets/PartTools/Editor/KSPParticleEmitterEditor.cs.meta [ new file with mode 0644 ]
Assets/PartTools/Editor/PartToolsEditor.cs.meta [ new file with mode 0644 ]
Assets/PartTools/Editor/PartToolsWindows.cs.meta [ new file with mode 0644 ]
Assets/PartTools/Editor/PropEditor.cs.meta [ new file with mode 0644 ]
Assets/PartTools/Lib.meta [ new file with mode 0644 ]
Assets/PartTools/Lib/PartTools.dll.meta [ new file with mode 0644 ]
Assets/PartTools/Lib/PartToolsEditor.dll.meta [ new file with mode 0644 ]
Assets/PartTools/Shaders.meta [ new file with mode 0644 ]
Assets/PartTools/Shaders/Alpha.shader.meta [ new file with mode 0644 ]
Assets/PartTools/Shaders/AlphaAdditive.shader.meta [ new file with mode 0644 ]
Assets/PartTools/Shaders/AlphaSpecular.shader.meta [ new file with mode 0644 ]
Assets/PartTools/Shaders/Bumped.shader.meta [ new file with mode 0644 ]
Assets/PartTools/Shaders/BumpedSpecular.shader.meta [ new file with mode 0644 ]
Assets/PartTools/Shaders/Cutoff.shader.meta [ new file with mode 0644 ]
Assets/PartTools/Shaders/CutoffBumped.shader.meta [ new file with mode 0644 ]
Assets/PartTools/Shaders/DepthMask.shader.meta [ new file with mode 0644 ]
Assets/PartTools/Shaders/Diffuse.shader.meta [ new file with mode 0644 ]
Assets/PartTools/Shaders/Emissive.shader.meta [ new file with mode 0644 ]
Assets/PartTools/Shaders/EmissiveBumpedSpecular.shader.meta [ new file with mode 0644 ]
Assets/PartTools/Shaders/EmissiveSpecular.shader.meta [ new file with mode 0644 ]
Assets/PartTools/Shaders/InternalBumpedSpecular 1.shader.meta [ new file with mode 0644 ]
Assets/PartTools/Shaders/InternalBumpedSpecular.shader.meta [ new file with mode 0644 ]
Assets/PartTools/Shaders/KSPParticle AddSmooth.shader.meta [ new file with mode 0644 ]
Assets/PartTools/Shaders/LightingKSP.cginc.meta [ new file with mode 0644 ]
Assets/PartTools/Shaders/LightwrapSpecular.shader.meta [ new file with mode 0644 ]
Assets/PartTools/Shaders/PBR.meta [ new file with mode 0644 ]
Assets/PartTools/Shaders/PBR/KSP_Standard_Bumped.shader.meta [ new file with mode 0644 ]
Assets/PartTools/Shaders/ParticleAdd.shader.meta [ new file with mode 0644 ]
Assets/PartTools/Shaders/ParticleAdditiveFresnel.shader.meta [ new file with mode 0644 ]
Assets/PartTools/Shaders/ParticleAlpha.shader.meta [ new file with mode 0644 ]
Assets/PartTools/Shaders/ScrollingUnlit.shader.meta [ new file with mode 0644 ]
Assets/PartTools/Shaders/SolidColorAlpha.shader.meta [ new file with mode 0644 ]
Assets/PartTools/Shaders/Specular.shader.meta [ new file with mode 0644 ]
Assets/PartTools/Shaders/SpecularBumpTransparent.shader.meta [ new file with mode 0644 ]
Assets/PartTools/Shaders/SpecularTransparent.shader.meta [ new file with mode 0644 ]
Assets/PartTools/Shaders/Unlit.shader.meta [ new file with mode 0644 ]
Assets/PartTools/Shaders/UnlitColor.shader.meta [ new file with mode 0644 ]
Assets/PartTools/Shaders/UnlitTransparent.shader.meta [ new file with mode 0644 ]
Assets/Parts.meta [ new file with mode 0644 ]
Assets/Parts/EngineerChip.meta [ new file with mode 0644 ]
Assets/Parts/EngineerChip/EngineerChip.dae.meta [ new file with mode 0644 ]
Assets/Parts/EngineerChip/EngineerChip.mat.meta [ new file with mode 0644 ]
Assets/Parts/EngineerChip/EngineerChip.png.meta [ new file with mode 0644 ]
Assets/Parts/EngineerChip/EngineerChip.prefab.meta [ new file with mode 0644 ]
Assets/Plugins.meta [ new file with mode 0644 ]
Assets/Plugins/KSPAssets.meta [ new file with mode 0644 ]
Assets/Plugins/KSPAssets/KSPAssetCompiler.dll.meta [ new file with mode 0644 ]
Assets/Plugins/KSPAssets/KSPAssets.dll.meta [ new file with mode 0644 ]
Assets/Plugins/KSPAssets/ReadMe.txt.meta [ new file with mode 0644 ]
Assets/Plugins/KerbalEngineer.Unity.dll.meta [ new file with mode 0644 ]
Assets/Prefabs.meta [ new file with mode 0644 ]
Assets/Prefabs/FlightMenu.prefab.meta [ new file with mode 0644 ]
Assets/Prefabs/FlightMenuSection.prefab.meta [ new file with mode 0644 ]
Assets/Prefabs/Setting.prefab.meta [ new file with mode 0644 ]
Assets/Prefabs/SettingButton.prefab.meta [ new file with mode 0644 ]
Assets/Prefabs/SettingToggle.prefab.meta [ new file with mode 0644 ]
Assets/Prefabs/Window.prefab.meta [ new file with mode 0644 ]
Assets/Scenes.meta [ new file with mode 0644 ]
Assets/Scenes/main.unity.meta [ new file with mode 0644 ]
Assets/Scenes/parts.unity.meta [ new file with mode 0644 ]
Assets/Scripts.meta [ new file with mode 0644 ]
Assets/Scripts/Editor.meta [ new file with mode 0644 ]
Assets/Scripts/Editor/BuildAssetBundles.cs.meta [ new file with mode 0644 ]
Assets/SquadCore.meta [ new file with mode 0644 ]
Assets/SquadCore/KSPedia.meta [ new file with mode 0644 ]
Assets/SquadCore/KSPedia/Backgrounds.meta [ new file with mode 0644 ]
Assets/SquadCore/KSPedia/Backgrounds/BackgroundBlack.png.meta [ new file with mode 0644 ]
Assets/SquadCore/KSPedia/Backgrounds/BackgroundBlue.png.meta [ new file with mode 0644 ]
Assets/SquadCore/KSPedia/Backgrounds/BackgroundBlueGrid.png.meta [ new file with mode 0644 ]
Assets/SquadCore/KSPedia/Backgrounds/BackgroundKSC.png.meta [ new file with mode 0644 ]
Assets/SquadCore/KSPedia/Backgrounds/BackgroundWhite.png.meta [ new file with mode 0644 ]
Assets/SquadCore/Shaders.meta [ new file with mode 0644 ]
Assets/SquadCore/Shaders/Alpha.shader.meta [ new file with mode 0644 ]
Assets/SquadCore/Shaders/AlphaSpecular.shader.meta [ new file with mode 0644 ]
Assets/SquadCore/Shaders/Bumped.shader.meta [ new file with mode 0644 ]
Assets/SquadCore/Shaders/BumpedSpecular.shader.meta [ new file with mode 0644 ]
Assets/SquadCore/Shaders/Cutoff.shader.meta [ new file with mode 0644 ]
Assets/SquadCore/Shaders/CutoffBumped.shader.meta [ new file with mode 0644 ]
Assets/SquadCore/Shaders/Diffuse.shader.meta [ new file with mode 0644 ]
Assets/SquadCore/Shaders/Emissive.shader.meta [ new file with mode 0644 ]
Assets/SquadCore/Shaders/EmissiveBumpedSpecular.shader.meta [ new file with mode 0644 ]
Assets/SquadCore/Shaders/EmissiveSpecular.shader.meta [ new file with mode 0644 ]
Assets/SquadCore/Shaders/KSPParticle AddSmooth.shader.meta [ new file with mode 0644 ]
Assets/SquadCore/Shaders/ParticleAdd.shader.meta [ new file with mode 0644 ]
Assets/SquadCore/Shaders/ParticleAlpha.shader.meta [ new file with mode 0644 ]
Assets/SquadCore/Shaders/SolidColorAlpha.shader.meta [ new file with mode 0644 ]
Assets/SquadCore/Shaders/Specular.shader.meta [ new file with mode 0644 ]
Assets/SquadCore/Shaders/SpecularBumpTransparent.shader.meta [ new file with mode 0644 ]
Assets/SquadCore/Shaders/SpecularTransparent.shader.meta [ new file with mode 0644 ]
Assets/SquadCore/Shaders/Unlit.shader.meta [ new file with mode 0644 ]
Assets/SquadCore/Shaders/UnlitTransparent.shader.meta [ new file with mode 0644 ]
Assets/Testing.meta [ new file with mode 0644 ]
Assets/Testing/background-editor.png.meta [ new file with mode 0644 ]
Assets/Testing/background-flight.png.meta [ new file with mode 0644 ]
Assets/XML.meta [ new file with mode 0644 ]