Merge branch 'experimentals' into newbits
author Gerry1135
()
committer Gerry1135
()
commit 03d3f2c1cd93779cb1b01a41daac022e766fd69f
tree ff3920c04bc1447462f08cc1513f8f54fe407a24
parent c9aa19dc90d41c3b9b6ab72c27695ba92b347ef0
parent 5c557f5a34fb14fe2a0c9b0f5ea48c2b8be7a012
Merge branch 'experimentals' into newbits
86 files changed:
Assets/PartTools/Editor/InternalSpaceEditor.cs [ new file with mode 0644 ]
Assets/PartTools/Editor/KSPParticleEmitterEditor.cs [ new file with mode 0644 ]
Assets/PartTools/Editor/PartToolsEditor.cs [ new file with mode 0644 ]
Assets/PartTools/Editor/PartToolsWindows.cs [ new file with mode 0644 ]
Assets/PartTools/Editor/PropEditor.cs [ new file with mode 0644 ]
Assets/PartTools/Lib/PartTools.dll [ new file with mode 0644 ]
Assets/PartTools/Lib/PartToolsEditor.dll [ new file with mode 0644 ]
Assets/PartTools/Shaders/Alpha.shader [ new file with mode 0644 ]
Assets/PartTools/Shaders/AlphaAdditive.shader [ new file with mode 0644 ]
Assets/PartTools/Shaders/AlphaSpecular.shader [ new file with mode 0644 ]
Assets/PartTools/Shaders/Bumped.shader [ new file with mode 0644 ]
Assets/PartTools/Shaders/BumpedSpecular.shader [ new file with mode 0644 ]
Assets/PartTools/Shaders/Cutoff.shader [ new file with mode 0644 ]
Assets/PartTools/Shaders/CutoffBumped.shader [ new file with mode 0644 ]
Assets/PartTools/Shaders/DepthMask.shader [ new file with mode 0644 ]
Assets/PartTools/Shaders/Diffuse.shader [ new file with mode 0644 ]
Assets/PartTools/Shaders/Emissive.shader [ new file with mode 0644 ]
Assets/PartTools/Shaders/EmissiveBumpedSpecular.shader [ new file with mode 0644 ]
Assets/PartTools/Shaders/EmissiveSpecular.shader [ new file with mode 0644 ]
Assets/PartTools/Shaders/InternalBumpedSpecular 1.shader [ new file with mode 0644 ]
Assets/PartTools/Shaders/InternalBumpedSpecular.shader [ new file with mode 0644 ]
Assets/PartTools/Shaders/KSPParticle AddSmooth.shader [ new file with mode 0644 ]
Assets/PartTools/Shaders/LightingKSP.cginc [ new file with mode 0644 ]
Assets/PartTools/Shaders/LightwrapSpecular.shader [ new file with mode 0644 ]
Assets/PartTools/Shaders/PBR/KSP_Standard_Bumped.shader [ new file with mode 0644 ]
Assets/PartTools/Shaders/ParticleAdd.shader [ new file with mode 0644 ]
Assets/PartTools/Shaders/ParticleAdditiveFresnel.shader [ new file with mode 0644 ]
Assets/PartTools/Shaders/ParticleAlpha.shader [ new file with mode 0644 ]
Assets/PartTools/Shaders/ScrollingUnlit.shader [ new file with mode 0644 ]
Assets/PartTools/Shaders/SolidColorAlpha.shader [ new file with mode 0644 ]
Assets/PartTools/Shaders/Specular.shader [ new file with mode 0644 ]
Assets/PartTools/Shaders/SpecularBumpTransparent.shader [ new file with mode 0644 ]
Assets/PartTools/Shaders/SpecularTransparent.shader [ new file with mode 0644 ]
Assets/PartTools/Shaders/Unlit.shader [ new file with mode 0644 ]
Assets/PartTools/Shaders/UnlitColor.shader [ new file with mode 0644 ]
Assets/PartTools/Shaders/UnlitTransparent.shader [ new file with mode 0644 ]
Assets/Parts/EngineerChip/EngineerChip.dae [ moved from Output/KerbalEngineer/Parts/EngineerChip/EngineerChip.dae with 100%% similarity ]
Assets/Parts/EngineerChip/EngineerChip.mat [ new file with mode 0644 ]
Assets/Parts/EngineerChip/EngineerChip.png [ moved from Output/KerbalEngineer/Parts/EngineerChip/textures/EngineerChipHighRes.png with 100%% similarity ]
Assets/Parts/EngineerChip/EngineerChip.prefab [ new file with mode 0644 ]
Assets/Plugins/KSPAssets/KSPAssetCompiler.dll [ new file with mode 0644 ]
Assets/Plugins/KSPAssets/KSPAssets.dll [ new file with mode 0644 ]
Assets/Plugins/KSPAssets/ReadMe.txt [ new file with mode 0644 ]
Assets/Plugins/KerbalEngineer.Unity.dll
Assets/Scenes/parts.unity [ new file with mode 0644 ]
Assets/SquadCore/KSPedia/Backgrounds/BackgroundBlack.png [ new file with mode 0644 ]
Assets/SquadCore/KSPedia/Backgrounds/BackgroundBlue.png [ new file with mode 0644 ]
Assets/SquadCore/KSPedia/Backgrounds/BackgroundBlueGrid.png [ new file with mode 0644 ]
Assets/SquadCore/KSPedia/Backgrounds/BackgroundKSC.png [ new file with mode 0644 ]
Assets/SquadCore/KSPedia/Backgrounds/BackgroundWhite.png [ new file with mode 0644 ]
Assets/SquadCore/Shaders/Alpha.shader [ new file with mode 0644 ]
Assets/SquadCore/Shaders/AlphaSpecular.shader [ new file with mode 0644 ]
Assets/SquadCore/Shaders/Bumped.shader [ new file with mode 0644 ]
Assets/SquadCore/Shaders/BumpedSpecular.shader [ new file with mode 0644 ]
Assets/SquadCore/Shaders/Cutoff.shader [ new file with mode 0644 ]
Assets/SquadCore/Shaders/CutoffBumped.shader [ new file with mode 0644 ]
Assets/SquadCore/Shaders/Diffuse.shader [ new file with mode 0644 ]
Assets/SquadCore/Shaders/Emissive.shader [ new file with mode 0644 ]
Assets/SquadCore/Shaders/EmissiveBumpedSpecular.shader [ new file with mode 0644 ]
Assets/SquadCore/Shaders/EmissiveSpecular.shader [ new file with mode 0644 ]
Assets/SquadCore/Shaders/KSPParticle AddSmooth.shader [ new file with mode 0644 ]
Assets/SquadCore/Shaders/ParticleAdd.shader [ new file with mode 0644 ]
Assets/SquadCore/Shaders/ParticleAlpha.shader [ new file with mode 0644 ]
Assets/SquadCore/Shaders/SolidColorAlpha.shader [ new file with mode 0644 ]
Assets/SquadCore/Shaders/Specular.shader [ new file with mode 0644 ]
Assets/SquadCore/Shaders/SpecularBumpTransparent.shader [ new file with mode 0644 ]
Assets/SquadCore/Shaders/SpecularTransparent.shader [ new file with mode 0644 ]
Assets/SquadCore/Shaders/Unlit.shader [ new file with mode 0644 ]
Assets/SquadCore/Shaders/UnlitTransparent.shader [ new file with mode 0644 ]
Documents/CHANGES.txt
KerbalEngineer.CSharp.Editor.csproj
KerbalEngineer/EngineerGlobals.cs
KerbalEngineer/Flight/Readouts/ReadoutLibrary.cs
KerbalEngineer/Flight/Readouts/Surface/AltitudeTerrain.cs
KerbalEngineer/VesselSimulator/PartSim.cs
Output/KerbalEngineer/KerbalEngineer.Unity.dll
Output/KerbalEngineer/KerbalEngineer.dll
Output/KerbalEngineer/KerbalEngineer.version
Output/KerbalEngineer/Parts/EngineerChip/EngineerChip.cfg [ moved from Output/KerbalEngineer/Parts/EngineerChip/part.cfg with 94%% similarity ]
Output/KerbalEngineer/Parts/EngineerChip/EngineerChip.mu [ new file with mode 0644 ]
Output/KerbalEngineer/Parts/EngineerChip/EngineerChip.png [ new file with mode 0644 ]
Output/KerbalEngineer/Parts/EngineerChip/mesh/mesh1.msh [ deleted file ]
Output/KerbalEngineer/Parts/EngineerChip/mesh/mesh2.msh [ deleted file ]
Output/KerbalEngineer/Parts/EngineerChip/mesh/model.mdl [ deleted file ]
Output/KerbalEngineer/Parts/EngineerChip/mesh/tangents.v4 [ deleted file ]
PartTools.cfg [ new file with mode 0644 ]