19 Commits

Author SHA1 Message Date
RosimInc
85e1644c8c Mapped Hit button
Changed material colors

Signed-off-by: RosimInc <rosim_inc@hotmail.com>
2015-08-23 15:38:53 -04:00
RosimInc
6eae91f4d5 Added pillow hits
Signed-off-by: RosimInc <rosim_inc@hotmail.com>
2015-08-23 14:48:36 -04:00
RosimInc
6ce7a9b8ab First attempt to hit with melee
Signed-off-by: RosimInc <rosim_inc@hotmail.com>
2015-08-23 14:22:13 -04:00
jparent
989342197c fix Throwing pillow to not snap but still auto aim
Right joystick still rotates the player, but no longer snaps to a player.
Also, the auto-targeting is now used exlusively inside the Child's Throw
method. When throwing, it checks if there is a player in the direction the
player is pointing. If so, then the pillow is going this way, else it goes
in the Child's forward position.
2015-08-23 13:46:54 -04:00
jparent
4568e77871 fix the auto-target to lock only when looking
else, look in the direction we're going
2015-08-23 10:21:06 -04:00
jparent
15d1776957 change controls to throw with Right Trigger
change the ControllerMapper so that throwing a pillow is now done with the
Right Trigger insead of B button.
2015-08-23 09:46:46 -04:00
jparent
dcbf2df911 add Throwing of pillow and push back on hit 2015-08-22 23:21:24 -04:00
jparent
71b2eae11e correct forward facing angle when not auto locking 2015-08-22 22:30:38 -04:00
RosimInc
7658096653 Started fixing auto-target
And everything is gonna break

Signed-off-by: RosimInc <rosim_inc@hotmail.com>
2015-08-22 18:38:54 -04:00
jparent
f6181556f5 add basic auto targeting, but it needs ajustements 2015-08-22 16:59:45 -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
606d55999c Add the basic movements and jump for the child 2015-08-22 02:23:39 -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