{"push_id":2035632347,"size":6,"distinct_size":4,"ref":"refs/heads/master","head":"398d458fbe534af174804e5197dcb5d018294284","before":"b0bcf4490028b7beede4d518aae4ec34bd3cfd77","commits":[{"sha":"0c2f0986e0565758c7937770daf5f5bbde2ebb89","author":{"name":"julietmiami","email":"a948660c8deac6801ae5f825bb56048076d80dc1@gmail.com"},"message":"UI placeholders V1","distinct":false,"url":"https://api.github.com/repos/Reality-Virtually-Hackathon/Dr.Holo/commits/0c2f0986e0565758c7937770daf5f5bbde2ebb89"},{"sha":"c3a31e804651bb7fffea703827fcafadb597ddf4","author":{"name":"julietDiBenedetto","email":"fa955efee0f619398e3366cb7675719577167afa@ufl.edu"},"message":"toolkits","distinct":false,"url":"https://api.github.com/repos/Reality-Virtually-Hackathon/Dr.Holo/commits/c3a31e804651bb7fffea703827fcafadb597ddf4"},{"sha":"9c08b55ce26666a81895bc88dcdc3f58bd84e573","author":{"name":"sgarcia22","email":"65a6e69e20c4e49a30d67283cce290d332418505@ufl.edu"},"message":"Started Database script","distinct":true,"url":"https://api.github.com/repos/Reality-Virtually-Hackathon/Dr.Holo/commits/9c08b55ce26666a81895bc88dcdc3f58bd84e573"},{"sha":"2021a0ed2860b6be3e27b80648b772076522c07d","author":{"name":"sgarcia22","email":"65a6e69e20c4e49a30d67283cce290d332418505@ufl.edu"},"message":"Merge branch 'master' of https://github.com/Reality-Virtually-Hackathon/Dr.Holo\n\n# Conflicts:\n#\tAssets/Scenes.meta","distinct":true,"url":"https://api.github.com/repos/Reality-Virtually-Hackathon/Dr.Holo/commits/2021a0ed2860b6be3e27b80648b772076522c07d"},{"sha":"410a28f8a948a60e34884c0baa0f320e705f1322","author":{"name":"sgarcia22","email":"65a6e69e20c4e49a30d67283cce290d332418505@ufl.edu"},"message":"Merge remote-tracking branch 'origin/UI_v1'\n\n# Conflicts:\n#\tAssets/HoloToolkit-Examples/GazeRuler/Scenes/GazeRulerExample.unity\n#\tAssets/HoloToolkit-Examples/Prototyping/Shaders/UnlitTransparentTriplanar.shader\n#\tAssets/HoloToolkit-Examples/Prototyping/Shaders/UnlitTriplanar.shader\n#\tAssets/HoloToolkit-Examples/README.md\n#\tAssets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployPrefs.cs\n#\tAssets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployTools.cs\n#\tAssets/HoloToolkit/BuildAndDeploy/Editor/BuildDeployWindow.cs\n#\tAssets/HoloToolkit/BuildAndDeploy/Editor/BuildSLNUtilities.cs\n#\tAssets/HoloToolkit/Input/Prefabs/HoloLensCamera.prefab\n#\tAssets/HoloToolkit/Input/README.md\n#\tAssets/HoloToolkit/Input/Scripts/Editor/KeywordAndKeyCodeDrawer.cs\n#\tAssets/HoloToolkit/Input/Scripts/Editor/SpeechInputHandlerEditor.cs\n#\tAssets/HoloToolkit/Input/Scripts/Editor/SpeechInputSourceEditor.cs\n#\tAssets/HoloToolkit/Input/Scripts/InputSources/BaseInputSource.cs\n#\tAssets/HoloToolkit/Input/Shaders/Cursor.shader\n#\tAssets/HoloToolkit/Input/Shaders/CursorShader.shader\n#\tAssets/HoloToolkit/Input/Shaders/EditorHands.shader\n#\tAssets/HoloToolkit/Input/Shaders/SpecularHighlight.shader\n#\tAssets/HoloToolkit/Sharing/README.md\n#\tAssets/HoloToolkit/Sharing/Scripts/Editor/SharingMenu.cs\n#\tAssets/HoloToolkit/Sharing/Scripts/ServerSessionsTracker.cs\n#\tAssets/HoloToolkit/Sharing/Scripts/SharingStage.cs\n#\tAssets/HoloToolkit/Sharing/Scripts/Utilities/AutoJoinSessionAndRoom.cs\n#\tAssets/HoloToolkit/Sharing/Scripts/Utilities/ManualIpConfiguration.cs\n#\tAssets/HoloToolkit/Sharing/Scripts/Utilities/SharingWorldAnchorManager.cs\n#\tAssets/HoloToolkit/SpatialMapping/Scripts/RemoteMapping/Editor/RoomMeshExporter.cs\n#\tAssets/HoloToolkit/SpatialMapping/Shaders/Occlusion.shader\n#\tAssets/HoloToolkit/SpatialMapping/Shaders/Wireframe.shader\n#\tAssets/HoloToolkit/SpatialSound/Scripts/UAudioManager/Editor/UAudioProfiler.cs\n#\tAssets/HoloToolkit/SpatialUnderstanding/Materials/SpatialMappingSurface.shader\n#\tAssets/HoloToolkit/SpatialUnderstanding/Materials/SpatialUnderstandingSurface.shader\n#\tAssets/HoloToolkit/Utilities/Scripts/Editor/AutoConfigureMenu.cs\n#\tAssets/HoloToolkit/Utilities/Scripts/Editor/AutoConfigureWindow.cs\n#\tAssets/HoloToolkit/Utilities/Scripts/Editor/ProjectSettingsWindow.cs\n#\tAssets/HoloToolkit/Utilities/Scripts/Editor/SceneSettingsWindow.cs\n#\tAssets/HoloToolkit/Utilities/Scripts/Editor/SetIconsWindow.cs\n#\tAssets/HoloToolkit/Utilities/Scripts/Editor/TextureScale.cs\n#\tAssets/HoloToolkit/Utilities/Scripts/Extensions/TransformExtensions.cs\n#\tAssets/HoloToolkit/Utilities/Scripts/HeadsetAdjustment.cs\n#\tAssets/HoloToolkit/Utilities/Scripts/WorldAnchorManager.cs\n#\tAssets/HoloToolkit/Utilities/Shaders/FastConfigurable/Editor/CustomMaterialEditor.cs\n#\tAssets/HoloToolkit/Utilities/Shaders/FastConfigurable/Shaders/FastConfigurable.shader\n#\tAssets/HoloToolkit/Utilities/Shaders/FastConfigurable/Shaders/FastConfigurable2Sided.shader\n#\tAssets/HoloToolkit/Utilities/Shaders/Obsolete/BlinnPhongConfigurable.shader\n#\tAssets/HoloToolkit/Utilities/Shaders/Obsolete/BlinnPhongConfigurableTransparent.shader\n#\tAssets/HoloToolkit/Utilities/Shaders/Obsolete/LambertianConfigurable.shader\n#\tAssets/HoloToolkit/Utilities/Shaders/Obsolete/LambertianConfigurableTransparent.shader\n#\tAssets/HoloToolkit/Utilities/Shaders/Obsolete/StandardFast.shader\n#\tAssets/HoloToolkit/Utilities/Shaders/Obsolete/UnlitConfigurable.shader\n#\tAssets/HoloToolkit/Utilities/Shaders/Obsolete/UnlitConfigurableTransparent.shader\n#\tAssets/HoloToolkit/Utilities/Shaders/Obsolete/UnlitNoDepthTest.shader\n#\tAssets/HoloToolkit/Utilities/Shaders/Obsolete/VertexLitConfigurable.shader\n#\tAssets/HoloToolkit/Utilities/Shaders/Obsolete/VertexLitConfigurableTransparent.shader\n#\tAssets/HoloToolkit/Utilities/Shaders/WindowOcclusion.shader","distinct":true,"url":"https://api.github.com/repos/Reality-Virtually-Hackathon/Dr.Holo/commits/410a28f8a948a60e34884c0baa0f320e705f1322"},{"sha":"398d458fbe534af174804e5197dcb5d018294284","author":{"name":"sgarcia22","email":"65a6e69e20c4e49a30d67283cce290d332418505@ufl.edu"},"message":"fixed merge conflict","distinct":true,"url":"https://api.github.com/repos/Reality-Virtually-Hackathon/Dr.Holo/commits/398d458fbe534af174804e5197dcb5d018294284"}]}
{"actor":{"display_login":"sgarcia22"}}