Skip to content

Commit 8e74ec2

Browse files
committed
Merge branch 'develop' into feature/add-unknown-error-handling
2 parents bc87fe8 + 8c9abe7 commit 8e74ec2

13 files changed

+4643
-22
lines changed

.github/workflows/integration-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
testMode:
1818
- editmode
1919
unityVersion:
20-
- 2020.3.16f1
20+
- 2021.3.32f1
2121
steps:
2222
- name: Checkout empty unity project repository
2323
uses: actions/checkout@v4

.github/workflows/pr-test-runner.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- playmode
1818
- editmode
1919
unityVersion:
20-
- 2020.3.16f1
20+
- 2021.3.32f1
2121
steps:
2222
- name: Checkout Unity-SDK Repository
2323
uses: actions/checkout@v4

CHANGELOG.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
This project adheres to [Semantic Versioning](http://semver.org/).
55

6-
7-
## [6.0.2] - 2024.MM.DD
6+
## [6.1.0] - 2024.03.04
87

98
### Updated
109
- AvatarMeshHelper now supports multiple mesh and material transfer. [#241](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/241)
1110

1211
### Added
1312
- GetHeadMeshes method to AvatarMeshHelper to get head related meshes from an avatar. [#242](https://github.com/readyplayerme/rpm-unity-sdk-core/pull/242)
13+
- Template avatar with all possible meshes is added to the Resources folder.
1414

1515
## [6.0.1] - 2024.02.26
1616

Editor/Core/Scripts/Utilities/PrefabHelper.cs

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ public static void TransferPrefabByGuid(string guid, string newPath)
1515
return;
1616
}
1717
AssetDatabase.CopyAsset(path, newPath);
18+
AssetDatabase.Refresh();
1819
Selection.activeObject = AssetDatabase.LoadAssetAtPath(newPath, typeof(GameObject));
1920
}
2021

Resources.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Resources/RPM_Template_Avatar.glb

224 KB
Binary file not shown.

Resources/RPM_Template_Avatar.glb.meta

+27
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)