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

Conflicts:
	Assets/Prefabs/Bed.prefab
	Assets/Prefabs/BunkBed.prefab
	Assets/Prefabs/Pillow.prefab
	Assets/Scenes/PatScene.unity

2015-08-23 04:48:06 -04:00

..

Menu

set visible meta files and force text mode

2015-08-23 04:25:46 -04:00

CameraSimon.unity

set visible meta files and force text mode

2015-08-23 04:25:46 -04:00

CameraSimon.unity.meta

Added camera movement.

2015-08-23 02:07:13 -04:00

jp.unity

set visible meta files and force text mode

2015-08-23 04:25:46 -04:00

jp.unity.meta

add basic Pillow and pickup when in proximity

2015-08-22 01:07:56 -04:00

Menu.meta

Added UI assets and started the menus

2015-08-23 03:44:25 -04:00

MomLightSimon.unity

set visible meta files and force text mode

2015-08-23 04:25:46 -04:00

MomLightSimon.unity.meta

Created light with mom's shadow, and a test scene with opening door.

2015-08-22 14:24:18 -04:00

PatScene.unity

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

2015-08-23 04:48:06 -04:00

PatScene.unity.meta

Add default files in folders

2015-08-21 22:17:47 -04:00