20 Commits

Author SHA1 Message Date
Dmitri Kolytchev
cca76b6f04 more GUI tweaks 2016-01-31 13:47:54 -05:00
Dmitri Kolytchev
a29a601772 New Floor (and merge)
Merge branch 'master' of github.com:ConjureETS/OuijaMTLGJ2016
2016-01-31 11:24:41 -05:00
Dmitri Kolytchev
ee00ea6566 new floor 2016-01-31 11:24:36 -05:00
Patrice Vignola
80f6bd622a Fix the fucking physics 2016-01-31 10:59:05 -05:00
Dmitri Kolytchev
a53fef82d4 tweaking the board to a manageable size 2016-01-31 09:41:29 -05:00
Patrice Vignola
ece88e2c7e Stuff 2016-01-31 08:32:38 -05:00
Dmitri Kolytchev
072de8a736 Importing room .obj because I'm an idiot and forgot people don't all have blender 2016-01-31 07:40:36 -05:00
Patrice Vignola
cd53d3f012 Add the rune capture basic behavior 2016-01-31 07:26:29 -05:00
Patrice Vignola
3efe9826be Fix bunch of stuff 2016-01-30 18:37:40 -05:00
Dmitri Kolytchev
4b4b2f5963 Merge branch 'master' of github.com:ConjureETS/OuijaMTLGJ2016 2016-01-30 18:09:25 -05:00
Dmitri Kolytchev
072315abc3 a bunch of stuff 2016-01-30 18:09:21 -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
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
jparent
a0b0c5f054 change settings to show meta files and force text 2016-01-30 01:34:03 -05:00
Dmitri Kolytchev
27fbca1c46 initial commit 2016-01-30 01:15:35 -05:00