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
910261f41c
Merged in daniel_level (pull request #42 )
...
Changed Elevators in Stomach, Heart, and Throat
2024-02-07 01:27:46 +00:00
e71dea4f01
Changed Elevators in Stomach, Heart, and Throat
2024-02-06 20:25:45 -05:00
e593fdbeaf
Merged in BrigitteR_Level (pull request #41 )
...
C Test 1: Half size
2024-02-07 01:18:42 +00:00
d42c3ac3e0
Merged main into BrigitteR_Level
2024-02-07 01:18:06 +00:00
da719fbc53
Merged in joe_ui (pull request #40 )
...
Joe ui
2024-02-07 01:16:05 +00:00
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
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
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
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
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
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
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
ac9b6510d5
Merged in daniel_level (pull request #33 )
...
Added Blocking for Stomach and Heart
2024-02-03 14:18:09 +00:00
ddb1d7555e
Blocked Copied Lungs
2024-02-03 04:26:18 -08:00
74ac512f6a
Added Blocking for Stomach and Heart
2024-02-03 00:30:20 -05:00
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
d367996562
Merged in BrigitteR_Level (pull request #31 )
...
Edited Throat Blocking
2024-02-02 15:56:48 +00:00
21bc496bc6
Edited Throat Blocking
2024-02-01 17:45:26 -08:00
Joseph Rafferty
93a6560ced
Merge branch 'joe_programming' of bitbucket.org:joseph-rafferty/gam305_green_repo into joe_programming
2024-02-01 14:03:16 -05:00
Joseph Rafferty
bbe675697b
Removed unused assets
2024-02-01 14:02:56 -05:00
6a2e681216
Merged main into joe_programming
2024-02-01 19:02:09 +00:00
7416cfbe74
Merged in joe_programming (pull request #30 )
...
Removed unused assets
2024-02-01 19:01:58 +00:00
Joseph Rafferty
73ce7df441
Removed unused assets
2024-02-01 14:01:05 -05:00
c7ca5ade74
Merged main into daniel_level
2024-02-01 18:33:11 +00:00
bb47f8f4dd
Merged joe_programming into main
2024-02-01 18:32:15 +00:00
49b5d994a4
Merged main into joe_programming
2024-02-01 13:26:20 -05:00
2915d64b6f
Merged in joe_programming (pull request #28 )
...
added floating virus AI
2024-02-01 18:13:25 +00:00
Joseph Rafferty
50dceee910
resolving merge conflict
2024-02-01 13:01:30 -05:00
Joseph Rafferty
ab2d6224a4
Merge branch 'daniel_level' of bitbucket.org:joseph-rafferty/gam305_green_repo into daniel_level
2024-02-01 12:51:43 -05:00
Joseph Rafferty
d5b8b09357
Merge branch 'joe_programming' of bitbucket.org:joseph-rafferty/gam305_green_repo into joe_programming
2024-02-01 12:35:53 -05:00
Joseph Rafferty
dfe3443eb2
added floating virus AI
2024-02-01 12:35:19 -05:00
94dd299f15
Opened Capillaries and Applied Materials
2024-02-01 11:52:01 -05:00
0e9f3134b0
Merged main into joe_programming
2024-02-01 14:02:06 +00:00
c6a277b297
Merged in joe_programming (pull request #25 )
...
Time offset for reproduction, ammo type, task list, moving platform, armor indication on player, and player damage.
2024-02-01 01:15:22 +00:00
Joseph Rafferty
260de3ea03
Added time offset to AI reproduction. Got ammo only killing correct virus. Task list hazmat suit, samples collected, vaccines created, and remaining viruses working correctly. Finished moving platform BP actor (no more stutter). Added color change to character when wearing hazmat suit. Viruses, samples, and acid pools all damage player correctly.
2024-01-31 20:11:40 -05:00
e995f6afe4
Merged in joe_programming (pull request #24 )
...
Viruses are replicating in random location with random type. Updated hotbar with new asset. Hotbar functionality implemented. Updated Task list to look better. Replaced bounding box in floating virus actor with bouding box actor of its own.
2024-01-31 04:22:38 +00:00
Joseph Rafferty
c378937919
Viruses are replicating in random location with random type. Updated hotbar with new asset. Hotbar functionality implemented. Updated Task list to look better. Replaced bounding box in floating virus actor with bouding box actor of its own.
2024-01-30 23:21:23 -05:00
Joseph Rafferty
Joseph Rafferty
Daniel Noel
Brigitte Rollain