Commit graph

65 commits

Author SHA1 Message Date
shakurass
76844a8da5 Added title scene 2014-04-27 15:06:17 -06:00
Joey Payne
6220e2d0e8 Added bottles to scene. 2014-04-27 14:04:06 -06:00
Joey Payne
aa0e91d8fc Added bar decals. 2014-04-27 13:54:54 -06:00
shakurass
c5899be38c working on player move up animation. 2014-04-27 13:54:38 -06:00
shakurass
fa03db0e61 Merge branch 'master' of https://github.com/jyapayne/DemonShanker2
Conflicts:
	Assets/Scripts/PlayerController.cs
2014-04-27 13:19:25 -06:00
shakurass
2abd70e08f Added new patron animations. 2014-04-27 13:13:34 -06:00
Joey Payne
02682da8eb Made player turn when directions are pushed. 2014-04-27 13:09:53 -06:00
shakurass
d0a546ffac Smoothed animation for taking a swig. 2014-04-27 11:55:25 -06:00
Dave Kerr
1aa9a08590 Better video, not blurry! 2014-04-27 11:29:31 -06:00
Joey Payne
8a21825f05 Added start button and hero facing away from screen animation. 2014-04-27 11:17:13 -06:00
shakurass
1be47add34 Separated walk AI from demon/patron reactions. 2014-04-27 11:02:42 -06:00
Wilson Leong
0a866b7574 Minor pathing fix 2014-04-27 09:00:27 -06:00
Dave Kerr
ed4a29e04c Video teaser for DS2. Can't get it to not be fuzzy :( 2014-04-27 08:17:35 -06:00
Wilson Leong
a45b62181a Mecanim homeless animation 2014-04-26 22:30:12 -06:00
Wilson Leong
65e43434b9 Merge branch 'master' of https://github.com/jyapayne/DemonShanker2
Conflicts:
	Assets/Audio/beneath-surface-4.ogg.meta
	Assets/Scripts/PlayerController.cs
2014-04-26 21:59:52 -06:00
shakurass
abf4983ffa Messing with patron objects. 2014-04-26 21:54:17 -06:00
Wilson Leong
ad20794a0f Wip animation 2014-04-26 21:50:38 -06:00
shakurass
f82c126b8a Removed old shank sound 2014-04-26 21:04:49 -06:00
shakurass
d4a6d0bb00 Added Swigs left gui text. 2014-04-26 20:59:09 -06:00
Joey Payne
7c6613987e Added more realistic shank. 2014-04-26 20:38:57 -06:00
Dave Kerr
5e7c4e2c6c Narration with 'beneath-the-surface' words inside. 2014-04-26 20:34:05 -06:00
shakurass
78e42c158c Added textures and drinking mechanics. 2014-04-26 18:16:21 -06:00
Joey Payne
afac437ff4 Added floor. 2014-04-26 17:41:39 -06:00
Joey Payne
65e057bfbb Added individual walls for now. 2014-04-26 17:32:23 -06:00
shakurass
a4bf704306 Vodka vision implemented 2014-04-26 17:28:38 -06:00
Joey Payne
97e36bd4eb Added idle animation for hobo. 2014-04-26 17:23:44 -06:00
Joey Payne
131a98f87a Added wall sprite art. 2014-04-26 17:18:38 -06:00
Dave Kerr
e0d0745a2f SFX if you stab the wrong guy. 2014-04-26 16:45:08 -06:00
Dave Kerr
c8b85eba21 Merge branch 'master' of https://github.com/jyapayne/DemonShanker2 2014-04-26 16:41:37 -06:00
Dave Kerr
bab49ed8cc Sound effects. 2014-04-26 16:40:52 -06:00
Joey Payne
eec2e2f201 Added the demon head. 2014-04-26 16:37:35 -06:00
shakurass
6010d3916f Removed old player object. 2014-04-26 16:04:09 -06:00
shakurass
e8c5eec9ce Commit changes to player controller and object. 2014-04-26 15:50:10 -06:00
Joey Payne
2a295d76cd Added sprite sheets for bum. 2014-04-26 15:45:00 -06:00
Joey Payne
73fc3926f2 Added a sick sprite sheet that I forgot. 2014-04-26 15:39:08 -06:00
Joey Payne
301e9c9783 Added some sick sprite sheets. 2014-04-26 15:35:12 -06:00
shakurass
4308538814 Merge branch 'master' of https://github.com/jyapayne/DemonShanker2 2014-04-26 15:26:45 -06:00
shakurass
57c8fdad83 Started Player sprite and collider. 2014-04-26 15:26:16 -06:00
Wilson Leong
6d6d715c6e Nav points merged back in 2014-04-26 14:52:07 -06:00
Wilson Leong
828a0b50dd Patrons have destination list 2014-04-26 14:49:29 -06:00
shakurass
04200df045 Added shanking mechanic to kill patron. 2014-04-26 14:13:06 -06:00
Joey Payne
3bf37536fb Added initial generic poser guy without animations. 2014-04-26 13:54:01 -06:00
Wilson Leong
71cfc3b3a3 Nav mesh 2014-04-26 13:46:16 -06:00
Wilson Leong
1f41eaa61c Motor 2014-04-26 13:39:01 -06:00
shakurass
6e96537b25 Resolving conflicts. 2014-04-26 13:38:34 -06:00
shakurass
f0f6c6cbe6 Implementation of shanking mechanics. 2014-04-26 13:23:11 -06:00
Joey Payne
e3bca32a6e Added some sprites for bar table and window. 2014-04-26 13:10:36 -06:00
Dave Kerr
c05838872d Concept sketches + notes. 2014-04-26 12:50:54 -06:00
Dave Kerr
f5fa59d4d4 Some good shankin tunes!
Not the best, maybe too noisy.
Discard if bad fit.
2014-04-26 12:43:20 -06:00
Joey Payne
56e3032ba8 Added some sprites for tables, chairs and stools. 2014-04-26 11:39:34 -06:00