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

53 Commits

Author SHA1 Message Date
RosimInc
495e1dd259 Continued implementation of main menus 
Signed-off-by: RosimInc <rosim_inc@hotmail.com>
 2015-08-23 14:06:03 -04:00
RosimInc
eff22d0d6b Integrated canvas changes to Gameplay scene 
Signed-off-by: RosimInc <rosim_inc@hotmail.com>
 2015-08-23 13:19: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
RosimInc
3b5fffe765 Finished the avatars and lava logic 
Signed-off-by: RosimInc <rosim_inc@hotmail.com>
 2015-08-23 13:02:46 -04:00
RosimInc
1088a8f589 Merge branch 'master' of https://github.com/ConjureETS/PillowFight 
Conflicts:
	Assets/Scripts/Child.cs

Signed-off-by: RosimInc <rosim_inc@hotmail.com>
 2015-08-23 12:25:42 -04:00
Patrice Vignola
c953beca55 Do a first pass of the animations 2015-08-23 12:23:03 -04:00
RosimInc
27efaae69b Added the player avatars 
Signed-off-by: RosimInc <rosim_inc@hotmail.com>
 2015-08-23 12:20:40 -04:00
Patrice Vignola
df8463f3a2 Tried stuff 2015-08-23 11:25:01 -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
RosimInc
ac40c0c409 Merge branch 'master' of https://github.com/ConjureETS/PillowFight 2015-08-23 03:44:35 -04:00
RosimInc
6092b51b67 Added UI assets and started the menus 
Signed-off-by: RosimInc <rosim_inc@hotmail.com>
 2015-08-23 03:44:25 -04:00
Patrice Vignola
af0053f169 Add visual cue for selectable pillows 2015-08-23 03:18:31 -04:00
RosimInc
3da3a00efc Merge branch 'master' of https://github.com/ConjureETS/PillowFight 
Conflicts:
	Assets/Scenes/PatScene.unity

Added the mother sprite

Signed-off-by: RosimInc <rosim_inc@hotmail.com>
 2015-08-23 02:28:34 -04:00
RosimInc
d40d65f0d1 Changed the sprite for the mother 
Signed-off-by: RosimInc <rosim_inc@hotmail.com>
 2015-08-23 02:21:59 -04:00
Patrice Vignola
7f3339d33d Add the first pass of the pillow spawners 2015-08-23 02:11:09 -04:00
RosimInc
305e4923b2 Merge branch 'master' of https://github.com/ConjureETS/PillowFight 2015-08-23 02:07:22 -04:00
RosimInc
cf0a6aad95 Added camera movement. 
Zoom still not working (commented out)

Signed-off-by: RosimInc <rosim_inc@hotmail.com>
 2015-08-23 02:07:13 -04:00
Patrice Vignola
1c42b584c2 Add the door open mechanic when the mom comes in 2015-08-22 23:23:17 -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
9ce93ceca6 Merge branch 'master' of https://github.com/ConjureETS/PillowFight 2015-08-22 17:30:11 -04:00
Patrice Vignola
fd1672f212 Add a bunch of stuff 2015-08-22 17:29:59 -04:00
RosimInc
275bec897d Merge branch 'master' of https://github.com/ConjureETS/PillowFight 2015-08-22 17:13:42 -04:00
RosimInc
c0ee9a7b78 Added a light flicker 
Signed-off-by: RosimInc <rosim_inc@hotmail.com>
 2015-08-22 17:13:33 -04:00
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
RosimInc
a31eab5996 Finished door easing and optimised shadow positioning 
Signed-off-by: RosimInc <rosim_inc@hotmail.com>
 2015-08-22 15:45:00 -04:00
RosimInc
b89e7e1341 Merge branch 'master' of https://github.com/ConjureETS/PillowFight 2015-08-22 14:24:29 -04:00
RosimInc
6b2560b294 Created light with mom's shadow, and a test scene with opening door. 
Signed-off-by: RosimInc <rosim_inc@hotmail.com>
 2015-08-22 14:24:18 -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
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
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