• 15박보승's avatar
    Merge branch 'parse' into bs · acb2eb35
    15박보승 authored
    # Conflicts:
    #	RhythmKata/Assets/Materials/EdgeNote.mat
    #	RhythmKata/Assets/PinwheelFantasyEffect.meta
    #	RhythmKata/Assets/Scenes/bs.unity
    acb2eb35
Name
Last commit
Last update
..
Materials Loading commit data...
PinwheelFantasyEffect Loading commit data...
Prefabs Loading commit data...
Resources Loading commit data...
Scenes Loading commit data...
Scripts Loading commit data...
SteamVR Loading commit data...
SteamVR_Input Loading commit data...
SteamVR_Resources Loading commit data...
StreamingAssets Loading commit data...
UCLAGameLab Loading commit data...
InputSystem.inputsettings.asset Loading commit data...
InputSystem.inputsettings.asset.meta Loading commit data...
Materials.meta Loading commit data...
PinwheelFantasyEffect.meta Loading commit data...
Prefabs.meta Loading commit data...
Resources.meta Loading commit data...
Scenes.meta Loading commit data...
Scripts.meta Loading commit data...
SteamVR.meta Loading commit data...
SteamVR_Input.meta Loading commit data...
SteamVR_Resources.meta Loading commit data...
StreamingAssets.meta Loading commit data...
UCLAGameLab.meta Loading commit data...
ring.png Loading commit data...
ring.png.meta Loading commit data...