Conjure/OuijaMTLGJ2016
6
0
Fork 0
mirror of https://github.com/ConjureETS/OuijaMTLGJ2016.git synced 2026-03-25 10:41:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
31 Commits 1 Branch 0 Tags
Commit Graph

2 Commits

Author SHA1 Message Date
Patrice Vignola
1cc4ddc40f Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 
Conflicts:
	Assets/characters.meta
	Assets/characters/Source/Animator_controllers/Unity_Free_anims.controller
	Assets/prefabs.meta
	ProjectSettings/ProjectSettings.asset
 2016-01-30 12:59:59 -05:00
antoine.mcnabb
196376316d Selector with bolts 2016-01-30 12:31:33 -05:00