Updating Main with current project#42
Merged
MashdorDev merged 77 commits intomainfrom Feb 2, 2024
Merged
Conversation
No need for this folder
Updating gitignore
Updated .gitignore
updated readmefile with something:
updated the readme agian
- Added a prototype camera register volume that allows transitioning between cameras when in an area - Added a testing map for the dynamic camera system
- Simplified blueprint implementation of the dynamic camera system
…d interact inputs implemented.
…ithin range. Added some temporary UI
…gation input scheme. Created temporary level and gamemode for testing main menu.
…epad and mouse. Added a lerping functionality to the 'select' image for smoother transition. added "Slate" to build.cs
- The DynamicCameraComponent is in the base unbread folder because UE5 makes it extremely difficult to move C++ files once they are created
- Add OnHealthAttributeChange function - Add Damage Gameplay Effect and actiavte on BP_Player
UI manager
# Conflicts: # Content/Unbread/Core/Character/BP_Character.uasset - Safak continued work on the BP_Character, so my copy was out of date
- Add Shield attribute - Add Shield + Health damage calculation logic - ApplyDamage Attribute Data now applies to shield first then to health
- Movable objects can now be picked up and put down - When a movable object reached its goal it is snapped into place
- Modified WASD movement directions as a test and to allow for better animation integration - Finished setting up object movement and levers
…dMaterials # Conflicts: # Content/Unbread/Core/Character/BP_Character.uasset # Source/unbread/Private/SCharacter.cpp - Used Safak's work
…er than the level blueprint - Modified the LookAtRotation to rotate the player toward the pointer
Meshes and materials
UI manager
- Added animations for jump and throw actions - Created the Animation Blueprint for the gingerbread man - Updated projectile to fix constant errors when thesting (Safak feel free to replace this change) - Updated character to fix rotation issue & attach projectile spawn to character's hand
Animations
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Updating the main branch with dev to get up to speed with the project