Conjure/PillowFight
6
0
Fork 0
mirror of https://github.com/ConjureETS/PillowFight.git synced 2026-03-24 09:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
102 Commits 1 Branch 0 Tags
Commit Graph

39 Commits

Author SHA1 Message Date
Patrice Vignola
3327dc2f7d Merge branch 'master' of https://github.com/ConjureETS/PillowFight 
Conflicts:
	Assets/Scripts/Child.cs
 2015-08-23 14:30:06 -04:00
Patrice Vignola
17cae50b2d Improve the throw mecanism with mecanim 2015-08-23 13:59:44 -04:00
jparent
05ef9a9108 Merge branch 'master' of https://github.com/conjureets/pillowfight 
Conflicts:
	Assets/Prefabs/Child.prefab
	Assets/Scripts/Child.cs
 2015-08-23 13:55:59 -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
Patrice Vignola
040fb28f17 Merge branch 'master' of https://github.com/ConjureETS/PillowFight 2015-08-23 13:20:33 -04:00
Patrice Vignola
e4ee5509f6 Commit for pull 2015-08-23 13:20:22 -04:00
RosimInc
b0ac99ba0e Merge branch 'master' of https://github.com/ConjureETS/PillowFight 2015-08-23 13:14:16 -04:00
Patrice Vignola
e7671d3014 Merge branch 'master' of https://github.com/ConjureETS/PillowFight 2015-08-23 13:11:47 -04:00
jparent
a2ebee6e24 Merge branch 'master' of https://github.com/conjureets/pillowfight 2015-08-23 13:10:50 -04:00
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
jparent
40de80efd3 add UI Button to Sleep on bed when Mom is coming 2015-08-23 13:07:12 -04:00
RosimInc
3b5fffe765 Finished the avatars and lava logic 
Signed-off-by: RosimInc <rosim_inc@hotmail.com>
 2015-08-23 13:02:46 -04:00
Patrice Vignola
9d82191cbc Character animation 2015-08-23 13:02:34 -04:00
Patrice Vignola
c953beca55 Do a first pass of the animations 2015-08-23 12:23:03 -04:00
Patrice Vignola
df8463f3a2 Tried stuff 2015-08-23 11:25:01 -04:00
jparent
2c8a308692 Merge branch 'master' of https://github.com/conjureets/pillowfight 
Conflicts:
	Assets/Prefabs/Pillow.prefab
	Assets/Scripts/Floor.cs
 2015-08-23 04:13:09 -04:00
jparent
38acd0dc6e make pillows disappear when touching the floor 
make them reappear when Mother is in the room
 2015-08-23 04:03:56 -04:00
Patrice Vignola
f6ae2d05c0 Fix a bug in the pillow spawner script 2015-08-23 02:21:51 -04:00
jparent
bb398ce257 make pillows pickable after being thrown 2015-08-23 01:40:55 -04:00
jparent
dcbf2df911 add Throwing of pillow and push back on hit 2015-08-22 23:21:24 -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
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
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