Merge remote-tracking branch 'origin/Syntriax' into Over

Browse Source

# Conflicts:
#	UserSettings/EditorUserSettings.asset
#	UserSettings/Layouts/default-2021.dwlt

...

This commit is contained in:

OverflowNarhoym

2022-02-23 12:05:27 +01:00

parent eb0accb0ec a1e5a5ad88

commit 2ab3a57899

95 changed files with 14728 additions and 201 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

1180

Assets/Scenes/SyntriaxDevScene.unity

File diff suppressed because it is too large Load Diff