Patrice Vignola c0f938a59a Merge branch 'master' of https://github.com/ConjureETS/PillowFight ...

Conflicts:
	Assets/Prefabs/Child.prefab
	Assets/Scripts/Child.cs

2015-08-22 05:34:52 -04:00

..

Art

Remove the placeholder asset in the Art folder

2015-08-22 02:30:40 -04:00

Editor

Add the character movement depending on the camera rotation

2015-08-22 00:45:35 -04:00

Materials

Add the behavior of the floor changing color when the mom enters the room

2015-08-22 05:31:34 -04:00

Plugins

Add the character movement depending on the camera rotation

2015-08-22 00:45:35 -04:00

Prefabs

Merge branch 'master' of https://github.com/ConjureETS/PillowFight

2015-08-22 05:34:52 -04:00

Scenes

Merge branch 'master' of https://github.com/ConjureETS/PillowFight

2015-08-22 05:34:52 -04:00

Scripts

Merge branch 'master' of https://github.com/ConjureETS/PillowFight

2015-08-22 05:34:52 -04:00

Art.meta

Add the default initial folders

2015-08-21 22:12:38 -04:00

ControllerMapper.asset

Add the ability to sleep on a bed anytime

2015-08-22 04:22:32 -04:00

ControllerMapper.asset.meta

Add the character movement depending on the camera rotation

2015-08-22 00:45:35 -04:00

Editor.meta

Add the character movement depending on the camera rotation

2015-08-22 00:45:35 -04:00

Materials.meta

Add the default initial folders

2015-08-21 22:12:38 -04:00

Plugins.meta

Add the character movement depending on the camera rotation

2015-08-22 00:45:35 -04:00

Prefabs.meta

Add the default initial folders

2015-08-21 22:12:38 -04:00

Scenes.meta

Add the default initial folders

2015-08-21 22:12:38 -04:00

Scripts.meta

Add the default initial folders

2015-08-21 22:12:38 -04:00