12 Commits

Author SHA1 Message Date
Patrice Vignola
d8027c6a88 Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 2016-01-30 16:54:00 -05:00
Patrice Vignola
793ad331b8 Add working ropes 2016-01-30 16:52:43 -05:00
RosimInc
bb6233ad93 Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016 2016-01-30 13:59:35 -05:00
RosimInc
3e259dfb9c Added a collider to the tiles, and created a makeshift player controller to test it.
Changed the level generation to be centered.
2016-01-30 13:59:24 -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
Patrice Vignola
2f3eca693c Add the players models and animations blending 2016-01-30 12:35:04 -05:00
Dmitri Kolytchev
65abb2c0fc adding a bunch of shitty selector-related assets 2016-01-30 10:50:36 -05:00
RosimInc
068de276e1 Added tile level generation with embedded runes. 2016-01-30 09:56:50 -05:00
Patrice Vignola
dbf913a02f Add player controls 2016-01-30 09:49:32 -05:00
jparent
a73dd37967 add basic splashscreen with skippable settings 2016-01-30 04:58:39 -05:00
Dmitri Kolytchev
96101e66d8 adding limits to player movement 2016-01-30 02:17:13 -05:00
Dmitri Kolytchev
27fbca1c46 initial commit 2016-01-30 01:15:35 -05:00