Joseph Rafferty
|
2e38fea28b
|
Merged in slime_assets (pull request #23)
removed BP_SlimeVirusSample (duplicate)
|
2024-01-30 21:15:55 +00:00 |
Joseph Rafferty
|
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 |
Joseph Rafferty
|
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 |
Joseph Rafferty
|
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 |
Joseph Rafferty
|
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 |
Joseph Rafferty
|
24b4ed577e
|
Merged in BrigitteR_Level (pull request #19)
More Blocking
|
2024-01-30 02:46:45 +00:00 |
Brigitte Rollain
|
a51b4f82f6
|
More Blocking
|
2024-01-29 18:39:25 -08:00 |
Joseph Rafferty
|
3d3b55720a
|
Merged in BrigitteR_Level (pull request #18)
Blocked out capillaries
|
2024-01-29 13:41:54 +00:00 |
Brigitte Rollain
|
153e90cd5f
|
Blocked out capillaries
|
2024-01-29 02:48:47 -08:00 |
Joseph Rafferty
|
d1a3b304ea
|
Merged in daniel_level (pull request #17)
Changed Project Name
|
2024-01-27 05:14:12 +00:00 |
Joseph Rafferty
|
496e9869dd
|
Merged main into daniel_level
|
2024-01-27 05:13:59 +00:00 |
Joseph Rafferty
|
9c8cdef31b
|
Merged main into daniel_level
|
2024-01-27 05:13:43 +00:00 |
Daniel Noel
|
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 |
Joseph Rafferty
|
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 |
Joseph Rafferty
|
8003ad286d
|
Merged in daniel_level (pull request #15)
Daniel level
|
2024-01-27 04:57:56 +00:00 |
Joseph Rafferty
|
029fa1c051
|
Merged main into daniel_level
|
2024-01-27 04:57:31 +00:00 |
Daniel Noel
|
69eb5543f6
|
Removed Unused Materials
|
2024-01-26 23:43:04 -05:00 |
Daniel Noel
|
f5d2c0a29b
|
Rooms and Internal Lights Added
|
2024-01-26 23:16:39 -05:00 |
Joseph Rafferty
|
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 |
Joseph Rafferty
|
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 |
Joseph Rafferty
|
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 |
Joseph Rafferty
|
2bdf643aa4
|
Merged main into joe_programming
|
2024-01-26 00:03:57 +00:00 |
Joseph Rafferty
|
938325759f
|
Merged in BrigitteR_Level (pull request #11)
Created spline wall and capillary blueprints
|
2024-01-26 00:03:17 +00:00 |
Joseph Rafferty
|
967e7a659f
|
Merged main into BrigitteR_Level
|
2024-01-26 00:02:47 +00:00 |
Joseph Rafferty
|
5dc616c4c4
|
Added virus type enum and started virus reproduction component
|
2024-01-25 19:00:37 -05:00 |
Brigitte Rollain
|
1f8944add7
|
Created spline wall and cappilary blueprints
|
2024-01-25 15:59:36 -08:00 |
Joseph Rafferty
|
2ad1615e9f
|
Merged in joe_programming (pull request #10)
Created Crystal Virus blendspace, anim BP, and AI controller. Moved AI stuff I worked on in another project into this project.
|
2024-01-25 20:58:20 +00:00 |
Joseph Rafferty
|
7cd672b244
|
created Crystal Virus blendspace, anim BP, and AI controller. Moved AI stuff I worked on in another project into this project.
|
2024-01-25 15:57:23 -05:00 |
Joseph Rafferty
|
997e9b7c20
|
Merged in joe_programming (pull request #9)
Started working on HUD and imported Crystal Virus and animations. Also started working on AI for Crystal Virus
|
2024-01-25 19:46:56 +00:00 |
Joseph Rafferty
|
6d65e0dab4
|
Started working on HUD and imported CrystalVirus and animations. Also started working on AI for Crystal Virus
|
2024-01-25 14:44:22 -05:00 |
Joseph Rafferty
|
392709e940
|
Merged in joe_programming (pull request #8)
Added crouch functionality and oragnized interface blueprints
|
2024-01-20 23:56:13 +00:00 |
Joseph Rafferty
|
6900793f6a
|
Added crouch functionality and oragnized interface blueprints
|
2024-01-20 18:55:17 -05:00 |
Joseph Rafferty
|
5f7ea98a83
|
Merged in daniel_level (pull request #7)
Added external actors and objects
|
2024-01-20 02:37:57 +00:00 |
Daniel Noel
|
c210e4f192
|
Merge branch 'daniel_level' of https://bitbucket.org/joseph-rafferty/gam305_green_repo into daniel_level
|
2024-01-19 21:35:16 -05:00 |
Daniel Noel
|
9501ecb915
|
Added external actors and objects
|
2024-01-19 21:34:25 -05:00 |
Joseph Rafferty
|
89818fe327
|
Merged in daniel_level (pull request #6)
Merged main into daniel_level
|
2024-01-20 02:24:19 +00:00 |
Joseph Rafferty
|
2d5303af23
|
Merged main into daniel_level
|
2024-01-20 02:15:45 +00:00 |