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

101 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
RosimInc
2418d5dec8 Merge branch 'master' of https://github.com/ConjureETS/PillowFight 2015-08-23 14:06:15 -04:00
RosimInc
495e1dd259 Continued implementation of main menus 
Signed-off-by: RosimInc <rosim_inc@hotmail.com>
 2015-08-23 14:06:03 -04:00
jparent
05ef9a9108 Merge branch 'master' of https://github.com/conjureets/pillowfight 
Conflicts:
	Assets/Prefabs/Child.prefab
	Assets/Scripts/Child.cs
 2015-08-23 13:55:59 -04:00
RosimInc
2ee831b878 Began the pillow swinging action 
Signed-off-by: RosimInc <rosim_inc@hotmail.com>
 2015-08-23 13:53:36 -04:00
jparent
989342197c fix Throwing pillow to not snap but still auto aim 
Right joystick still rotates the player, but no longer snaps to a player.
Also, the auto-targeting is now used exlusively inside the Child's Throw
method. When throwing, it checks if there is a player in the direction the
player is pointing. If so, then the pillow is going this way, else it goes
in the Child's forward position.
 2015-08-23 13:46:54 -04:00
Patrice Vignola
5bb2c06297 Anchor modifications 2015-08-23 13:28:57 -04:00
Patrice Vignola
040fb28f17 Merge branch 'master' of https://github.com/ConjureETS/PillowFight 2015-08-23 13:20:33 -04:00
Patrice Vignola
e4ee5509f6 Commit for pull 2015-08-23 13:20:22 -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
b0ac99ba0e Merge branch 'master' of https://github.com/ConjureETS/PillowFight 2015-08-23 13:14:16 -04:00
Patrice Vignola
e7671d3014 Merge branch 'master' of https://github.com/ConjureETS/PillowFight 2015-08-23 13:11:47 -04:00
Patrice Vignola
f0e46a9429 New pillow texture 2015-08-23 13:11:34 -04:00
jparent
a2ebee6e24 Merge branch 'master' of https://github.com/conjureets/pillowfight 2015-08-23 13:10: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
jparent
40de80efd3 add UI Button to Sleep on bed when Mom is coming 2015-08-23 13:07:12 -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
Patrice Vignola
9d82191cbc Character animation 2015-08-23 13:02:34 -04:00
jparent
48be2a5587 add default quality settings... 2015-08-23 12:26:58 -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
50df0f82c8 Merge branch 'master' of https://github.com/ConjureETS/PillowFight 2015-08-23 11:25:22 -04:00
Patrice Vignola
df8463f3a2 Tried stuff 2015-08-23 11:25:01 -04:00
jparent
4568e77871 fix the auto-target to lock only when looking 
else, look in the direction we're going
 2015-08-23 10:21:06 -04:00
jparent
91cf1734ba reduce minimum angle range for auto-target to 10 2015-08-23 10:18:44 -04:00
jparent
15d1776957 change controls to throw with Right Trigger 
change the ControllerMapper so that throwing a pillow is now done with the
Right Trigger insead of B button.
 2015-08-23 09:46:46 -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
jparent
942fc792ef Merge branch 'master' of https://github.com/conjureets/pillowfight 2015-08-23 04:13:50 -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
6ecf410bd9 Merge branch 'master' of https://github.com/conjureets/pillowfight 
Conflicts:
	Assets/Prefabs/Pillow.prefab
	Assets/Scripts/Floor.cs
 2015-08-23 04:06:48 -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
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
f6ae2d05c0 Fix a bug in the pillow spawner script 2015-08-23 02:21:51 -04:00
Patrice Vignola
f94cca5844 Merge branch 'master' of https://github.com/ConjureETS/PillowFight 2015-08-23 02:11:32 -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
jparent
5b6fd11745 give a box collider and better physics to Pillows 2015-08-23 01:59:49 -04:00
jparent
5607dc8355 Merge branch 'master' of https://github.com/conjureets/pillowfight 2015-08-23 01:42:18 -04:00
jparent
bb398ce257 make pillows pickable after being thrown 2015-08-23 01:40:55 -04:00
Patrice Vignola
0679101b46 Merge branch 'master' of https://github.com/ConjureETS/PillowFight 2015-08-22 23:23:53 -04:00
Patrice Vignola
1c42b584c2 Add the door open mechanic when the mom comes in 2015-08-22 23:23:17 -04:00