Merge branch 'refs/heads/feature/player-inventory' into dev

Browse Source

# Conflicts:
#	Assets/DefaultNetworkPrefabs.asset

...

This commit is contained in:

Chris

2025-10-01 14:34:02 -04:00

parent 8f3ea1a491 16d9676eba

commit d079e78068

91 changed files with 24523 additions and 550 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

5313

Assets/Scenes/ItemTest.unity

File diff suppressed because one or more lines are too long