Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Animation branch #44

Merged
merged 23 commits into from
Dec 15, 2023
Merged

Animation branch #44

merged 23 commits into from
Dec 15, 2023

Conversation

Cooltomten
Copy link
Collaborator

No description provided.

Cooltomten and others added 23 commits July 1, 2023 23:06
…er, removed exit time and started adding relevant animation nodes
…State using inheritance, Push to work on different comuter
…he state machíne stransition, push to work from different computer
# Conflicts:
#	Engine/Scripts/Volt-ScriptCore.dll
#	Engine/Scripts/Volt-ScriptCore.pdb
#	Project/Project.vtproj
#	Volt/Navigation/src/Navigation/Core/NavigationSystem.cpp
#	Volt/Sandbox/src/Sandbox/Modals/ProjectUpgradeModal.cpp
#	Volt/Sandbox/src/Sandbox/Modals/ProjectUpgradeModal.h
#	Volt/Sandbox/src/Sandbox/Window/AssetBrowser/EditorAssetRegistry.cpp
#	Volt/Volt/src/Volt/Asset/Animation/AnimationGraphAsset.h
#	Volt/Volt/src/Volt/Core/Base.h
#	Volt/Volt/src/Volt/Rendering/SceneRenderer.cpp
…into development

# Conflicts:
#	Volt/Volt/src/Volt/Asset/Animation/AnimationGraphAsset.h
#	Volt/Volt/src/Volt/Rendering/SceneRenderer.cpp
@Cooltomten Cooltomten merged commit 6d6e1a9 into development Dec 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants