Making the music file much smaller.
Making the music file much smaller.
Merge remote-tracking branch 'origin/master' into starbranch
Generated 256 atlas, disabled FPS control in Test.

Generated 256 atlas, disabled FPS control in Testscene.
Disabled Root motion on character model in Testscen
asd

asd
Revert "asd"

This reverts commit 32514bdc4822f37c593ba2120c3ee9a683b32a0f.
pushing some code changes
changed some prefabs
Merge remote-tracking branch 'origin/modstambranch' into starbranch
Added alpha to material.
Merge remote-tracking branch 'origin/starbranch'
Changed texture resolutions on material.
copied a texture into the right folder
fixed shaders for alpha-matching
Updated textures, and some minor code in Capture.
Cerise texture.
shader stuff
restored shaders

restored shaders
asd

asd