-
- Downloads
Merge branch 'master' into input_start
# Conflicts: # Assets/FellOffController.cs.meta # Assets/Scripts/Items/Coin.cs.meta
Showing
- .vsconfig 6 additions, 0 deletions.vsconfig
- Assets/FellOffController.cs.meta 1 addition, 1 deletionAssets/FellOffController.cs.meta
- Assets/Materials/a-stripes.png 0 additions, 0 deletionsAssets/Materials/a-stripes.png
- Assets/Materials/a-stripes.png.meta 96 additions, 0 deletionsAssets/Materials/a-stripes.png.meta
- Assets/Materials/b-stripes.png 0 additions, 0 deletionsAssets/Materials/b-stripes.png
- Assets/Materials/b-stripes.png.meta 96 additions, 0 deletionsAssets/Materials/b-stripes.png.meta
- Assets/Materials/background images.meta 1 addition, 1 deletionAssets/Materials/background images.meta
- Assets/Materials/background images/background01.png 0 additions, 0 deletionsAssets/Materials/background images/background01.png
- Assets/Materials/background images/background01.png.meta 96 additions, 0 deletionsAssets/Materials/background images/background01.png.meta
- Assets/Materials/background images/background01Monday.png 0 additions, 0 deletionsAssets/Materials/background images/background01Monday.png
- Assets/Materials/background images/background01Monday.png.meta 96 additions, 0 deletions...s/Materials/background images/background01Monday.png.meta
- Assets/Materials/background images/background02Tuesday.png 0 additions, 0 deletionsAssets/Materials/background images/background02Tuesday.png
- Assets/Materials/background images/background02Tuesday.png.meta 96 additions, 0 deletions.../Materials/background images/background02Tuesday.png.meta
- Assets/Materials/background images/background03Wednesday.png 0 additions, 0 deletionsAssets/Materials/background images/background03Wednesday.png
- Assets/Materials/background images/background03Wednesday.png.meta 96 additions, 0 deletions...aterials/background images/background03Wednesday.png.meta
- Assets/Materials/background images/background04Tursday.png 0 additions, 0 deletionsAssets/Materials/background images/background04Tursday.png
- Assets/Materials/background images/background04Tursday.png.meta 96 additions, 0 deletions.../Materials/background images/background04Tursday.png.meta
- Assets/Materials/background images/background05Friday.png 0 additions, 0 deletionsAssets/Materials/background images/background05Friday.png
- Assets/Materials/background images/background05Friday.png.meta 96 additions, 0 deletions...s/Materials/background images/background05Friday.png.meta
- Assets/Prefabs/backgroundInstancePrefab.prefab 125 additions, 0 deletionsAssets/Prefabs/backgroundInstancePrefab.prefab
Loading
Please register or sign in to comment