RosimInc
efa3f6a7b0
Merge branch 'master' of https://github.com/ConjureETS/PillowFight
...
Conflicts:
Assets/Scripts/AutoTarget.cs
Signed-off-by: RosimInc <rosim_inc@hotmail.com>
2015-08-23 14:50:22 -04:00
RosimInc
6eae91f4d5
Added pillow hits
...
Signed-off-by: RosimInc <rosim_inc@hotmail.com>
2015-08-23 14:48:36 -04:00
jparent
324cd76946
fix nullPointer in autotarget when a child dies
2015-08-23 14:41:04 -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
91cf1734ba
reduce minimum angle range for auto-target to 10
2015-08-23 10:18:44 -04:00
RosimInc
f470b653be
Fixed the auto target scripts
...
Signed-off-by: RosimInc <rosim_inc@hotmail.com>
2015-08-22 21:13:15 -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
96d0138f3a
remove Debug.Log messages
2015-08-22 05:10:53 -04:00
jparent
ef8624740c
add auto target and locking with a player
2015-08-22 04:57:28 -04:00