Skip to content

Commit 202f939

Browse files
ciro-unityciro-unity
committed
Merge branch 'CaveWhiteboxing' of https://github.com/itsLevi0sa/open-project-1 into worldbuilding
# Conflicts: # UOP1_Project/Assets/Cutscenes/PathAndCave.meta # UOP1_Project/Assets/Cutscenes/PathAndCave.unity # UOP1_Project/Assets/Cutscenes/PathAndCave.unity.meta # UOP1_Project/Assets/Cutscenes/PathAndCave/NavMesh.asset # UOP1_Project/Assets/Cutscenes/PathAndCave/NavMesh.asset.meta # UOP1_Project/Assets/Cutscenes/PathAndCave_Reduced.meta # UOP1_Project/Assets/Cutscenes/PathAndCave_Reduced.unity # UOP1_Project/Assets/Cutscenes/PathAndCave_Reduced.unity.meta # UOP1_Project/Assets/Cutscenes/PathAndCave_Reduced/NavMesh.asset # UOP1_Project/Assets/Cutscenes/PathAndCave_Reduced/NavMesh.asset.meta # UOP1_Project/Assets/Scripts/Quests/Editor/QuestEditorWindow.cs
2 parents 9cfd324 + 3f74176 commit 202f939

File tree

10 files changed

+181943
-0
lines changed

10 files changed

+181943
-0
lines changed

‎UOP1_Project/Assets/Cutscenes/PathAndCave.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)