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 |
|
antoine.mcnabb
|
196376316d
|
Selector with bolts
|
2016-01-30 12:31:33 -05:00 |
|
Dmitri Kolytchev
|
ede0eb47f4
|
Exporting to OBJ and removing blenderfile
|
2016-01-30 11:48:24 -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 |
|