23 Commits

Author SHA1 Message Date
jparent
0c9796c8c0 Merge branch 'master' of https://github.com/conjureets/pillowfight 2015-08-22 17:03:28 -04:00
jparent
f6181556f5 add basic auto targeting, but it needs ajustements 2015-08-22 16:59:45 -04:00
jparent
17974bed9b add basic pillow script 2015-08-22 16:55:31 -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
d7092b4af6 Fix the lava damage taken when jumping a lot in it 2015-08-22 11:35:44 -04:00
Patrice Vignola
d439d7dce5 Add a temporary "push" method for when the player will get knocked back by
a pillow
2015-08-22 10:08:59 -04:00
Patrice Vignola
e76e32efe7 Restrict the bed usage to only one child per bed 2015-08-22 09:40:30 -04:00
Patrice Vignola
a030642c8d Add the child being noticed when he stands on floor (need to add the
consequences though)
2015-08-22 05:48:22 -04:00
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
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
jparent
96d0138f3a remove Debug.Log messages 2015-08-22 05:10:53 -04:00
jparent
c4812ce7a2 Merge branch 'master' of https://github.com/conjureets/pillowfight
Conflicts:
	Assets/Scripts/Child.cs
	Assets/Scripts/ChildController.cs
2015-08-22 04:59:49 -04:00
jparent
ef8624740c add auto target and locking with a player 2015-08-22 04:57:28 -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
0a1931c7d0 Add the ability to sleep on a bed anytime 2015-08-22 04:22:32 -04:00
Patrice Vignola
a3fe31e09b Add the Awake/Sleep contexts 2015-08-22 04:02:15 -04:00
Patrice Vignola
2af4b94ddc Add the first pass of the mom behavior 2015-08-22 03:56:33 -04:00
Patrice Vignola
93832dcaa8 Add the blocking into PatScene and add a meshcollider for it 2015-08-22 03:02:35 -04:00
Patrice Vignola
0511637874 Merge branch 'master' of https://github.com/ConjureETS/PillowFight
Conflicts:
	Assets/Scripts/Child.cs
	ProjectSettings/TagManager.asset
2015-08-22 02:30:06 -04:00
Patrice Vignola
606d55999c Add the basic movements and jump for the child 2015-08-22 02:23:39 -04:00
jparent
a4aa35f554 add basic Pillow and pickup when in proximity 2015-08-22 01:07:56 -04:00
Patrice Vignola
69699e5f73 Add the character movement depending on the camera rotation 2015-08-22 00:45:35 -04:00
Patrice Vignola
dc5d4b4b33 Add default files in folders 2015-08-21 22:17:47 -04:00