Skip to content

V146 master develop #1073

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 9, 2018
Merged

V146 master develop #1073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
50fea01
master merge (#907)
apavani Jul 10, 2018
cf02f6d
Release/v1.4.5 (#973)
abhishektrip Aug 22, 2018
9f31aeb
Merge branch 'develop' into v146-master-develop
abhishektrip Oct 9, 2018
7a05994
Fix merge issues with master
abhishektrip Oct 9, 2018
ccb8f53
Set correct extent type
abhishektrip Oct 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions sdkproject/Assets/Mapbox/Examples/0_PrefabScenes/Location-basedGame.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ OcclusionCullingSettings:
--- !u!104 &2
RenderSettings:
m_ObjectHideFlags: 0
serializedVersion: 9
serializedVersion: 8
m_Fog: 0
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
m_FogMode: 3
Expand All @@ -39,7 +39,6 @@ RenderSettings:
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641252, b: 0.574817, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
m_ObjectHideFlags: 0
Expand All @@ -55,10 +54,11 @@ LightmapSettings:
m_EnableBakedLightmaps: 1
m_EnableRealtimeLightmaps: 1
m_LightmapEditorSettings:
serializedVersion: 10
serializedVersion: 9
m_Resolution: 2
m_BakeResolution: 40
m_AtlasSize: 1024
m_TextureWidth: 1024
m_TextureHeight: 1024
m_AO: 0
m_AOMaxDistance: 1
m_CompAOExponent: 1
Expand Down Expand Up @@ -526,9 +526,24 @@ Prefab:
propertyPath: _options.extentOptions.rangeAroundTransformOptions.disposeBuffer
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114105500206378512, guid: 35ce2bb4caba9434db5e656796b632b1,
type: 2}
propertyPath: _options.extentOptions.defaultExtents.rangeAroundTransformOptions.targetTransform
value:
objectReference: {fileID: 843921208}
- target: {fileID: 114105500206378512, guid: 35ce2bb4caba9434db5e656796b632b1,
type: 2}
propertyPath: _options.extentOptions.extentType
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 35ce2bb4caba9434db5e656796b632b1, type: 2}
m_IsPrefabParent: 0
--- !u!4 &843921208 stripped
Transform:
m_PrefabParentObject: {fileID: 4961856903295740, guid: 35ce2bb4caba9434db5e656796b632b1,
type: 2}
m_PrefabInternal: {fileID: 843921207}
--- !u!1 &1188978833
GameObject:
m_ObjectHideFlags: 0
Expand Down
5 changes: 5 additions & 0 deletions sdkproject/Assets/Mapbox/Examples/7_Globe/Globe.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,11 @@ Prefab:
propertyPath: m_Size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114731470950229392, guid: 98be219873e6d4dffb5949746f515a33,
type: 2}
propertyPath: m_Size
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 98be219873e6d4dffb5949746f515a33, type: 2}
m_IsPrefabParent: 0
Expand Down
13 changes: 13 additions & 0 deletions sdkproject/Assets/Mapbox/Unity/Tests/MapboxUnitTests_AbstractMapTests.cs.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion sdkproject/ProjectSettings/ProjectVersion.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
m_EditorVersion: 2018.2.6f1
m_EditorVersion: 2017.4.2f2