Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• ff397e85ef Add the icon master Patrice Vignola 2015-10-17 17:15:21 -04:00
• 0f20ec4bd7 Replace the assets with the right, updated version of the game Patrice Vignola 2015-10-17 17:06:57 -04:00
• 25cb0557f1 Change the quality settings to "Fantastic" and add a new icon Patrice Vignola 2015-10-12 23:46:13 -04:00
• 19a58eef99 fix MusicManager PlayVictory and PlayDefeat Music jparent 2015-08-23 16:32:57 -04:00
• 34b5b79d17 Merge branch 'master' of https://github.com/conjureets/pillowfight jparent 2015-08-23 16:10:57 -04:00
• ddc0128616 add basic sound manager which plays gameplay music jparent 2015-08-23 16:04:16 -04:00
• 993771e08e Merge branch 'master' of https://github.com/ConjureETS/PillowFight Patrice Vignola 2015-08-23 15:39:23 -04:00
• 215d19a030 Remove the time limitation for the controls screen Patrice Vignola 2015-08-23 15:38:58 -04:00
• 85e1644c8c Mapped Hit button Changed material colors RosimInc 2015-08-23 15:38:53 -04:00
• 0cd305d515 Build settings changes Patrice Vignola 2015-08-23 15:08:00 -04:00
• 1f2ff293b2 Merge branch 'master' of https://github.com/conjureets/pillowfight jparent 2015-08-23 15:05:27 -04:00
• 85318e2c73 add splashscree & instruction screen to build settings jparent 2015-08-23 15:05:20 -04:00
• af9d2d0942 Merge branch 'master' of https://github.com/ConjureETS/PillowFight Patrice Vignola 2015-08-23 15:02:02 -04:00
• a5b354d69a Fix the mom not noticing children anymore Patrice Vignola 2015-08-23 14:54:58 -04:00
• efa3f6a7b0 Merge branch 'master' of https://github.com/ConjureETS/PillowFight RosimInc 2015-08-23 14:50:22 -04:00
• 6eae91f4d5 Added pillow hits RosimInc 2015-08-23 14:48:36 -04:00
• 6b993120e2 Add the cow Patrice Vignola 2015-08-23 14:46:50 -04:00
• e8ba5a32db make pillows thrown into lava reappear with mom jparent 2015-08-23 14:43:44 -04:00
• d6d7357663 Merge branch 'master' of https://github.com/conjureets/pillowfight jparent 2015-08-23 14:41:12 -04:00
• 324cd76946 fix nullPointer in autotarget when a child dies jparent 2015-08-23 14:41:04 -04:00
• 3327dc2f7d Merge branch 'master' of https://github.com/ConjureETS/PillowFight Patrice Vignola 2015-08-23 14:30:06 -04:00
• 6ce7a9b8ab First attempt to hit with melee RosimInc 2015-08-23 14:22:13 -04:00
• 2418d5dec8 Merge branch 'master' of https://github.com/ConjureETS/PillowFight RosimInc 2015-08-23 14:06:15 -04:00
• 495e1dd259 Continued implementation of main menus RosimInc 2015-08-23 14:06:03 -04:00
• 17cae50b2d Improve the throw mecanism with mecanim Patrice Vignola 2015-08-23 13:59:44 -04:00
• 05ef9a9108 Merge branch 'master' of https://github.com/conjureets/pillowfight jparent 2015-08-23 13:55:59 -04:00
• 2ee831b878 Began the pillow swinging action RosimInc 2015-08-23 13:53:36 -04:00
• 989342197c fix Throwing pillow to not snap but still auto aim jparent 2015-08-23 13:46:54 -04:00
• 5bb2c06297 Anchor modifications Patrice Vignola 2015-08-23 13:28:57 -04:00
• 040fb28f17 Merge branch 'master' of https://github.com/ConjureETS/PillowFight Patrice Vignola 2015-08-23 13:20:33 -04:00
• e4ee5509f6 Commit for pull Patrice Vignola 2015-08-23 13:20:22 -04:00
• eff22d0d6b Integrated canvas changes to Gameplay scene RosimInc 2015-08-23 13:19:50 -04:00
• b0ac99ba0e Merge branch 'master' of https://github.com/ConjureETS/PillowFight RosimInc 2015-08-23 13:14:16 -04:00
• e7671d3014 Merge branch 'master' of https://github.com/ConjureETS/PillowFight Patrice Vignola 2015-08-23 13:11:47 -04:00
• f0e46a9429 New pillow texture Patrice Vignola 2015-08-23 13:11:34 -04:00
• a2ebee6e24 Merge branch 'master' of https://github.com/conjureets/pillowfight jparent 2015-08-23 13:10:50 -04:00
• 441aeb9215 Merge branch 'master' of https://github.com/ConjureETS/PillowFight RosimInc 2015-08-23 13:10:01 -04:00
• 40de80efd3 add UI Button to Sleep on bed when Mom is coming jparent 2015-08-23 13:07:12 -04:00
• 3b5fffe765 Finished the avatars and lava logic RosimInc 2015-08-23 13:02:46 -04:00
• 9d82191cbc Character animation Patrice Vignola 2015-08-23 13:02:34 -04:00
• 48be2a5587 add default quality settings... jparent 2015-08-23 12:26:58 -04:00
• 1088a8f589 Merge branch 'master' of https://github.com/ConjureETS/PillowFight RosimInc 2015-08-23 12:25:42 -04:00
• c953beca55 Do a first pass of the animations Patrice Vignola 2015-08-23 12:23:03 -04:00
• 27efaae69b Added the player avatars RosimInc 2015-08-23 12:20:40 -04:00
• 50df0f82c8 Merge branch 'master' of https://github.com/ConjureETS/PillowFight Patrice Vignola 2015-08-23 11:25:22 -04:00
• df8463f3a2 Tried stuff Patrice Vignola 2015-08-23 11:25:01 -04:00
• 4568e77871 fix the auto-target to lock only when looking jparent 2015-08-23 10:21:06 -04:00
• 91cf1734ba reduce minimum angle range for auto-target to 10 jparent 2015-08-23 10:18:44 -04:00
• 15d1776957 change controls to throw with Right Trigger jparent 2015-08-23 09:46:46 -04:00
• 9b0cad2dd0 Merge branch 'master' of https://github.com/ConjureETS/PillowFight Patrice Vignola 2015-08-23 04:48:06 -04:00
• ccc6589446 Attempt at fixing collisions Patrice Vignola 2015-08-23 04:46:38 -04:00
• 70572a099e set visible meta files and force text mode jparent 2015-08-23 04:25:46 -04:00
• 8129d5486a Merge branch 'master' of https://github.com/ConjureETS/PillowFight Patrice Vignola 2015-08-23 04:19:00 -04:00
• a71932f9d1 Add the lava floor Patrice Vignola 2015-08-23 04:17:54 -04:00
• 942fc792ef Merge branch 'master' of https://github.com/conjureets/pillowfight jparent 2015-08-23 04:13:37 -04:00
• 2c8a308692 Merge branch 'master' of https://github.com/conjureets/pillowfight jparent 2015-08-23 04:06:48 -04:00
• 6ecf410bd9 Merge branch 'master' of https://github.com/conjureets/pillowfight jparent 2015-08-23 04:06:48 -04:00
• 38acd0dc6e make pillows disappear when touching the floor jparent 2015-08-23 03:36:27 -04:00
• ac40c0c409 Merge branch 'master' of https://github.com/ConjureETS/PillowFight RosimInc 2015-08-23 03:44:35 -04:00
• 6092b51b67 Added UI assets and started the menus RosimInc 2015-08-23 03:44:25 -04:00
• af0053f169 Add visual cue for selectable pillows Patrice Vignola 2015-08-23 03:18:31 -04:00
• 3da3a00efc Merge branch 'master' of https://github.com/ConjureETS/PillowFight RosimInc 2015-08-23 02:28:34 -04:00
• d40d65f0d1 Changed the sprite for the mother RosimInc 2015-08-23 02:21:59 -04:00
• f6ae2d05c0 Fix a bug in the pillow spawner script Patrice Vignola 2015-08-23 02:21:51 -04:00
• f94cca5844 Merge branch 'master' of https://github.com/ConjureETS/PillowFight Patrice Vignola 2015-08-23 02:11:32 -04:00
• 7f3339d33d Add the first pass of the pillow spawners Patrice Vignola 2015-08-23 02:11:09 -04:00
• 305e4923b2 Merge branch 'master' of https://github.com/ConjureETS/PillowFight RosimInc 2015-08-23 02:07:22 -04:00
• cf0a6aad95 Added camera movement. Zoom still not working (commented out) RosimInc 2015-08-23 02:07:13 -04:00
• 5b6fd11745 give a box collider and better physics to Pillows jparent 2015-08-23 01:59:49 -04:00
• 5607dc8355 Merge branch 'master' of https://github.com/conjureets/pillowfight jparent 2015-08-23 01:42:18 -04:00
• bb398ce257 make pillows pickable after being thrown jparent 2015-08-23 01:40:55 -04:00
• 0679101b46 Merge branch 'master' of https://github.com/ConjureETS/PillowFight Patrice Vignola 2015-08-22 23:23:53 -04:00
• 1c42b584c2 Add the door open mechanic when the mom comes in Patrice Vignola 2015-08-22 23:23:17 -04:00
• dcbf2df911 add Throwing of pillow and push back on hit jparent 2015-08-22 23:21:24 -04:00
• 9af60216b6 Merge branch 'master' of https://github.com/conjureets/pillowfight jparent 2015-08-22 22:31:54 -04:00
• 71b2eae11e correct forward facing angle when not auto locking jparent 2015-08-22 22:30:38 -04:00
• 9bf9b5aaef Merge branch 'master' of https://github.com/ConjureETS/PillowFight Patrice Vignola 2015-08-22 21:48:57 -04:00
• 28346a7a9c Add a lot of new furnitures Patrice Vignola 2015-08-22 21:48:38 -04:00
• f470b653be Fixed the auto target scripts RosimInc 2015-08-22 21:13:15 -04:00
• 2b47de9dba Merge branch 'master' of https://github.com/ConjureETS/PillowFight RosimInc 2015-08-22 18:40:57 -04:00
• 7658096653 Started fixing auto-target And everything is gonna break RosimInc 2015-08-22 18:38:54 -04:00
• 636a767566 Add the new walls and door Patrice Vignola 2015-08-22 18:38:11 -04:00
• 9ce93ceca6 Merge branch 'master' of https://github.com/ConjureETS/PillowFight Patrice Vignola 2015-08-22 17:30:11 -04:00
• fd1672f212 Add a bunch of stuff Patrice Vignola 2015-08-22 17:29:59 -04:00
• 275bec897d Merge branch 'master' of https://github.com/ConjureETS/PillowFight RosimInc 2015-08-22 17:13:42 -04:00
• c0ee9a7b78 Added a light flicker RosimInc 2015-08-22 17:13:33 -04:00
• 0c9796c8c0 Merge branch 'master' of https://github.com/conjureets/pillowfight jparent 2015-08-22 17:03:28 -04:00
• f6181556f5 add basic auto targeting, but it needs ajustements jparent 2015-08-22 16:59:45 -04:00
• 17974bed9b add basic pillow script jparent 2015-08-22 16:55:31 -04:00
• a31eab5996 Finished door easing and optimised shadow positioning RosimInc 2015-08-22 15:45:00 -04:00
• b89e7e1341 Merge branch 'master' of https://github.com/ConjureETS/PillowFight RosimInc 2015-08-22 14:24:29 -04:00
• 6b2560b294 Created light with mom's shadow, and a test scene with opening door. RosimInc 2015-08-22 14:24:18 -04:00
• 516f6b6791 Add the new bed prefabs and fixed the movement (I think) Patrice Vignola 2015-08-22 14:01:28 -04:00
• d7092b4af6 Fix the lava damage taken when jumping a lot in it Patrice Vignola 2015-08-22 11:35:44 -04:00
• d439d7dce5 Add a temporary "push" method for when the player will get knocked back by a pillow Patrice Vignola 2015-08-22 10:08:59 -04:00
• e76e32efe7 Restrict the bed usage to only one child per bed Patrice Vignola 2015-08-22 09:40:30 -04:00
• a030642c8d Add the child being noticed when he stands on floor (need to add the consequences though) Patrice Vignola 2015-08-22 05:48:22 -04:00
• c0f938a59a Merge branch 'master' of https://github.com/ConjureETS/PillowFight Patrice Vignola 2015-08-22 05:34:52 -04:00
• 098cdefe14 Add the behavior of the floor changing color when the mom enters the room Patrice Vignola 2015-08-22 05:31:34 -04:00
• d0e0286029 add a sphere collider to Child to pickup pillows jparent 2015-08-22 05:11:16 -04:00