Commit 22edc7ba6cd3e633fe3083762fd6dc4954ec0d0c

Authored by Danish Siddiqui
Exists in master

Merge branch 'master' of http://gitlab.folio3.com/mrasikh/super-sib

Conflicts:
	Assets/_Environment/_Grass/Shale/~Shale_Low.sbk.meta
	Assets/_Player.meta
	Assets/_Shaders/Infinite Runner Shaders.meta

Warning! This is a large diff.

To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.

Showing 26 changed files Side-by-side Diff