Merge remote-tracking branch 'origin/NewStory' into NewStory

Browse Source

# Conflicts:
#	Assets/Meshes/Terrain/Terrain_Land01.asset
#	Assets/PlayMaker/Editor/Resources/EditorStartupPrefs.asset
#	Assets/Plugins/Easy Save 3/Resources/ES3/ES3Defaults.asset
#	Packages/packages-lock.json

...

This commit is contained in:

szczuras4

2025-02-10 13:56:45 +01:00

parent 218c289e4e 543aaf71a6

commit f20d52edb0

169 changed files with 16819 additions and 826 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2333

Assets/Scenes/Marcin/DebugScene.unity

File diff suppressed because it is too large Load Diff