Commit graph

Select branches

Hide pull requests

master

Mono Color

• a0bf75c6dc Title music loop. master shadow8t4 2017-11-30 14:53:46 -0600
• c0e023a997 removed options button Steven Leal 2017-11-30 14:41:29 -0600
• 664814c245 Changed splash. shadow8t4 2017-11-30 14:37:04 -0600
• a20a910f1d Button soudnds shadow8t4 2017-11-30 14:32:12 -0600
• 0a1cf805ba fixed splash background Steven Leal 2017-11-30 14:29:45 -0600
• 6832045bd9 added mission complete sound and spyCaught sound Steven Leal 2017-11-30 14:27:16 -0600
• 4c415db023 guards can't keep giving spies points after someone wins Steven Leal 2017-11-30 14:11:04 -0600
• cf64a7cfc7 added timeout after game win Steven Leal 2017-11-30 13:55:45 -0600
• e4c62bda74 plant's good now Steven Leal 2017-11-30 13:47:26 -0600
• 118230c128 fixed button transparency Steven Leal 2017-11-30 13:42:51 -0600
• f88d4e5998 Fixed issue preventing spies from moving. Randall 2017-11-30 13:34:49 -0600
• 68275766d4 merged spy-ui-update Steven Leal 2017-11-30 13:21:33 -0600
• 7f20ebd211 merged spy-ui-update Steven Leal 2017-11-30 12:55:47 -0600
• ba6f0e539f sweet interaction ui changes and mission updates Steven Leal 2017-11-30 12:07:05 -0600
• 90144e086f Now preventing pause from being opened in camera zoom-in. Randall 2017-11-30 12:04:40 -0600
• 2919692ed4 Merge branch 'master' into menu Randall 2017-11-30 11:40:42 -0600
• e6fcb10f3f Added camera overlay, made subsequent tweaks to some panel text/opacity. Randall 2017-11-30 11:32:39 -0600
• 07a3822d16 Added in game menu darrelmarek 2017-11-30 11:10:59 -0600
• 6d96db65a8 Instructions darrelmarek 2017-11-30 10:25:04 -0600
• 5ad32c3146 Added Spash into build, now pops up first on open. Randall 2017-11-30 09:54:35 -0600
• e311d1eaf9 Merge branch 'master' into adding-sounds Randall 2017-11-30 09:50:55 -0600
• 7a42e6f961 Can capture spies without breaking the game now! Steven Leal 2017-11-30 08:35:56 -0600
• e4909d9d81 Splash screen now displays properly and loads MainMenu when it's done. Alexander Huddleston 2017-11-30 02:06:40 -0600
• cfd8448087 Fixed bug with spies receiving guard notifications. Randall Dolifka 2017-11-30 00:11:21 -0600
• 794614dd13 Removed another incompletable mission. Randall Dolifka 2017-11-29 23:50:24 -0600
• a96b17cd69 Added instructions for guards and spies, removed missions that do not exist. Randall Dolifka 2017-11-29 23:48:04 -0600
• 0c07952c96 Merge branch 'master' into feature/communications Randall Dolifka 2017-11-29 23:12:25 -0600
• 5293f60c7d Merge branch 'master' into adding-sounds Randall Dolifka 2017-11-29 23:07:35 -0600
• 28c8a38a49 Literally just needed to change the name and it works. Randall Dolifka 2017-11-29 23:01:58 -0600
• 15300caa23 Changed error logging level, removed default CompleteMission. Randall Dolifka 2017-11-29 22:53:52 -0600
• 0032b3b3ba Updated text to match new font; fixed line endings again. Randall Dolifka 2017-11-29 22:49:53 -0600
• 9baa4042dc Merge branch 'master' into feature/communications Randall Dolifka 2017-11-29 22:46:06 -0600
• f7a20035a1 Fixed score bars; fixed line endings. Randall Dolifka 2017-11-29 22:39:12 -0600
• 6b91eb1069 Added guard notification and mission log UI; now tracking missions. Things might be broken idk. Randall Dolifka 2017-11-29 22:29:40 -0600
• 1d15426aa4 Changed splash image and added button sounds. shadow8t4 2017-11-29 19:20:54 -0600
• 490fbcb04d I still need to change the button sounds and add a script to the splash scene, but I need to go to bed. Alexander Huddleston 2017-11-28 22:52:26 -0600
• cae22cb713 made everything exo darrelmarek 2017-11-28 15:30:48 -0600
• 26b6dac6ea Pushing all created audio assets. Alexander Huddleston 2017-11-28 02:43:52 -0600
• 4a431034a0 Hooked up start and exit buttons Darrel Marek 2017-11-27 20:27:19 -0600
• b9b59168bc Created main menu Darrel Marek 2017-11-27 17:56:51 -0600
• 14634378ef Fixed guard camera UIs such that status text is rendered appropriately for all cameras Randall Dolifka 2017-11-26 21:23:09 -0600
• 30dff852ba Erge branch 'master-with-aesthetics' Randall 2017-11-14 14:55:28 -0600
• d3d8ce970c added animations including rummage darrelmarek 2017-11-10 09:30:13 -0600
• d7a03d4267 Fixed indentation. Randall 2017-11-09 14:54:12 -0600
• 6d229ffbfa Merge branch 'feature/guard-screen' into master-with-aesthetics Randall 2017-11-09 14:43:48 -0600
• edc557811f almost finished guard camera raycasting Steven 2017-11-09 14:04:38 -0600
• 19356be1fe Tried to implement rummage - not quite there darrelmarek 2017-11-09 10:29:30 -0600
• ee23823e17 added couch, plants, and table; added rummaging animation darrelmarek 2017-11-09 10:18:58 -0600
• b90f683105 changed to working animation Steven 2017-11-09 02:13:24 -0600
• 4d871b48f8 GuardCamera Raycast works Steven 2017-11-09 02:07:37 -0600
• aea5f6382c Merge remote-tracking branch 'origin/player-object-interactions' Steven 2017-11-09 00:02:59 -0600
• c1b6fba839 exporting .blend files as .fbx files Steven 2017-11-08 23:52:43 -0600
• ff0652636d created MissionObject Steven 2017-11-08 22:34:47 -0600
• f9542183d2 added statue darrelmarek 2017-11-08 15:38:37 -0600
• abd676f6d8 prefab stuff i dont know darrelmarek 2017-11-07 15:53:28 -0600
• c6bd926a74 Removed old levels, renamed current level, raised characters up, added bookcase darrelmarek 2017-11-07 15:52:38 -0600
• fc1fdcd89c Added more notes for future work. Randall Dolifka 2017-11-05 22:07:06 -0600
• 041e4d4e08 Added preview mode for guard cameras - now they can be viewed all at once. Needs UI changes to make this more usable. Randall Dolifka 2017-11-05 22:02:03 -0600
• 768661517d added couch, increased navmesh offset on characters darrelmarek 2017-11-02 15:49:51 -0500
• f711b69fd4 removed an unecessary debug log darrelmarek 2017-11-02 14:31:33 -0500
• 4df23fb3fe tweaked anim times more darrelmarek 2017-11-02 14:28:20 -0500
• 5363fd1c04 Updated TEST scene. shadow8t4 2017-10-31 15:07:41 -0500
• dea0fe39e1 Added updated music. shadow8t4 2017-10-31 15:06:23 -0500
• 4d9f59e3c4 init commit Steven 2017-10-31 13:33:08 -0500
• 697d009656 tweaked anim times darrelmarek 2017-10-26 15:42:30 -0500
• 2e44ff6a77 tweaked anims darrelmarek 2017-10-24 16:10:53 -0500
• e17b9a4c21 Added new models ! darrelmarek 2017-10-24 16:05:54 -0500
• e194ed24a9 more stuff darrelmarek 2017-10-24 14:29:07 -0500
• 2e1c5e8444 not sure Darrel Marek 2017-10-24 00:48:53 -0500
• 8a25f18aeb even newer level.. (TEST) Darrel Marek 2017-10-23 23:36:30 -0500
• f53e6e309b lighting stuff.. darrelmarek 2017-10-23 16:20:40 -0500
• bcabda17c4 Added base walls darrelmarek 2017-10-23 09:48:18 -0500
• 4f10820d5e Duplicated old level darrelmarek 2017-10-23 08:26:23 -0500
• 2fedeebcfe Merge pull request #37 from jrdoli/feature/guard-cameras jrdoli 2017-10-17 15:06:05 -0500
• d188c3c08f Removed old guard test scene. No longer needed. Randall 2017-10-17 15:05:16 -0500
• d68981698f Finished merging changes into combined test scene. Randall 2017-10-17 15:04:31 -0500
• 80e0c3bdb0 Manually merged in GameManager.cs Randall 2017-10-17 14:47:28 -0500
• d05a0a88d0 Merge branch 'master' into feature/guard-cameras Randall 2017-10-17 14:45:02 -0500
• 3acf32ea8b Merge pull request #38 from jrdoli/score-ui Steven Leal 2017-10-17 14:30:30 -0500
• 45dda740a0 spies trigger win animation after 3 complete missions Steven 2017-10-17 01:39:47 -0500
• 629237a357 Updated to latest Unity I think. Randall Dolifka 2017-10-16 22:35:17 -0500
• aabd87ea2e Cleaned up camera code, added locks to camera so only one player can control it at a time. Randall Dolifka 2017-10-16 22:08:59 -0500
• 8d4ec72dda Removed VS files and updated .gitignore. Randall Dolifka 2017-10-16 17:01:40 -0500
• 0c4f170fb8 added win animation Steven 2017-10-15 02:38:13 -0500
• b9419896a8 added score ui and update-score animations Steven 2017-10-14 18:53:16 -0500
• e518a5d87f spys and npcs change colors again Steven 2017-10-13 19:34:01 -0500
• f284cf88eb removed extraneous options list Leal 2017-10-12 14:48:42 -0500
• 3867e5166b fixed value steven2gleal 2017-10-10 14:26:28 -0500
• 033d00d01c Merge pull request #36 from jrdoli/npc-interactions Steven Leal 2017-10-10 12:45:34 -0500
• 21397a8ee4 character interactions are good yo Steven 2017-10-10 12:43:11 -0500
• c2d8c78028 work in progress Steven 2017-10-09 18:55:07 -0500
• 2a3c2839d5 basics for interactions are now very stable Steven 2017-10-09 02:03:39 -0500
• ed145ddc56 stabilized character interactions Steven 2017-10-08 18:37:19 -0500
• 6a72fda395 removed extraneous debug statements Steven 2017-10-05 13:53:29 -0500
• a3658418a2 fixed progress bar starting at non zero value after 1st use Steven 2017-10-05 13:00:09 -0500
• 1f4855712a synced up npc communication, still need to fix spy to spy communication Steven 2017-10-05 03:13:27 -0500
• bb61bbc72d reduced collision radius steven2gleal 2017-10-03 15:37:45 -0500
• 6384117110 reduced collision radius steven2gleal 2017-10-03 15:32:45 -0500
• b48c5c1f49 fixed glow script Steven 2017-10-03 13:36:57 -0500
• 3c72f37ac6 updated characters Steven 2017-10-03 04:15:13 -0500