Skip to content

Commit b59f217

Browse files
committed
Merge remote-tracking branch 'upstream/main' into feature/npc-pathway-movement
2 parents 914f05a + 6be6f64 commit b59f217

File tree

1,111 files changed

+134570
-121947
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,111 files changed

+134570
-121947
lines changed

Docs/WikiImages/AmbientSettings.png

15.7 KB
Loading

Docs/WikiImages/BakingSettings.png

50.4 KB
Loading

Docs/WikiImages/Combat.png

1.23 MB
Loading

Docs/WikiImages/ContentBuild.png

12.8 KB
Loading

Docs/WikiImages/Shadows.png

637 KB
Loading

Docs/WikiImages/SkyboxScene.png

222 KB
Loading

Docs/WikiImages/WorldInteractions.png

1.77 MB
Loading

UOP1_Project/.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,6 @@ ProjectSettings/Packages/com.unity.polybrush/Settings.json
7272
Assets/Polybrush Data*
7373
Assets/PolybrushData*
7474

75-
# Asset Bundles folder
76-
/StreamingAssets/
75+
# Asset Bundles folder and .bin file
76+
/Assets/StreamingAssets
77+
*.bin

UOP1_Project/Assets/Audio/Test_Music.meta renamed to UOP1_Project/Assets/Addons.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UOP1_Project/Assets/Addons/DOTween.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)