Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/umasteeringgroup/UMA int…
Browse files Browse the repository at this point in the history
…o develop
  • Loading branch information
Jaimi committed Nov 14, 2020
2 parents 4890467 + dbbbcf5 commit 165ba34
Show file tree
Hide file tree
Showing 9 changed files with 167 additions and 51 deletions.
9 changes: 9 additions & 0 deletions UMAProject/Assets/UMA/Whats New in UMA.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,15 @@ Misc
DCARendererManager
Added option EnableRenderers to turn on/off the renderer manager for toggling between first and third person.

Alpha 2
Added scaling to UMAMountedItem
Forearm Twist slot script will now let you set the names of the bones
Fixed issue in randomizer that would cause it to break
Added support for more than 4 boneweights. Can now use as many boneweights as you like.
Reworked the SkinnedMeshCombiner to use the new boneweights, resulting in a 30-40% overall speed improvement when building.
Added ability to transform (scale and rotate) an overlay in a recipe.
Fixed error in build when edit-time UMA's were used in scene.


What's new in 2.10.1

Expand Down
4 changes: 2 additions & 2 deletions UMAProject/ProjectSettings/EditorBuildSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ EditorBuildSettings:
serializedVersion: 2
m_Scenes:
- enabled: 1
path: Assets/UMA/Examples/Addressables/AddressablesScene.unity
guid: 223ba86cee7348847906802e88a29bfb
path: Assets/UMA/Examples/Legacy Examples/UMA Core Demo - Crowd.unity
guid: 9b44dc91378f85c44903d70e9b805efe
m_configObjects:
com.unity.addressableassets: {fileID: 11400000, guid: 36e698608dccc894285266b983284446,
type: 2}
16 changes: 14 additions & 2 deletions UMAProject/ProjectSettings/EditorSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
--- !u!159 &1
EditorSettings:
m_ObjectHideFlags: 0
serializedVersion: 7
serializedVersion: 9
m_ExternalVersionControlSupport: Visible Meta Files
m_SerializationMode: 2
m_LineEndingsForNewScripts: 2
Expand All @@ -16,8 +16,20 @@ EditorSettings:
m_EtcTextureFastCompressor: 2
m_EtcTextureNormalCompressor: 2
m_EtcTextureBestCompressor: 5
m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef;rsp
m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef;rsp;asmref
m_ProjectGenerationRootNamespace:
m_CollabEditorSettings:
inProgressEnabled: 1
m_EnableTextureStreamingInEditMode: 1
m_EnableTextureStreamingInPlayMode: 1
m_AsyncShaderCompilation: 1
m_EnterPlayModeOptionsEnabled: 0
m_EnterPlayModeOptions: 3
m_ShowLightmapResolutionOverlay: 1
m_UseLegacyProbeSampleCount: 1
m_AssetPipelineMode: 1
m_CacheServerMode: 0
m_CacheServerEndpoint:
m_CacheServerNamespacePrefix: default
m_CacheServerEnableDownload: 1
m_CacheServerEnableUpload: 1
5 changes: 3 additions & 2 deletions UMAProject/ProjectSettings/GraphicsSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
--- !u!30 &1
GraphicsSettings:
m_ObjectHideFlags: 0
serializedVersion: 12
serializedVersion: 13
m_Deferred:
m_Mode: 1
m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0}
Expand Down Expand Up @@ -38,7 +38,7 @@ GraphicsSettings:
- {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 4800000, guid: d56eff61c40904d78becb18c718ce22e, type: 3}
- {fileID: 16002, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
m_PreloadedShaders: []
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
type: 0}
Expand All @@ -64,3 +64,4 @@ GraphicsSettings:
m_LightsUseLinearIntensity: 0
m_LightsUseColorTemperature: 0
m_LogWhenShaderIsCompiled: 0
m_AllowEnlightenSupportForUpgradedProject: 1
38 changes: 38 additions & 0 deletions UMAProject/ProjectSettings/PackageManagerSettings.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &1
MonoBehaviour:
m_ObjectHideFlags: 61
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 0}
m_Name:
m_EditorClassIdentifier: UnityEditor:UnityEditor.PackageManager.UI:PackageManagerProjectSettings
m_ScopedRegistriesSettingsExpanded: 1
oneTimeWarningShown: 0
m_Registries:
- m_Id: main
m_Name:
m_Url: https://packages.unity.com
m_Scopes: []
m_IsDefault: 1
m_UserSelectedRegistryName:
m_UserAddingNewScopedRegistry: 0
m_RegistryInfoDraft:
m_ErrorMessage:
m_Original:
m_Id:
m_Name:
m_Url:
m_Scopes: []
m_IsDefault: 0
m_Modified: 0
m_Name:
m_Url:
m_Scopes:
-
m_SelectedScopeIndex: 0
Loading

0 comments on commit 165ba34

Please sign in to comment.