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

7 Commits

Author SHA1 Message Date
jparent
40de80efd3 add UI Button to Sleep on bed when Mom is coming 2015-08-23 13:07:12 -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
7f3339d33d Add the first pass of the pillow spawners 2015-08-23 02:11:09 -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