 Joseph Rafferty
|
5ae5062e9f
|
Resolving merge conflict
|
2024-02-08 20:08:07 -05:00 |
Joseph Rafferty
|
e1b41fc930
|
Merged in joe_ui (pull request #52)
Added border to interaction widget
|
2024-02-09 01:00:57 +00:00 |
|
Joseph Rafferty
|
9d7d80d236
|
Merged main into joe_ui
|
2024-02-09 01:00:44 +00:00 |
|
Joseph Rafferty
|
14d1c7ba0b
|
Merged in joe_level (pull request #51)
move mouth and heart to Level1 from daniel_level
|
2024-02-09 01:00:03 +00:00 |
|
Joseph Rafferty
|
5ae52c03cc
|
Added border to interaction widget
|
2024-02-08 19:58:32 -05:00 |
Daniel Noel
|
c754a01249
|
Elevators & Added Ambient Sound
|
2024-02-08 19:33:00 -05:00 |
|
Joseph Rafferty
|
0fcdb17ad1
|
move mouth and heart to Level1 from daniel_level
|
2024-02-08 10:39:04 -05:00 |
|
Joseph Rafferty
|
76789917ef
|
Merged in joe_ui (pull request #50)
Got niagara particle systems working for pickups. Imported and applied lab mesh.
|
2024-02-07 22:31:37 +00:00 |
|
Joseph Rafferty
|
15071dfa4b
|
Got niagara particle systems working for pickups. Imported and applied lab mesh.
|
2024-02-07 17:29:53 -05:00 |
|
Joseph Rafferty
|
67d13801e6
|
Merged in joe_ui (pull request #49)
Moved sA_Megapack_v1 to Content folder.
|
2024-02-07 20:31:38 +00:00 |
|
Joseph Rafferty
|
db1731a9ff
|
Merged main into joe_ui
|
2024-02-07 20:31:20 +00:00 |
|
Joseph Rafferty
|
677fce5bd9
|
Moved sA_Megapack_v1 to Content folder.
|
2024-02-07 15:29:04 -05:00 |
|
Joseph Rafferty
|
1e82343fc6
|
Merged in joe_ui (pull request #47)
Created the Goals, HUD, and Keybinds tabs for the Info Screen. Set the info screen to show on startup.
|
2024-02-07 20:24:56 +00:00 |
|
Joseph Rafferty
|
ad41ba0da6
|
Created the Goals, HUD, and Keybinds tabs for the Info Screen. Set the info screen to show on startup.
|
2024-02-07 15:24:14 -05:00 |
|
Joseph Rafferty
|
6a768a3e6f
|
Merged in joe_ui (pull request #46)
fixed story tab text moving when goals tab was selected.
|
2024-02-07 05:55:32 +00:00 |
|
Joseph Rafferty
|
3f24657aa1
|
fixed story tab text moving when goals tab was selected.
|
2024-02-07 00:54:55 -05:00 |
|
Joseph Rafferty
|
1e29e30368
|
Merged in joe_ui (pull request #45)
Added Floating virus rigged and animated model. Added rotation component to it. Started InfoScreen UI
|
2024-02-07 05:42:21 +00:00 |
|
Joseph Rafferty
|
be1235abcf
|
Merged main into joe_ui
|
2024-02-07 05:42:00 +00:00 |
|
Joseph Rafferty
|
81b1a35782
|
Added Floating virus rigged and animated model. Added rotation component to it. Started InfoScreen UI
|
2024-02-07 00:39:31 -05:00 |
|
Joseph Rafferty
|
bb6aa4c7ac
|
Merged in daniel_level (pull request #44)
Moved FirstPersonMap changes to Daniel_Level1
|
2024-02-07 02:41:29 +00:00 |
|
Daniel Noel
|
b683043f7c
|
Moved FirstPersonMap changes to Daniel_Level1
|
2024-02-06 21:39:27 -05:00 |
|
Joseph Rafferty
|
7d742baa66
|
Merged in joe_ui (pull request #43)
Made copy of Level1 named daniel_level1 for Daniel to work in.
|
2024-02-07 01:35:05 +00:00 |
|
Joseph Rafferty
|
108c37b466
|
Made copy of Level1 named daniel_level1 for Daniel to work in.
|
2024-02-06 20:34:12 -05:00 |
|
Joseph Rafferty
|
910261f41c
|
Merged in daniel_level (pull request #42)
Changed Elevators in Stomach, Heart, and Throat
|
2024-02-07 01:27:46 +00:00 |
|
Daniel Noel
|
e71dea4f01
|
Changed Elevators in Stomach, Heart, and Throat
|
2024-02-06 20:25:45 -05:00 |
|
Joseph Rafferty
|
e593fdbeaf
|
Merged in BrigitteR_Level (pull request #41)
C Test 1: Half size
|
2024-02-07 01:18:42 +00:00 |
|
Joseph Rafferty
|
d42c3ac3e0
|
Merged main into BrigitteR_Level
|
2024-02-07 01:18:06 +00:00 |
|
Joseph Rafferty
|
da719fbc53
|
Merged in joe_ui (pull request #40)
Joe ui
|
2024-02-07 01:16:05 +00:00 |
|
Joseph Rafferty
|
a1e7e2f0a6
|
Merged main into joe_ui
|
2024-02-07 01:15:31 +00:00 |
|
Joseph Rafferty
|
07c1029877
|
Added notifications to health and armor pickups as well as lab. Grouped all items for each room in Level1.
|
2024-02-06 20:13:46 -05:00 |
Brigitte Rollain
|
ba6b33229f
|
C Test 1: Half size
|
2024-02-06 10:09:52 -08:00 |
|
Joseph Rafferty
|
c80f0dfb84
|
Added hazmat required notification to virus samples when trying to pickup sample without hazmat suit.
|
2024-02-05 19:11:51 -05:00 |
|
Joseph Rafferty
|
6dd8da65ac
|
Merged in joe_ui (pull request #39)
added notification widget when near interactable object.
|
2024-02-05 18:30:28 +00:00 |
|
Joseph Rafferty
|
0b87d51a98
|
added notification widget when near interactable object.
|
2024-02-05 13:19:25 -05:00 |
|
Joseph Rafferty
|
2b0c98a7e4
|
I changed settings to get the packaging to package the correct map.
|
2024-02-04 12:07:25 -05:00 |
|
Joseph Rafferty
|
8202474737
|
added health bar changing color when hazmat suit is detected.
|
2024-02-03 20:43:16 -05:00 |
|
Joseph Rafferty
|
892f5a73a9
|
Merged in joe_programming (pull request #38)
fixed non stop virus spawning to stop when 20 viruses are spawned.
|
2024-02-03 23:38:52 +00:00 |
|
Joseph Rafferty
|
a73deee73e
|
fixed non stop virus spawning to stop when 20 viruses are spawned.
|
2024-02-03 18:38:06 -05:00 |
|
Joseph Rafferty
|
11e68e52f2
|
Merged in joe_programming (pull request #37)
set walkable angle to 50 and changed settings for shipping build.
|
2024-02-03 21:54:55 +00:00 |
|
Joseph Rafferty
|
8cbebe5bcf
|
set walkable angle to 50 and changed settings for shipping build.
|
2024-02-03 16:53:53 -05:00 |
|
Joseph Rafferty
|
67206f7a39
|
Merged in joe_programming (pull request #36)
added functionality to blocked out items and fixed some functionality. Made some changes to the capillaries.
|
2024-02-03 21:44:42 +00:00 |
|
Joseph Rafferty
|
778b131516
|
added functionality to blocked out items and fixed some functionality. Made some changes to the capillaries.
|
2024-02-03 16:31:51 -05:00 |
|
Joseph Rafferty
|
5c6700ee81
|
Merged in BrigitteR_Level (pull request #34)
Blocked Copied Lungs
|
2024-02-03 14:35:54 +00:00 |
|
Joseph Rafferty
|
72a3f4239b
|
Merged main into ddb1d75 commit for merge into main, removed ddb1d75's conflicting BP_FirstPersonCharacter
|
2024-02-03 09:34:19 -05:00 |
|
Joseph Rafferty
|
ac9b6510d5
|
Merged in daniel_level (pull request #33)
Added Blocking for Stomach and Heart
|
2024-02-03 14:18:09 +00:00 |
|
Brigitte Rollain
|
ddb1d7555e
|
Blocked Copied Lungs
|
2024-02-03 04:26:18 -08:00 |
|
Daniel Noel
|
74ac512f6a
|
Added Blocking for Stomach and Heart
|
2024-02-03 00:30:20 -05:00 |
|
Joseph Rafferty
|
0bf074041f
|
Merged in joe_programming (pull request #32)
Joe programming
|
2024-02-02 20:08:02 +00:00 |
|
Joseph Rafferty
|
470e8126f8
|
Merge branch 'joe_programming' of bitbucket.org:joseph-rafferty/gam305_green_repo into joe_programming
|
2024-02-02 13:31:10 -05:00 |
|
Joseph Rafferty
|
4978e37a29
|
made changes to room textures and throat platform meshes
|
2024-02-02 13:29:11 -05:00 |