SNHUProjects
/
GAM305_Green_Repo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity
201 Commits 7 Branches 1 Tag 2.2 GiB
Commit Graph

201 Commits

Author SHA1 Message Date
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 baf14d74f0 Merge branch 'daniel_level' of bitbucket.org:joseph-rafferty/gam305_green_repo into daniel_level 2024-01-19 21:20:14 -05:00
Joseph Rafferty 973fa58772 Resolving issue 2024-01-19 21:19:36 -05:00
Joseph Rafferty 2d5303af23 Merged main into daniel_level 2024-01-20 02:15:45 +00:00
Joseph Rafferty 9ec9877b77 Merged in daniel_level (pull request #5) 
Committing daniel_level again
 2024-01-20 02:15:41 +00:00
Daniel Noel dc2342e9c2 Committing daniel_level again 2024-01-19 21:14:46 -05:00
Joseph Rafferty 6500fd77b5 Merged in Joseph-Rafferty/gitignore-edited-online-with-bitbucket-1705716763253 (pull request #4) 
.gitignore edited online with Bitbucket
 2024-01-20 02:13:07 +00:00
Joseph Rafferty 72cf0a9d56 .gitignore edited online with Bitbucket 2024-01-20 02:12:46 +00:00
Joseph Rafferty 77a1254cd1 Merged in joe_programming (pull request #3) 
Removed First Person Map
 2024-01-20 02:02:48 +00:00
Joseph Rafferty 152b327b99 Removed First Person Map 2024-01-19 21:01:34 -05:00
Joseph Rafferty 4e268cf430 Merged in joe_programming (pull request #2) 
Created Launch Blueprint and Created Jumpad
 2024-01-20 01:58:40 +00:00
Joseph Rafferty 37aadfcfab Merged in daniel_level (pull request #1) 
daniel_level
 2024-01-20 01:55:46 +00:00
Joseph Rafferty fa4459520e Created Launch Blueprint and Created Jumpad 2024-01-19 20:50:17 -05:00
Daniel Noel ebcce86f87 daniel_level 2024-01-19 20:44:28 -05:00