Commit graph

95 commits

Author SHA1 Message Date
shakurass
7559650d35 Fixed demon to patron ratio issue. 2014-04-30 13:48:51 -06:00
Joey Payne
e5d23e27fa Fixed web version of scene so that instructions are visible. 2014-04-28 10:55:35 -06:00
shakurass
d5c99b2a7c Normalizing audio. 2014-04-28 08:15:42 -06:00
shakurass
d3562b5240 Project cleanup. 2014-04-28 08:10:32 -06:00
Joey Payne
c2a61944cb Some updated files for some reason. 2014-04-27 23:35:00 -06:00
Joey Payne
29a6295c49 saved files 2014-04-27 22:50:30 -06:00
Joey Payne
3ca369e1a8 removed files 2014-04-27 22:46:18 -06:00
Joey Payne
b4491043d0 merged shit 2014-04-27 22:45:40 -06:00
shakurass
7841a143fc Still merging the nightmare. 2014-04-27 22:04:39 -06:00
shakurass
0258302243 merging the n nightmare 2014-04-27 22:02:53 -06:00
Joey Payne
659d86544a Saved scene and project. 2014-04-27 21:50:35 -06:00
Joey Payne
8952b95ec5 Added demon heads when drinking. 2014-04-27 21:49:51 -06:00
shakurass
ee6f44b22b death sounds added. 2014-04-27 21:30:19 -06:00
shakurass
edc3c3736c Working on death sounds. 2014-04-27 21:22:32 -06:00
shakurass
0306357af8 Added game over state. 2014-04-27 20:59:59 -06:00
Joey Payne
d20da2e68c Added sound effects for scream, demon scream and gulp. 2014-04-27 20:54:42 -06:00
shakurass
43d12cc35f Added music. 2014-04-27 20:19:37 -06:00
shakurass
5ccef9b815 Fixes for git issues. 2014-04-27 19:59:59 -06:00
shakurass
b2dd779b7a moving spawn point. 2014-04-27 19:57:33 -06:00
Joey Payne
c2092e08c7 Fixed rendering issues. 2014-04-27 19:56:34 -06:00
Joey Payne
2639e11238 Added start screen button and text. 2014-04-27 19:52:46 -06:00
shakurass
5d203d1e9d Patrons now spawn in and are randomly assigned demon status. 2014-04-27 19:49:21 -06:00
shakurass
c0ee8ea5c3 Added patron spawner. 2014-04-27 18:49:23 -06:00
shakurass
5aac6aa72a Removed patrons from title scene. 2014-04-27 18:15:50 -06:00
Joey Payne
1bf6083544 Test 2014-04-27 18:14:46 -06:00
Joey Payne
718ca1d7cd Added area outside of bar to spawn dudes. 2014-04-27 16:25:29 -06:00
shakurass
a12131e77f Fixed title scene again 2014-04-27 16:06:38 -06:00
Joey Payne
8785fcd3ce Added some furniture to the scene. 2014-04-27 16:03:39 -06:00
shakurass
8cc0583a85 Added score system and updated shanking with more angles! 2014-04-27 15:50:32 -06:00
Joey Payne
5bebe754ce Added upward stab animation. 2014-04-27 15:26:02 -06:00
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