4 Commits

Author SHA1 Message Date
Patrice Vignola
bd34106af1 Combine de board with the players and Ouija 2016-01-30 20:08:24 -05:00
Patrice Vignola
793ad331b8 Add working ropes 2016-01-30 16:52:43 -05:00
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