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.

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

Initial iOS Support #556

Merged
merged 21 commits into from
Jan 6, 2024
Merged

Initial iOS Support #556

merged 21 commits into from
Jan 6, 2024

Conversation

mikeskydev
Copy link
Member

@mikeskydev mikeskydev commented Oct 31, 2023

Adds an iOS pipeline focused on Zapbox support, with general fixes for iOS-related functionality.

Co-authored-by: Andy Baker andy@andybak.net

The remaining GVR systems have been removed due to incompatibility with iOS. We have switched GVR Audio to use standard unity audio, which we'd need for any modern spatialization system anyways.

@mikeskydev mikeskydev added the enhancement Feature added label Oct 31, 2023
.github/workflows/build.yml Outdated Show resolved Hide resolved
.github/workflows/build.yml Outdated Show resolved Hide resolved
.github/workflows/build.yml Outdated Show resolved Hide resolved
Assets/Editor/BuildTiltBrush.cs Show resolved Hide resolved
Assets/Editor/BuildTiltBrush.cs Show resolved Hide resolved
ProjectSettings/ProjectSettings.asset Show resolved Hide resolved
ProjectSettings/ProjectSettings.asset Show resolved Hide resolved
ProjectSettings/ProjectSettings.asset Show resolved Hide resolved
ProjectSettings/ProjectSettings.asset Show resolved Hide resolved
Assets/ThirdParty/GoogleVR.meta Outdated Show resolved Hide resolved
Assets/Scripts/VrSdk.cs Outdated Show resolved Hide resolved
Copy link
Member

@mikeage mikeage left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, unless you want to add the actual fastlane compilation in the same PR

@mikeskydev
Copy link
Member Author

We'll leave fastlane for another PR, but was hoping for the zapbox sdk to update so I could resolve the remaining conversation before merging this one

fixes build issue on android, so removing the code that removed zapbox sdk on unsupported platforms.
Conflicts:
	.github/workflows/build.yml
	Assets/Editor/BuildTiltBrush.cs
	Packages/manifest.json
@mikeage
Copy link
Member

mikeage commented Dec 7, 2023

I updated this PR based on the changes I recently made. All of the conflicts were resolved in the merge commit

.github/workflows/build.yml Outdated Show resolved Hide resolved
Assets/Editor/BuildTiltBrush.cs Show resolved Hide resolved
@mikeskydev mikeskydev merged commit 6e82359 into main Jan 6, 2024
35 checks passed
@mikeage mikeage deleted the rebuild-ios branch January 6, 2024 18:11
mikeage pushed a commit that referenced this pull request Jan 9, 2024
Should fix the issue with Quest 1, will need to find a better fix for changing this on Zapbox.

Fixes an issue introduced in #556
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Feature added
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants