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
2e38fea28b
Merged in slime_assets (pull request #23 )
...
removed BP_SlimeVirusSample (duplicate)
2024-01-30 21:15:55 +00:00
1095cc605a
Merged main into slime_assets
2024-01-30 21:15:43 +00:00
Joseph Rafferty
7982420c70
removed BP_SlimeVirusSample (duplicate)
2024-01-30 16:14:02 -05:00
795f44cc22
Merged in joe_slime_testing (pull request #22 )
...
Joe slime testing
2024-01-30 21:09:59 +00:00
Joseph Rafferty
5cdda25ab2
created animations and animBP for slime virus.
2024-01-30 16:07:27 -05:00
Joseph Rafferty
9a74e35e97
added slime vidus model and animation
2024-01-30 13:40:37 -05:00
Joseph Rafferty
5e9b862b9d
Added and reorganized assets in import folder.
2024-01-30 10:35:46 -05:00
35dc74d6a9
Merged in joe_programming (pull request #21 )
...
fixing merge issue
2024-01-30 03:21:36 +00:00
Joseph Rafferty
394637a932
fixing merge issue
2024-01-29 22:20:50 -05:00
Joseph Rafferty
9de237e8fb
Merge branch 'main' of bitbucket.org:joseph-rafferty/gam305_green_repo into joe_programming
2024-01-29 22:17:20 -05:00
db33ded973
Merged in joe_programming (pull request #20 )
...
slime virus AI, added OCR font
2024-01-30 03:16:54 +00:00
Joseph Rafferty
69e7d2b884
fixing merge conflict
2024-01-29 22:14:43 -05:00
Joseph Rafferty
8ac43b5bd2
fixing merge conflict
2024-01-29 22:12:04 -05:00
Joseph Rafferty
59fe9ac0cd
slime virus AI, added OCR font
2024-01-29 21:48:41 -05:00
24b4ed577e
Merged in BrigitteR_Level (pull request #19 )
...
More Blocking
2024-01-30 02:46:45 +00:00
a51b4f82f6
More Blocking
2024-01-29 18:39:25 -08:00
3d3b55720a
Merged in BrigitteR_Level (pull request #18 )
...
Blocked out capillaries
2024-01-29 13:41:54 +00:00
153e90cd5f
Blocked out capillaries
2024-01-29 02:48:47 -08:00
d1a3b304ea
Merged in daniel_level (pull request #17 )
...
Changed Project Name
2024-01-27 05:14:12 +00:00
496e9869dd
Merged main into daniel_level
2024-01-27 05:13:59 +00:00
9c8cdef31b
Merged main into daniel_level
2024-01-27 05:13:43 +00:00
bcbe2d2c72
Changed Project Name
2024-01-27 00:10:15 -05:00
Joseph Rafferty
5d6adc281a
Changed the name of the project back to GAM305_FirstPerson.uproject
2024-01-27 00:07:19 -05:00
2ceb51c34f
Merged in joe_programming (pull request #16 )
...
Created Virus Sample and updated hotbar
2024-01-27 05:01:51 +00:00
Joseph Rafferty
badda09971
Created Virus Sample and updated hotbar
2024-01-27 00:00:42 -05:00
8003ad286d
Merged in daniel_level (pull request #15 )
...
Daniel level
2024-01-27 04:57:56 +00:00
029fa1c051
Merged main into daniel_level
2024-01-27 04:57:31 +00:00
69eb5543f6
Removed Unused Materials
2024-01-26 23:43:04 -05:00
f5d2c0a29b
Rooms and Internal Lights Added
2024-01-26 23:16:39 -05:00
f523754980
Merged in joe_programming (pull request #14 )
...
Added Lab, Armor, Health pickup, Acid pool. Update Healthbar, task list, and hotbar.
2024-01-27 02:20:00 +00:00
Joseph Rafferty
857fab7dbc
Added Lab, Armor, Health pickup, Acid pool. Update Healthbar, task list, and hotbar.
2024-01-26 21:18:10 -05:00
33cff2056c
Merged in joe_programming (pull request #13 )
...
Created tab functionality for task list. Added hotbar. Added nintendo style font. Made adjustments to HUD setup.
2024-01-26 06:54:50 +00:00
Joseph Rafferty
03d8768f26
created tab functionality for task list. Added hotbar. Added nintendo style font. made adjustments to HUD setup.
2024-01-26 01:53:27 -05:00
d90e58a744
Merged in joe_programming (pull request #12 )
...
Added virus type enum and started virus reproduction component
2024-01-26 00:04:09 +00:00
2bdf643aa4
Merged main into joe_programming
2024-01-26 00:03:57 +00:00
938325759f
Merged in BrigitteR_Level (pull request #11 )
...
Created spline wall and capillary blueprints
2024-01-26 00:03:17 +00:00
Joseph Rafferty
Joseph Rafferty
Daniel Noel
Brigitte Rollain