99735007d6
Merged in release/FinalBeta (pull request #66 )
...
Merged main into release/FinalBeta
2024-02-10 20:03:40 +00:00
7eede018e3
Merged main into release/FinalBeta
2024-02-10 20:01:54 +00:00
0aff95b73b
Merged in joe_level_update (pull request #65 )
...
added the jump pad changes in the stomach, replaced the throat elevator with daniels cylinder one, adjusted the lung ambiance attenuation, and adjusted the heart jump pad.
2024-02-10 20:01:09 +00:00
Joseph Rafferty
71ded86813
added the jump pad changes in the stomach, replaced the throat elevator with daniels cylinder one, adjusted the lung ambiance attenuation, and adjusted the heart jump pad.
2024-02-10 14:59:51 -05:00
d66f5d2a8b
Merged in joe_ui (pull request #64 )
...
imported object pickup sound and added to samples, health, and hazmat suit. Updated story
2024-02-10 18:35:14 +00:00
Joseph Rafferty
7d2567a052
imported object pickup sound and added to samples, health, and hazmat suit. Updated story
2024-02-10 13:34:38 -05:00
5fcf8b6b8a
Merged in joe_ui (pull request #63 )
...
Joe ui
2024-02-10 17:56:14 +00:00
91eccf0f97
Merged main into joe_ui
2024-02-10 17:55:47 +00:00
Joseph Rafferty
a7020e11fa
Added sounds to UI elements
2024-02-10 12:53:37 -05:00
Joseph Rafferty
5c345ea674
I added a map and keybind to M to toggle it and updated keybind info screen. I adjusted the Health Pickup color.
2024-02-10 12:32:47 -05:00
Joseph Rafferty
f4ac0c9f68
Fixed tab not working when long pressed. Removed focusable from tab buttons
2024-02-10 11:02:52 -05:00
f554c8d0e8
Merged in BrigitteR_Level (pull request #62 )
...
Changed the Lung textures
2024-02-10 04:17:23 +00:00
4d4649a41d
Merged main into BrigitteR_Level
2024-02-10 04:17:13 +00:00
d7690b5165
Merged in daniel_level (pull request #61 )
...
Fixed Stomach & Throat Exits
2024-02-10 04:16:35 +00:00
5e7b476373
Fixed Stomach & Throat Exits
2024-02-09 20:56:05 -05:00
ed387995ce
Changed the Lung textures
2024-02-09 16:16:17 -08:00
ee69afddaa
Merged in joe_ui (pull request #60 )
...
changed texture streaming pool size to 1500
2024-02-09 23:34:40 +00:00
Joseph Rafferty
e8ba0b3391
changed texture streaming pool size to 1500
2024-02-09 18:33:15 -05:00
9f52157fa8
Merged in joe_ui (pull request #59 )
...
WallDoor was giving packaging error, replaced with old version. changed virus sample in lung to beta.
2024-02-09 19:25:50 +00:00
Joseph Rafferty
b43938032d
WallDoor was giving packaging error, replaced with old version. changed virus sample in lung to beta.
2024-02-09 14:25:18 -05:00
57c902dcd3
Merged in joe_ui (pull request #58 )
...
deleted daniel_level1 and made noe copy of Level1 and renamed to daniel_level1
2024-02-09 19:12:30 +00:00
Joseph Rafferty
d8aae43c0d
deleted daniel_level1 and made noe copy of Level1 and renamed to daniel_level1
2024-02-09 14:10:15 -05:00
1e3aba5df9
Merged in joe_ui (pull request #57 )
...
Finished info screen, moved lab, moved player start, added light over lab.
2024-02-09 19:01:48 +00:00
Joseph Rafferty
e43b25c30e
Finished info screen, moved lab, moved player start, added light over lab.
2024-02-09 14:00:57 -05:00
6783454ffa
Merged in joe_ui (pull request #56 )
...
fixed notification bug, and added virus hazard image
2024-02-09 16:55:42 +00:00
Joseph Rafferty
1f74f04d42
fixed notification bug, and added virus hazard image
2024-02-09 11:55:06 -05:00
4389193683
Merged in joe_ui (pull request #55 )
...
Joe ui
2024-02-09 16:43:45 +00:00
Joseph Rafferty
88a56bd2b7
Removed FirstPersonMap, which is an outdated version. Copied Heart, Lungs, and Stomach to Level1. Added sound to hazmat suit pickup.
2024-02-09 11:17:39 -05:00
Joseph Rafferty
fd0cc576c4
removed unused folders from daniel_level
2024-02-09 09:38:55 -05:00
1eb4097f91
Merged in daniel_level (pull request #54 )
...
Daniel level
2024-02-09 14:37:07 +00:00
58287fe2ba
Merged main into daniel_level
2024-02-09 14:36:37 +00:00
09d2251593
Merged in daniel_level (pull request #53 )
...
Elevators & Added Ambient Sound
2024-02-09 01:10:25 +00:00
Joseph Rafferty
5ae5062e9f
Resolving merge conflict
2024-02-08 20:08:07 -05:00
Joseph Rafferty
ed910be651
Merge branch 'daniel_level' of bitbucket.org:joseph-rafferty/gam305_green_repo into daniel_level
2024-02-08 20:03:45 -05:00
e1b41fc930
Merged in joe_ui (pull request #52 )
...
Added border to interaction widget
2024-02-09 01:00:57 +00:00
9d7d80d236
Merged main into joe_ui
2024-02-09 01:00:44 +00:00
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
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
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
67d13801e6
Merged in joe_ui (pull request #49 )
...
Moved sA_Megapack_v1 to Content folder.
2024-02-07 20:31:38 +00:00
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
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
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
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
Joseph Rafferty
Daniel Noel
Brigitte Rollain