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

Jump to bottom

Feature/odin settings search filter #35

Merged
merged 23 commits into from
Jul 28, 2020
Merged

Feature/odin settings search filter #35

merged 23 commits into from
Jul 28, 2020

Conversation

Mefodei
Copy link
Contributor

@Mefodei Mefodei commented Jun 11, 2020

  • add import rules filtering with input field for Odin

@Mefodei Mefodei mentioned this pull request Jun 11, 2020
Closed
Mefodei added 7 commits June 26, 2020 15:14
@Mefodei
- update addressables import serach filter
fee8d3d
@Mefodei
https://github.com/favoyang/unity-addressable-importer/pull/33
dfb0919 
- review fixes
@Mefodei
Merge remote-tracking branch 'origin/feature/odin-inspector-support' …
a823cc7 
…into feature/odin-settings-search-filter
@Mefodei
- fix review comments
9a7f89a
@Mefodei
https://github.com/favoyang/unity-addressable-importer/pull/33
98f619e
@Mefodei
Merge branch 'feature/odin-inspector-support' into feature/odin-setti…
ea05624 
…ngs-search-filter

# Conflicts:
#	Editor/Helper/AddressableImportSettingsEditor.cs
#	Editor/Helper/AddressableImporterOdinHandler.cs
#	Editor/Helper/AddressableImporterOdinHandler.cs.meta
#	Editor/Helper/AddressablesImporterOdinHandler.cs.meta
#	Editor/OdinSupport/AddressablesImporterOdinHandler.cs.meta
@Mefodei
- fix odin serach filter support
941ede6
@favoyang
Copy link
Owner

favoyang commented Jul 6, 2020

@Mefodei this branch has conflicts that must be resolved.

@favoyang
Copy link
Owner

favoyang commented Jul 7, 2020

Please merge with the latest master then resolve the conflict.

# Sync local/master with upstream/master
git remote add upstream git@github.com:favoyang/unity-addressable-importer.git
git fetch upstream
git checkout master
git merge upstream/master

# Merge master to your branch
git checkout YOUR_WORKING_BRANCH
git merge master

# solve the conflict, then commit.

Mefodei added 3 commits July 8, 2020 15:40
@Mefodei
- fix ApplyChanges index
87d3fdd
@Mefodei
Merge pull request #2 from favoyang/master
1fdf5c8 
update remote master
@Mefodei
Merge remote-tracking branch 'origin/master' into feature/odin-settin…
3808379 
…gs-search-filter

# Conflicts:
#	Editor/Helper/AddressableImportSettingsEditor.cs
@Mefodei
Copy link
Contributor Author

Mefodei commented Jul 16, 2020

Please merge with the latest master then resolve the conflict.

# Sync local/master with upstream/master
git remote add upstream git@github.com:favoyang/unity-addressable-importer.git
git fetch upstream
git checkout master
git merge upstream/master

# Merge master to your branch
git checkout YOUR_WORKING_BRANCH
git merge master

# solve the conflict, then commit.

Done

@favoyang favoyang merged commit 6d8022c into favoyang:master Jul 28, 2020
github-actions bot pushed a commit that referenced this pull request Jul 28, 2020
@semantic-release-bot
chore(release): 0.9.0 [skip ci]
5bd7b04 
# [0.9.0](v0.8.1...v0.9.0) (2020-07-28)

### Features

* ODIN inspector search filter ([#35](#35)) ([6d8022c](6d8022c))
@github-actions
Copy link

🎉 This PR is included in version 0.9.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Mefodei @favoyang