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

Conflicts:
	Assets/Scenes/PatScene.unity
	Assets/Scripts/Child.cs

Signed-off-by: RosimInc <rosim_inc@hotmail.com>

2015-08-23 13:10:01 -04:00

..

Art

Do a first pass of the animations

2015-08-23 12:23:03 -04:00

Arts

Add the lava floor

2015-08-23 04:17:54 -04:00

Editor

Add the character movement depending on the camera rotation

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

Fonts

Add a bunch of stuff

2015-08-22 17:29:59 -04:00

Materials

Tried stuff

2015-08-23 11:25:01 -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-23 13:10:01 -04:00

Scenes

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

2015-08-23 13:10:01 -04:00

Scripts

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

2015-08-23 13:10:01 -04:00

Sprites

Add a bunch of stuff

2015-08-22 17:29:59 -04:00

Test

Tried stuff

2015-08-23 11:25:01 -04:00

UI

Added the player avatars

2015-08-23 12:20:40 -04:00

Art.meta

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

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

Arts.meta

Add the lava floor

2015-08-23 04:17:54 -04:00

ControllerMapper.asset

change controls to throw with Right Trigger

2015-08-23 09:46:46 -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

Fonts.meta

Add a bunch of stuff

2015-08-22 17:29:59 -04:00

Materials.meta

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

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

Plugins.meta

Add the character movement depending on the camera rotation

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

Prefabs.meta

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

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

Scenes.meta

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

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

Scripts.meta

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

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

Sprites.meta

Add a bunch of stuff

2015-08-22 17:29:59 -04:00

Test.meta

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

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

UI.meta

Added UI assets and started the menus

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