Skip to content
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

Master2 #851

Merged
merged 423 commits into from
Jun 7, 2018
Merged

Master2 #851

Changes from all commits
Commits
Show all changes
423 commits
Select commit Hold shift + click to select a range
a6615ca
Add parameters to hookup Globe terrain factory.
abhishektrip Mar 9, 2018
402b62a
Mapbox styles - MapboxStyles shader for layer colorization, AtlasTemp…
greglemonmapbox Mar 9, 2018
8c0fe55
Set defaults for all properties
abhishektrip Mar 10, 2018
7ca87e0
Add API calls for layers
abhishektrip Mar 10, 2018
ed01c09
Merge commit '402b62a9b89435afe9b0aba9091a1e3f40ebd371' into refactor…
abhishektrip Mar 12, 2018
5f04419
Renamed AddColorizeMapboxStyles.cs to MapboxStylesColorModifier.cs to…
greglemonmapbox Mar 12, 2018
ebed6a1
Add custom option to primitive type - for fully custom modifier stack.
abhishektrip Mar 12, 2018
5e4be07
Merge commit '5f04419eea029575d034dfecd478a167c5219922' into refactor…
abhishektrip Mar 12, 2018
6762642
Hook up scriptable palette with P&P
abhishektrip Mar 13, 2018
140c14d
Add code comments to Abstract Map.
abhishektrip Mar 13, 2018
639c60e
Cleanup unused stuff.
abhishektrip Mar 13, 2018
5893fb9
Fixed private field naming to meet code style requirements.
greglemonmapbox Mar 13, 2018
f517b6c
Fix indentation
abhishektrip Mar 13, 2018
4858a17
Merge commit 'f517b6c733c99ea14b821ec82260e863ce6391d5' into refactor…
abhishektrip Mar 13, 2018
3222e63
Adds ability to add custom tile providers.
abhishektrip Mar 13, 2018
9455db5
more checks if access token is set (#564)
Mar 13, 2018
bf39969
Style development - colorization and atlas template generator (#579)
greglemonmapbox Mar 13, 2018
b1560a0
log GPS timestamp once more
wilhelmberg Mar 13, 2018
7e060bb
Merge commit 'bf39969723b90ccbd925f23b52990e231325a2ae' into refactor…
abhishektrip Mar 13, 2018
8039977
Cleanup + update prefabs & UI.
abhishektrip Mar 13, 2018
e4f20ed
Fixes atlas textures bug, UI bug and creates city sim prefab with tex…
abhishektrip Mar 14, 2018
fc48809
Add building Id tileset as default, fix minor issues.
abhishektrip Mar 14, 2018
b2586c7
Update map prefab with default style
abhishektrip Mar 14, 2018
992dbbd
Fix to trigger finished state on VectorTileFactory.
abhishektrip Mar 14, 2018
e9a9571
Add loading texture, build locationProvider example , fix bug with im…
abhishektrip Mar 14, 2018
a8ddfe5
Update Camera script to work with new map, LocationBasedGame prefab u…
abhishektrip Mar 14, 2018
03c68eb
Code cleanup - move drawers into their own files.
abhishektrip Mar 14, 2018
68e91ef
Code Cleanup. Arrange files into folders.
abhishektrip Mar 14, 2018
147b2e7
Foldouts don't forget what they were told to do ;)
abhishektrip Mar 14, 2018
82b3fa0
Fixed null ref error on MapboxStylesColorModifier; class now null che…
greglemonmapbox Mar 14, 2018
564ab18
Update ARTabletop scene.
abhishektrip Mar 14, 2018
3cdf3d8
Merge branch 'refactoring-experiments' of github.com:mapbox/mapbox-un…
abhishektrip Mar 14, 2018
c0bebd8
updated Clip/Box shader (#580)
doerrdude Mar 14, 2018
a0e604b
Merge commit 'c0bebd860d5b09ae5fa49a0b3bfb2c1d1ed5f976' into refactor…
abhishektrip Mar 14, 2018
521d62e
Recreate ZoomableMap and Globe with new Plug and Play functionality (…
morgane Mar 14, 2018
a13a6a0
created clip shaders for stylized map
Mar 14, 2018
8f0c18f
merge
Mar 14, 2018
064b57b
Fix errors from meta files.
abhishektrip Mar 15, 2018
6b67245
Add TabletopARkit prefab.
abhishektrip Mar 15, 2018
afba0a3
fix missing tangents bug.
abhishektrip Mar 15, 2018
603aeeb
Set Relative height = false as default.
abhishektrip Mar 15, 2018
f546b7e
Fix issue with final state not being triggered when image factory was…
abhishektrip Mar 15, 2018
5b1d3f9
add UniAndroidPermission
wilhelmberg Mar 15, 2018
e109e8b
DeviceLocationProvider: request runtime location permissions on Android
wilhelmberg Mar 15, 2018
e661472
add class to open settings for app on Android
wilhelmberg Mar 15, 2018
2095527
update AutoSyncScene
wilhelmberg Mar 15, 2018
91a8ec7
Merge branch 'refactoring-experiments' of github.com:mapbox/mapbox-un…
wilhelmberg Mar 15, 2018
24d767d
fix AutoSyncScene and WorldAlignmentKit prefab
wilhelmberg Mar 15, 2018
37dad3d
increase desired accuracy
wilhelmberg Mar 15, 2018
495047e
increase desired accuracy
wilhelmberg Mar 15, 2018
715b6da
hopefully getting there
wilhelmberg Mar 15, 2018
3a26452
Prefab block for configuration window
Mar 15, 2018
ca34664
update worldalignmentprefab
wilhelmberg Mar 15, 2018
06c313c
Merge explorer and interactive styled map examples.
abhishektrip Mar 15, 2018
cc8f118
images updated
Mar 15, 2018
116d6f9
Merge commit '715b6da4fc7f2dbdd0730a273440f1f97c7e1a6b' into refactor…
abhishektrip Mar 15, 2018
8fbf50e
Merge commit 'ca3466497c95113be62b770d02d3449a9b34fb4a' into refactor…
abhishektrip Mar 15, 2018
6a45c98
layout, changelog link
Mar 15, 2018
1707691
Update WorldAlignmentKit prefab + fix reload script to use "update" f…
abhishektrip Mar 15, 2018
9901b9e
ar example scene names
Mar 15, 2018
75420e5
Merge branch 'refactoring-experiments' into config-window-1.4
Mar 15, 2018
35492e3
Updated `Explorer` scene.
abhishektrip Mar 15, 2018
d9e6d5a
Updated worlsAlignmentKit
abhishektrip Mar 15, 2018
bce4305
Merge branch 'refactoring-experiments' of github.com:mapbox/mapbox-un…
abhishektrip Mar 15, 2018
c672a90
Updated working AR scene.
abhishektrip Mar 15, 2018
cd57a8d
Fix double map initialize issue.
abhishektrip Mar 15, 2018
7c954b8
remove extra example scenes
Mar 16, 2018
56a8fec
fix merge conflict: PropertyDrawers.meta
wilhelmberg Mar 16, 2018
bd4cf99
prefab body text
Mar 16, 2018
44b6a8a
Merge branch 'refactoring-experiments' into config-window-1.4
Mar 16, 2018
8c8dc51
update TabletopAR image
Mar 16, 2018
2c50746
Possible fix for worldScale AR
abhishektrip Mar 16, 2018
991eb4b
Merge branch 'refactoring-experiments' of github.com:mapbox/mapbox-un…
abhishektrip Mar 16, 2018
202df47
Add namespace for ObjectPool + change Awake to start in Position with…
abhishektrip Mar 16, 2018
ffd4b6f
WIP manual sync AR scene
wilhelmberg Mar 16, 2018
abd3ae1
Merge branch 'refactoring-experiments' of github.com:mapbox/mapbox-un…
wilhelmberg Mar 16, 2018
13fc65e
fix broken WorldAlignmentKit.prefab after merge
wilhelmberg Mar 16, 2018
6c5741f
make debug paths thicker
wilhelmberg Mar 16, 2018
5d4952f
Add missing namespaces.
abhishektrip Mar 16, 2018
0575426
Missing namespace.
abhishektrip Mar 16, 2018
56a25a3
Merge branch 'refactoring-experiments' of github.com:mapbox/mapbox-un…
abhishektrip Mar 16, 2018
54c2470
Manual World Alignment scene and prefab
wilhelmberg Mar 16, 2018
66db3eb
Merge branch 'refactoring-experiments' of github.com:mapbox/mapbox-un…
wilhelmberg Mar 16, 2018
9080883
fix broken meta file
wilhelmberg Mar 16, 2018
032cdd4
Update scenes.
abhishektrip Mar 16, 2018
440241f
Update version to 1.4.0
abhishektrip Mar 16, 2018
066ccd1
Scene cleanup - delete old examples
abhishektrip Mar 16, 2018
469db85
Fix wrong unwrapped tile id
abhishektrip Mar 16, 2018
f8f3f8b
Possible fix for Configuration window `NullReference`
abhishektrip Mar 16, 2018
bc72b41
remove Android pre-build checks for duplicate libraries (#574)
Mar 16, 2018
48a1863
WorldAlignmentKit prefab: remove layer 'Map' from culling mask of Mai…
wilhelmberg Mar 16, 2018
73cac3b
move UniAndroidPermission to PlugIns folder
wilhelmberg Mar 16, 2018
f7e8731
add sub-assets in scenelists via editor (#586)
Mar 16, 2018
9a99088
Moved editor files to Assets/Mapbox/Unity/Editor
greglemonmapbox Mar 16, 2018
ddd662a
Merge branch 'release/v1.4.0' of https://github.com/mapbox/mapbox-uni…
greglemonmapbox Mar 16, 2018
a8fea28
Delete moved files - Atlas Generator & scriptable Palette UI
abhishektrip Mar 16, 2018
cdb449b
Added Mapbox.Editor namespace, converted spaces to tabs.
greglemonmapbox Mar 16, 2018
e02b519
Fix compile errors related to meta files.
abhishektrip Mar 16, 2018
097d17b
Merge branch 'release/v1.4.0' of github.com:mapbox/mapbox-unity-sdk i…
abhishektrip Mar 16, 2018
d48a1db
Cleanup tooltip text.
abhishektrip Mar 16, 2018
18b89fa
Fix Warnings.
abhishektrip Mar 16, 2018
5182a25
Update scenes.
abhishektrip Mar 16, 2018
32ce2e3
Cleanup warnings - pass 2.
abhishektrip Mar 16, 2018
46a710b
Cleanup warnings pass 3.
abhishektrip Mar 16, 2018
361fd3a
Update ScenesList.cs
apavani Mar 16, 2018
e2c7244
Fix typecast error on filters + filter Pois labels based on localRank.
abhishektrip Mar 16, 2018
2023e17
Merge branch 'release/v1.4.0' of github.com:mapbox/mapbox-unity-sdk i…
abhishektrip Mar 16, 2018
ab7e2c5
Add Update method to RangeTileProvider.
abhishektrip Mar 16, 2018
ede66ca
Update PathHelpers.cs
apavani Mar 16, 2018
3d79ab4
Change explorer to Data Explorer, clean unused assets.
abhishektrip Mar 16, 2018
fec5c3a
Merge branch 'release/v1.4.0' of github.com:mapbox/mapbox-unity-sdk i…
abhishektrip Mar 16, 2018
875e760
fix duplicate buildings in WorldScaleAR-ManualAlignment
wilhelmberg Mar 16, 2018
db98031
Merge branch 'release/v1.4.0' of github.com:mapbox/mapbox-unity-sdk i…
wilhelmberg Mar 16, 2018
77607ab
silence remaining warnings
wilhelmberg Mar 16, 2018
2f53bc4
Fix screenshot name for explorer, add initialization to elevationLaye…
abhishektrip Mar 16, 2018
e78e08a
Merge branch 'release/v1.4.0' of github.com:mapbox/mapbox-unity-sdk i…
abhishektrip Mar 16, 2018
f095d1e
Fix typo
abhishektrip Mar 16, 2018
efef78e
Fix build error, turn vector layer off for Globe example, Add build s…
abhishektrip Mar 16, 2018
b04484e
Config window 1.4 (#587)
Mar 17, 2018
4890440
Change camera for city simulator scene.
abhishektrip Mar 17, 2018
04e0113
Merge branch 'release/v1.4.0' of github.com:mapbox/mapbox-unity-sdk i…
abhishektrip Mar 17, 2018
61edfc8
fix RasterTileExample
wilhelmberg Mar 17, 2018
30e7205
fix VoxelMap
wilhelmberg Mar 17, 2018
c14dca2
Fix finished status not getting fired event for globe example.
abhishektrip Mar 17, 2018
274874a
Merge branch 'release/v1.4.0' of github.com:mapbox/mapbox-unity-sdk i…
abhishektrip Mar 17, 2018
417a2b3
silence another warning and remove unused using
wilhelmberg Mar 17, 2018
1458ac1
make TileErrorHandler work with new AbstractMap
wilhelmberg Mar 17, 2018
c10e88b
Fixes for RC3
abhishektrip Mar 17, 2018
43f22cc
Merge branch 'release/v1.4.0' of github.com:mapbox/mapbox-unity-sdk i…
abhishektrip Mar 17, 2018
7483dd3
Renamed TabletopARKit prefab to ARTableTop
abhishektrip Mar 17, 2018
8201abe
Turn off initializeOnStart for LocationBasedGame prefab.
abhishektrip Mar 17, 2018
3b08ca8
Defensive fix for crash on iOS.
abhishektrip Mar 17, 2018
ed54657
Fix for missing features - Add property in vectorsublayerproperties t…
abhishektrip Mar 18, 2018
ea939f4
Change scene & prefab with clip at tile boundary setting.
abhishektrip Mar 18, 2018
fee26de
Fix NRE's on inspectors for scriptable objects in sharedmodules.
abhishektrip Mar 18, 2018
4dccdb0
Remove new from LocationProvider prefab name in LocationBasedGame prefab
abhishektrip Mar 18, 2018
9c82735
Asset file cleanup
abhishektrip Mar 18, 2018
a2d4b81
Trigger finished status for tiles that error out.
abhishektrip Mar 18, 2018
54f0c16
Fix flat terrain factory editor.
abhishektrip Mar 18, 2018
bca74a5
remove inital wait for GPS on DeviceLocationProvider start. Implement…
wilhelmberg Mar 19, 2018
d90333e
Fix issue with prefab modifier where removing the `IFeaturePropertySe…
abhishektrip Mar 19, 2018
0a76720
Make Modifiers & map selectable from node editor, change mismatching …
abhishektrip Mar 19, 2018
e8def94
Merge branch 'release/v1.4.0' of github.com:mapbox/mapbox-unity-sdk i…
abhishektrip Mar 19, 2018
1b69554
add 'IsLocationServiceInitializing' to 'Location.cs'. Expose that inf…
wilhelmberg Mar 19, 2018
5738a06
Add all layers from explorer v130 example (most layers turned off)
abhishektrip Mar 19, 2018
acbd89c
Make foldouts static.
abhishektrip Mar 19, 2018
0af85ec
Update scenelist.
abhishektrip Mar 19, 2018
31d31a7
Merge branch 'release/v1.4.0' of github.com:mapbox/mapbox-unity-sdk i…
abhishektrip Mar 19, 2018
cbe908e
move misplaced `link.xml` into MapboxAR subfolder
wilhelmberg Mar 19, 2018
fbac429
Remove interaction from DataExplorer scene, Added a new scene for int…
abhishektrip Mar 19, 2018
3a87563
Turn buildings on in Data Explorer :)
abhishektrip Mar 19, 2018
9ef4d1a
Merge branch 'release/v1.4.0' of github.com:mapbox/mapbox-unity-sdk i…
abhishektrip Mar 19, 2018
07e51a4
Scale the canvas to fit the screen.
abhishektrip Mar 19, 2018
5125ddc
Change zoomSpeed = 0, merge building layers.
abhishektrip Mar 19, 2018
c426388
Update formatting of playground scenes, enable camera for data explorer.
abhishektrip Mar 19, 2018
194947a
Tweaks to scenes for performance & formatting.
abhishektrip Mar 19, 2018
ecbe754
Finally turn on the camera movement script on DataExplorer
abhishektrip Mar 19, 2018
d22f5a4
Fix scaling in y for map & unity tile. Add script to keep camera abov…
abhishektrip Mar 20, 2018
b04a650
Update buildingswithUniqueIds property.
abhishektrip Mar 20, 2018
7f63732
Add prerequisite info for AR scenes.
abhishektrip Mar 20, 2018
eef81c9
work around crashes on iOS with escaped characters in the URL
wilhelmberg Mar 20, 2018
483b561
Fix height data query.
abhishektrip Mar 20, 2018
32dd15e
Merge branch 'release/v1.4.0' of github.com:mapbox/mapbox-unity-sdk i…
abhishektrip Mar 20, 2018
ffcfb28
Add missing using UnityEngine.
abhishektrip Mar 20, 2018
f28eadc
Update example descriptions
abhishektrip Mar 20, 2018
4cf320a
Disable SetCameraHeight script + add method to query height in unity …
abhishektrip Mar 20, 2018
1d29b1f
Update zoomable map scene to not have setCameraHeight
abhishektrip Mar 20, 2018
7a5b7dc
Remove replacing text with latlong for geocode response.
abhishektrip Mar 20, 2018
8a1b8fa
Fix formatting
abhishektrip Mar 20, 2018
b0b8355
Remove DirectionsQuery
abhishektrip Mar 20, 2018
5ab3523
Update project version
abhishektrip Mar 20, 2018
df07aec
Add event system to CitySimulator scene + filter mouse events on sear…
abhishektrip Mar 20, 2018
1b83b06
Format main scene UI.
abhishektrip Mar 20, 2018
01d188e
another fix for URL encoding for iOS
wilhelmberg Mar 20, 2018
a450ad1
Update changelog
abhishektrip Mar 21, 2018
49caf22
Merge branch 'master' of github.com:mapbox/mapbox-unity-sdk into develop
wilhelmberg Mar 21, 2018
be59b15
Make filter values case - insensitive. (#632)
abhishektrip Mar 30, 2018
6879a50
Fix tile position issue with vector features. Remove option when feat…
abhishektrip Mar 30, 2018
9fd6e09
Change file folder names (#635)
abhishektrip Mar 30, 2018
712cd80
Fix range height extrusion (#613)
abhishektrip Apr 2, 2018
6551974
Collider Dropdown in Abstract Map for adding colliders on top of extr…
apavani Apr 3, 2018
1fb3f22
Playmode tests (#628)
Apr 4, 2018
6ce2f0e
add feature collections and kdtree collection (#565)
brnkhy Apr 4, 2018
7a09bc4
Ui fixes (#643)
abhishektrip Apr 5, 2018
519369d
[publish docs] (#652)
abhishektrip Apr 5, 2018
41cbdc7
Add camera table top ar (#614)
abhishektrip Apr 5, 2018
2d9d667
Fix satellite imagery on roof not working. (#638)
abhishektrip Apr 5, 2018
3e8f961
Disable buildingsWithUniqueIds setting for MapboxStreets data source.…
abhishektrip Apr 5, 2018
a68132d
Disable InitializeOnStart when `InitializeWithLocationProvider` is us…
abhishektrip Apr 5, 2018
8852890
Updated manual synchornization example scene (#636)
doerrdude Apr 5, 2018
072cdcf
Release/v1.4.1 (#682) (#684)
abhishektrip Apr 17, 2018
9778033
Release/v1.4.1 (#682) (#683)
abhishektrip Apr 17, 2018
8dc4a01
Update ISSUE_TEMPLATE.md (#694)
Apr 19, 2018
4004121
Add onUpdated event to the map. (#704)
abhishektrip Apr 23, 2018
2b5dcfd
Update to latest ARInterface (#699)
Apr 26, 2018
0669d9b
Poi locations (#716)
May 2, 2018
8362029
Data fetcher (#712)
brnkhy May 3, 2018
300f0fa
fix a bug where side wall mesh generation doesn't work with elevated …
brnkhy May 3, 2018
5681588
Android native location plugin (#724)
May 3, 2018
8e8257f
Remove unused file (#729)
abhishektrip May 4, 2018
7924e69
Nesting sections gui (#735)
apavani May 6, 2018
cfebe92
Ui formatting cleanup (#738)
abhishektrip May 7, 2018
92bdf75
Preload names from tile json {WIP DO NOT MERGE} (#727)
apavani May 7, 2018
c0d1075
Fix layer renaming in treeview (#748)
abhishektrip May 8, 2018
b4450dc
Monobehavior inheritance (#730)
abhishektrip May 8, 2018
1187ef5
Ui notoken fix (#749)
abhishektrip May 9, 2018
57e0d48
Change location provider folder/scene name (#750)
abhishektrip May 9, 2018
da552b9
Ui dropdown fix (#756)
abhishektrip May 10, 2018
c937a4d
1.4.2 example scene updates (#760)
abhishektrip May 10, 2018
f08ea4e
Ui dropdown fix (#758)
abhishektrip May 10, 2018
a5dd482
Remove unused folder. (#761)
abhishektrip May 10, 2018
e7e9db6
Merge master develop (#773)
abhishektrip May 14, 2018
994693b
Merge conflict master develop (#775)
abhishektrip May 14, 2018
e14fef4
Merge conflict attempt3 (#776)
abhishektrip May 15, 2018
12f3292
Merge master into develop (#777)
abhishektrip May 15, 2018
2ed1096
Merge master develop (#781)
abhishektrip May 16, 2018
89fbab6
Merge master into develop for v1.4.2-hotfix. (#782)
abhishektrip May 16, 2018
48f77ae
fix #787 NauticalMiles unit is wrong (#788)
May 18, 2018
0247f0f
fix a calculation error in uv modifier that occasionally breaks roof …
brnkhy May 18, 2018
d2a85ea
fix a bug where terrain data causing IndexOutOfRangeException (#795)
brnkhy May 18, 2018
a11937f
Replace hero buildings (#797)
apavani May 23, 2018
5c32927
Poi scale fix (#799)
May 24, 2018
633f843
GoogleARCore fix for Unity@2018 (#791)
May 24, 2018
506c64b
Styling improvement (#718)
greglemonmapbox May 24, 2018
521fec6
UV improvements (#755)
brnkhy May 24, 2018
5d7f0e3
Drop down menu (#796)
greglemonmapbox May 25, 2018
6c864f3
Poi text scale fix (#810)
apavani May 25, 2018
ab56a8c
Enhanced DeviceLocationProvider, GPS logging and playback (#811)
May 25, 2018
b9e53e1
Bump version number to 1.4.3
abhishektrip May 25, 2018
1f234be
Bump version number + release date
abhishektrip May 25, 2018
0e45599
remove Debug.Log (#820)
May 28, 2018
31c27b9
fix coordinate parsing to use '.' as comma sign (#816)
May 28, 2018
b39ee9a
Fix warnings build errors (#822)
abhishektrip May 28, 2018
c086a4f
Fix map snapping to ground. (#823)
abhishektrip May 28, 2018
6838dc5
Fix typo
abhishektrip May 29, 2018
768ea2d
Add unity bug to known issues.
abhishektrip May 29, 2018
977c0c9
Remove factor that was slowing down panning.
abhishektrip May 29, 2018
1c5b32c
Merge branch 'release/v1.4.3' of github.com:mapbox/mapbox-unity-sdk i…
abhishektrip May 29, 2018
f1bc0ed
Update pan speed.
abhishektrip May 29, 2018
7ed269a
Feature replacement bugfix (#836)
abhishektrip Jun 5, 2018
b542503
Refactor ambient file caching to be compatible with 4.6 runtime (#825)
Jun 6, 2018
63a7b8f
Minor cleanup on scenes + remove debug statements
abhishektrip Jun 6, 2018
a1ce9e7
Merge branch 'release/v1.4.3' of github.com:mapbox/mapbox-unity-sdk i…
abhishektrip Jun 6, 2018
bbd40bf
Remove warning messages
abhishektrip Jun 6, 2018
91368c9
update example scenes in config window (#843)
Jun 7, 2018
0c29777
Merge branch 'master' of github.com:mapbox/mapbox-unity-sdk into rele…
wilhelmberg Jun 7, 2018
fec7b47
remove deleted meta
wilhelmberg Jun 7, 2018
24fd545
Merge branch 'v143prfix' of github.com:mapbox/mapbox-unity-sdk into r…
wilhelmberg Jun 7, 2018
3f7cc7e
fix LocationProvider scene
wilhelmberg Jun 7, 2018
b371ce9
Merge branch 'release/v1.4.3' of github.com:mapbox/mapbox-unity-sdk i…
wilhelmberg Jun 7, 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

These merge commits were added into this branch cleanly.

There are no new changes to show.