Randall Dolifka
|
0032b3b3ba
|
Updated text to match new font; fixed line endings again.
|
2017-11-29 22:49:53 -06:00 |
|
Randall Dolifka
|
9baa4042dc
|
Merge branch 'master' into feature/communications
|
2017-11-29 22:46:06 -06:00 |
|
Randall Dolifka
|
f7a20035a1
|
Fixed score bars; fixed line endings.
|
2017-11-29 22:39:12 -06:00 |
|
Randall Dolifka
|
6b91eb1069
|
Added guard notification and mission log UI; now tracking missions. Things might be broken idk.
|
2017-11-29 22:29:40 -06:00 |
|
darrelmarek
|
cae22cb713
|
made everything exo
|
2017-11-28 15:30:48 -06:00 |
|
Darrel Marek
|
4a431034a0
|
Hooked up start and exit buttons
|
2017-11-27 20:27:19 -06:00 |
|
Darrel Marek
|
b9b59168bc
|
Created main menu
|
2017-11-27 17:56:51 -06:00 |
|
Randall Dolifka
|
14634378ef
|
Fixed guard camera UIs such that status text is rendered appropriately for all cameras
|
2017-11-26 21:23:09 -06:00 |
|
Randall
|
30dff852ba
|
Erge branch 'master-with-aesthetics'
|
2017-11-14 14:55:28 -06:00 |
|
darrelmarek
|
d3d8ce970c
|
added animations including rummage
|
2017-11-10 09:30:13 -06:00 |
|
Randall
|
d7a03d4267
|
Fixed indentation.
|
2017-11-09 14:54:12 -06:00 |
|
Randall
|
6d229ffbfa
|
Merge branch 'feature/guard-screen' into master-with-aesthetics
|
2017-11-09 14:43:48 -06:00 |
|
Steven
|
edc557811f
|
almost finished guard camera raycasting
|
2017-11-09 14:04:38 -06:00 |
|
darrelmarek
|
19356be1fe
|
Tried to implement rummage - not quite there
|
2017-11-09 10:29:30 -06:00 |
|
darrelmarek
|
ee23823e17
|
added couch, plants, and table; added rummaging animation
|
2017-11-09 10:18:58 -06:00 |
|
Steven
|
b90f683105
|
changed to working animation
|
2017-11-09 02:13:24 -06:00 |
|
Steven
|
4d871b48f8
|
GuardCamera Raycast works
|
2017-11-09 02:07:37 -06:00 |
|
Steven
|
aea5f6382c
|
Merge remote-tracking branch 'origin/player-object-interactions'
|
2017-11-09 00:02:59 -06:00 |
|
Steven
|
c1b6fba839
|
exporting .blend files as .fbx files
|
2017-11-08 23:52:43 -06:00 |
|
Steven
|
ff0652636d
|
created MissionObject
|
2017-11-08 22:34:47 -06:00 |
|
darrelmarek
|
f9542183d2
|
added statue
|
2017-11-08 15:38:37 -06:00 |
|
darrelmarek
|
abd676f6d8
|
prefab stuff i dont know
|
2017-11-07 15:53:28 -06:00 |
|
darrelmarek
|
c6bd926a74
|
Removed old levels, renamed current level, raised characters up, added bookcase
|
2017-11-07 15:52:38 -06:00 |
|
Randall Dolifka
|
fc1fdcd89c
|
Added more notes for future work.
|
2017-11-05 22:07:06 -06:00 |
|
Randall Dolifka
|
041e4d4e08
|
Added preview mode for guard cameras - now they can be viewed all at once. Needs UI changes to make this more usable.
|
2017-11-05 22:02:03 -06:00 |
|
darrelmarek
|
768661517d
|
added couch, increased navmesh offset on characters
|
2017-11-02 15:49:51 -05:00 |
|
darrelmarek
|
f711b69fd4
|
removed an unecessary debug log
|
2017-11-02 14:31:33 -05:00 |
|
darrelmarek
|
4df23fb3fe
|
tweaked anim times more
|
2017-11-02 14:28:20 -05:00 |
|
shadow8t4
|
5363fd1c04
|
Updated TEST scene.
|
2017-10-31 15:07:41 -05:00 |
|
shadow8t4
|
dea0fe39e1
|
Added updated music.
|
2017-10-31 15:06:23 -05:00 |
|
Steven
|
4d9f59e3c4
|
init commit
|
2017-10-31 13:33:08 -05:00 |
|
darrelmarek
|
697d009656
|
tweaked anim times
|
2017-10-26 15:42:30 -05:00 |
|
darrelmarek
|
2e44ff6a77
|
tweaked anims
|
2017-10-24 16:10:53 -05:00 |
|
darrelmarek
|
e17b9a4c21
|
Added new models !
|
2017-10-24 16:05:54 -05:00 |
|
darrelmarek
|
e194ed24a9
|
more stuff
|
2017-10-24 14:29:07 -05:00 |
|
Darrel Marek
|
2e1c5e8444
|
not sure
|
2017-10-24 00:48:53 -05:00 |
|
Darrel Marek
|
8a25f18aeb
|
even newer level.. (TEST)
|
2017-10-23 23:36:30 -05:00 |
|
darrelmarek
|
f53e6e309b
|
lighting stuff..
|
2017-10-23 16:20:40 -05:00 |
|
darrelmarek
|
bcabda17c4
|
Added base walls
|
2017-10-23 09:48:18 -05:00 |
|
darrelmarek
|
4f10820d5e
|
Duplicated old level
works !
|
2017-10-23 08:26:23 -05:00 |
|
jrdoli
|
2fedeebcfe
|
Merge pull request #37 from jrdoli/feature/guard-cameras
Guard Cameras (Issue #26)
|
2017-10-17 15:06:05 -05:00 |
|
Randall
|
d188c3c08f
|
Removed old guard test scene. No longer needed.
|
2017-10-17 15:05:16 -05:00 |
|
Randall
|
d68981698f
|
Finished merging changes into combined test scene.
|
2017-10-17 15:04:31 -05:00 |
|
Randall
|
80e0c3bdb0
|
Manually merged in GameManager.cs
|
2017-10-17 14:47:28 -05:00 |
|
Randall
|
d05a0a88d0
|
Merge branch 'master' into feature/guard-cameras
|
2017-10-17 14:45:02 -05:00 |
|
Steven Leal
|
3acf32ea8b
|
Merge pull request #38 from jrdoli/score-ui
Score ui
|
2017-10-17 14:30:30 -05:00 |
|
Steven
|
45dda740a0
|
spies trigger win animation after 3 complete missions
|
2017-10-17 01:39:47 -05:00 |
|
Randall Dolifka
|
629237a357
|
Updated to latest Unity I think.
|
2017-10-16 22:35:17 -05:00 |
|
Randall Dolifka
|
aabd87ea2e
|
Cleaned up camera code, added locks to camera so only one player can control it at a time.
|
2017-10-16 22:08:59 -05:00 |
|
Randall Dolifka
|
8d4ec72dda
|
Removed VS files and updated .gitignore.
|
2017-10-16 17:01:40 -05:00 |
|