7 Commits

Author	SHA1	Message	Date
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
jparent	942fc792ef	Merge branch 'master' of https://github.com/conjureets/pillowfight	2015-08-23 04:13:50 -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
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