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
|
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
|
af0053f169
|
Add visual cue for selectable pillows
|
2015-08-23 03:18:31 -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
|
098cdefe14
|
Add the behavior of the floor changing color when the mom enters the room
|
2015-08-22 05:31:34 -04:00 |
|