12 Commits

Author	SHA1	Message	Date
RosimInc	b0ac99ba0e	Merge branch 'master' of https://github.com/ConjureETS/PillowFight	2015-08-23 13:14:16 -04:00
jparent	a2ebee6e24	Merge branch 'master' of https://github.com/conjureets/pillowfight	2015-08-23 13:10:50 -04:00
jparent	40de80efd3	add UI Button to Sleep on bed when Mom is coming	2015-08-23 13:07:12 -04:00
RosimInc	1088a8f589	Merge branch 'master' of https://github.com/ConjureETS/PillowFight ... Conflicts: Assets/Scripts/Child.cs Signed-off-by: RosimInc <rosim_inc@hotmail.com>	2015-08-23 12:25:42 -04:00
RosimInc	27efaae69b	Added the player avatars ... Signed-off-by: RosimInc <rosim_inc@hotmail.com>	2015-08-23 12:20:40 -04:00
Patrice Vignola	df8463f3a2	Tried stuff	2015-08-23 11:25:01 -04:00
Patrice Vignola	1c42b584c2	Add the door open mechanic when the mom comes in	2015-08-22 23:23:17 -04:00
Patrice Vignola	fd1672f212	Add a bunch of stuff	2015-08-22 17:29:59 -04:00
Patrice Vignola	516f6b6791	Add the new bed prefabs and fixed the movement (I think)	2015-08-22 14:01:28 -04:00
Patrice Vignola	098cdefe14	Add the behavior of the floor changing color when the mom enters the room	2015-08-22 05:31:34 -04:00
Patrice Vignola	5413a3bf20	Add mom's ability to spot the children who are not sleeping when she ... enters the room	2015-08-22 04:34:26 -04:00
Patrice Vignola	2af4b94ddc	Add the first pass of the mom behavior	2015-08-22 03:56:33 -04:00