Skip to content

Instantly share code, notes, and snippets.

@atduskgreg

atduskgreg/diff.log

Created Jul 1, 2016
Embed
What would you like to do?
greg@gabc:~/Documents/games/Scale5x (master)* [1.9.3]
→ git st
On branch master
Your branch is up-to-date with 'origin/master'.
Changes not staged for commit:
(use "git add/rm <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
deleted: Assets/3DModels/Islands/Island_Textured_Round_A.obj.meta
deleted: Assets/3DModels/Islands/Island_Textured_Square_A.obj.meta
deleted: Assets/3DModels/New folder.meta
modified: Assets/AllObjects.fbm.meta
modified: Assets/Demigiant/DOTween/DOTween.XML
modified: Assets/Demigiant/DOTween/DOTween43.dll.meta
modified: Assets/Demigiant/DOTween/DOTween43.xml
modified: Assets/Demigiant/DOTween/DOTween46.dll.meta
modified: Assets/Demigiant/DOTween/DOTween46.xml
modified: Assets/Demigiant/DOTween/DOTween50.dll.meta
modified: Assets/Demigiant/DOTween/DOTween50.xml
modified: Assets/Demigiant/DOTween/Editor/DOTweenEditor.XML
modified: Assets/Demigiant/DOTween/Editor/Imgs/Footer_dark.png.meta
modified: Assets/Demigiant/DOTween/readme.txt
deleted: Assets/MecanimControl/Demo/Model/Textures.meta
deleted: Assets/Mockups/Notecards.meta
deleted: Assets/ParticleScaler/Standard Assets.meta
modified: Assets/Plugins/Vectrosity/Editor/VectrosityEditor.dll.meta
modified: Assets/Plugins/Vectrosity/Resources/DefaultLine3D.mat
modified: Assets/Plugins/Vectrosity/Vectrosity.dll.meta
deleted: Assets/Portal/Scenes.meta
deleted: Assets/Portal/Textures.meta
deleted: Assets/Prefabs/Terrarium Pieces.meta
modified: Assets/ProCore/ProBuilder/About/Images/Banner.png.meta
modified: Assets/ProCore/ProBuilder/About/Images/ProBuilder_AssetStore_Icon_96px.png.meta
modified: Assets/ProCore/ProBuilder/About/Images/ProGrids_AssetStore_Icon_96px.png.meta
modified: Assets/ProCore/ProBuilder/About/Images/ProGroups_AssetStore_Icon_96px.png.meta
modified: Assets/ProCore/ProBuilder/About/Images/Prototype_AssetStore_Icon_96px.png.meta
modified: Assets/ProCore/ProBuilder/About/Images/QuickBrush_AssetStore_Icon_96px.png.meta
modified: Assets/ProCore/ProBuilder/About/Images/QuickDecals_AssetStore_Icon_96px.png.meta
modified: Assets/ProCore/ProBuilder/About/Images/QuickEdit_AssetStore_Icon_96px.png.meta
modified: Assets/ProCore/ProBuilder/Editor/MenuItems/Actions/pb_ExportObj.cs
modified: Assets/ProCore/ProBuilder/Editor/MenuItems/Geometry/pb_BridgeEdges.cs
modified: Assets/ProCore/ProBuilder/Editor/MenuItems/Geometry/pb_MergeFaces.cs
modified: Assets/ProCore/ProBuilder/Editor/MenuItems/Geometry/pb_MergeFaces.cs.meta
modified: Assets/ProCore/ProBuilder/Editor/MenuItems/Geometry/pb_VertexMergeWeld.cs
modified: Assets/ProCore/ProBuilder/Editor/MenuItems/Repair/pb_CleanLeakedMeshes.cs
modified: Assets/ProCore/ProBuilder/Editor/MenuItems/Repair/pb_ForceSceneRefresh.cs
modified: Assets/ProCore/ProBuilder/Editor/MenuItems/Repair/pb_RemoveDegenerateTris.cs
modified: Assets/ProCore/ProBuilder/Editor/MenuItems/Repair/pb_RepairColors.cs
modified: Assets/ProCore/ProBuilder/Editor/MenuItems/Repair/pb_RepairMeshReferences.cs
modified: Assets/ProCore/ProBuilder/Editor/MenuItems/Repair/pb_RepairMeshReferences.cs.meta
modified: Assets/ProCore/ProBuilder/Editor/MenuItems/Repair/pb_RepairUV.cs
modified: Assets/ProCore/ProBuilder/Editor/MenuItems/Repair/pb_ResetEntityMaterials.cs
modified: Assets/ProCore/ProBuilder/Editor/MenuItems/Selection/pb_EdgeSelection.cs
modified: Assets/ProCore/ProBuilder/Editor/MenuItems/Selection/pb_ExpandSelection.cs
modified: Assets/ProCore/ProBuilder/Editor/MenuItems/Selection/pb_InvertSelection.cs
modified: Assets/ProCore/ProBuilder/Editor/MenuItems/Selection/pb_MaterialSelection.cs
modified: Assets/ProCore/ProBuilder/Material/Textures/Checker.png.meta
modified: Assets/ProCore/ProBuilder/Material/Textures/VertOff.tga.meta
modified: Assets/ProCore/ProBuilder/Resources/GUI/camera-64x64-dark.png.meta
modified: Assets/ProCore/ProBuilder/Resources/GUI/camera-64x64.png.meta
modified: Assets/ProCore/ProBuilder/Resources/Materials/Collider.mat
modified: Assets/ProCore/ProBuilder/Resources/Materials/InvisibleFace.mat
modified: Assets/ProCore/ProBuilder/Resources/Materials/Trigger.mat
modified: Assets/ProCore/ProBuilder/Resources/Materials/UnlitVertexColor.mat
modified: Assets/ProCore/ProBuilder/Resources/Materials/UnlitVertexColor.mat.meta
modified: Assets/ProCore/ProBuilder/Resources/Textures/GridBox_Default.png.meta
modified: Assets/ProCore/ProBuilder/Shader/DiffuseTextureBlend.shader
modified: Assets/ProCore/ProBuilder/Shader/DiffuseTextureBlend.shader.meta
modified: Assets/ProCore/ProBuilder/Shader/DiffuseVertexColor.shader
modified: Assets/ProCore/ProBuilder/Shader/UnlitSolidColor.shader
modified: Assets/ProCore/ProBuilder/Shader/UnlitSolidColor.shader.meta
modified: Assets/ProCore/ProBuilder/Shader/pb_FaceHighlight.shader
modified: Assets/ProCore/ProBuilder/Shader/pb_FaceHighlight.shader.meta
modified: Assets/ProCore/ProBuilder/Shader/pb_TransparentOverlay.shader
modified: Assets/ProCore/ProBuilder/Shader/pb_UnlitVertexColor.shader
modified: Assets/ProCore/ProBuilder/Shader/pb_UnlitVertexColor.shader.meta
modified: Assets/ProCore/ProBuilder/readme.txt
deleted: Assets/QuickRopes 2.meta
deleted: Assets/Sample Assets/Audio.meta
deleted: Assets/Sample Assets/Effects/Image Effects (Pro Only)/Editor.meta
deleted: Assets/Sample Assets/Effects/Image Effects (Pro Only)/Scripts.meta
deleted: Assets/Sample Assets/Effects/Tessellation Shaders/Materials.meta
deleted: Assets/Sample Assets/Effects/Tessellation Shaders/Models.meta
deleted: Assets/Sample Assets/Effects/Tessellation Shaders/Shaders.meta
deleted: Assets/Sample Assets/Effects/Tessellation Shaders/Textures.meta
deleted: Assets/Sample Assets/Effects/Toon Shading/Materials.meta
deleted: Assets/Sample Assets/Effects/Toon Shading/Scenes.meta
deleted: Assets/Scenes/6-0 Drifting Dunes.meta
deleted: Assets/Scripts/Creatures/Enemies.meta
deleted: Assets/Scripts/Cutscenes&Quests 1.meta
deleted: Assets/SkyLighting/Gray Cloudy Day Skybox.meta
modified: ProjectSettings/GraphicsSettings.asset
modified: ProjectSettings/ProjectSettings.asset
modified: ProjectSettings/ProjectVersion.txt
no changes added to commit (use "git add" and/or "git commit -a")
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.