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
85 Commits 1 Branch 0 Tags
Commit Graph

38 Commits

Author SHA1 Message Date
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
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
Patrice Vignola
c953beca55 Do a first pass of the animations 2015-08-23 12:23:03 -04:00
Patrice Vignola
50df0f82c8 Merge branch 'master' of https://github.com/ConjureETS/PillowFight 2015-08-23 11:25:22 -04:00
Patrice Vignola
df8463f3a2 Tried stuff 2015-08-23 11:25:01 -04:00
jparent
91cf1734ba reduce minimum angle range for auto-target to 10 2015-08-23 10:18:44 -04:00
Patrice Vignola
9b0cad2dd0 Merge branch 'master' of https://github.com/ConjureETS/PillowFight 
Conflicts:
	Assets/Prefabs/Bed.prefab
	Assets/Prefabs/BunkBed.prefab
	Assets/Prefabs/Pillow.prefab
	Assets/Scenes/PatScene.unity
 2015-08-23 04:48:06 -04:00
Patrice Vignola
ccc6589446 Attempt at fixing collisions 2015-08-23 04:46:38 -04:00
jparent
70572a099e set visible meta files and force text mode 2015-08-23 04:25:46 -04:00
Patrice Vignola
8129d5486a Merge branch 'master' of https://github.com/ConjureETS/PillowFight 
Conflicts:
	Assets/Prefabs/Floor.prefab
 2015-08-23 04:19:00 -04:00
Patrice Vignola
a71932f9d1 Add the lava floor 2015-08-23 04:17:54 -04:00
jparent
942fc792ef Merge branch 'master' of https://github.com/conjureets/pillowfight 2015-08-23 04:13:50 -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
6ecf410bd9 Merge branch 'master' of https://github.com/conjureets/pillowfight 
Conflicts:
	Assets/Prefabs/Pillow.prefab
	Assets/Scripts/Floor.cs
 2015-08-23 04:06:48 -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
af0053f169 Add visual cue for selectable pillows 2015-08-23 03:18:31 -04:00
Patrice Vignola
f94cca5844 Merge branch 'master' of https://github.com/ConjureETS/PillowFight 2015-08-23 02:11:32 -04:00
Patrice Vignola
7f3339d33d Add the first pass of the pillow spawners 2015-08-23 02:11:09 -04:00
jparent
5b6fd11745 give a box collider and better physics to Pillows 2015-08-23 01:59:49 -04:00
jparent
dcbf2df911 add Throwing of pillow and push back on hit 2015-08-22 23:21:24 -04:00
Patrice Vignola
9bf9b5aaef Merge branch 'master' of https://github.com/ConjureETS/PillowFight 2015-08-22 21:48:57 -04:00
Patrice Vignola
28346a7a9c Add a lot of new furnitures 2015-08-22 21:48:38 -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
2b47de9dba Merge branch 'master' of https://github.com/ConjureETS/PillowFight 
Conflicts:
	Assets/Scripts/Child.cs
 2015-08-22 18:40:57 -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
Patrice Vignola
636a767566 Add the new walls and door 2015-08-22 18:38:11 -04:00
Patrice Vignola
fd1672f212 Add a bunch of stuff 2015-08-22 17:29:59 -04:00
RosimInc
c0ee9a7b78 Added a light flicker 
Signed-off-by: RosimInc <rosim_inc@hotmail.com>
 2015-08-22 17:13:33 -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
e76e32efe7 Restrict the bed usage to only one child per bed 2015-08-22 09:40:30 -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
d0e0286029 add a sphere collider to Child to pickup pillows 2015-08-22 05:11:16 -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
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