-
Notifications
You must be signed in to change notification settings - Fork 3
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
Godot 3.2 #7
Open
jkb0o
wants to merge
41
commits into
official-3.2
Choose a base branch
from
godot-3.2
base: official-3.2
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Godot 3.2 #7
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- support embedable frameworks and some extra linker flags - create default loader images for iOS export when no image defined - fix ios export pathes when copying frameworks - generate missed icons from main icon on ios export - enable background modes for xcode template - allow automaticaly provisionong profiles signing by xcode - bump min os version to 10.0 - allow to edit ios entitlements from EditorExportPlugin - set com.apple.SafariKeychain as 1 in xcode template
Looks hacky, but fixes godotengine/godot#20832
- InAppStore::get_payload() now include sandbox flag - Support for subsription duration in product info for ios iap - introductory_price_period && trial_period to receipts for ios inapp - support restore purchases for ios - bypass error message when ios inapp restore purchases fails - don't send subscription period for ios subscriptions - shouldAddStorePayment for in AppStore purchases - check introductoryPrice for Apple products
…educe disk usage
…e addons as early as possible
TODO: - move apple_fonts to some OS_ code - try windows, linux, android
…iant in API json" This reverts commit e2121c9.
nevanna
approved these changes
Mar 3, 2020
@@ -7,6 +7,7 @@ | |||
objects = { | |||
|
|||
/* Begin PBXBuildFile section */ | |||
1F1575721F582BE20003B889 /* $binary.entitlements in Resources */ = {isa = PBXBuildFile; fileRef = 1FF4C1881F584E6300A41E41 /* dylibs */; }; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
погуглил про файл .pbxproj. Было бы неплохо послушать про него
AndreevAndrei
approved these changes
Mar 4, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Это мерж-реквест относительно оригинальной версии 3.2 (относительно нашей не имеет смысла). После аппрува, я форс-пушну
godot-3.2
- в мастер.Реорганизовал и привёл в порядок все наши коммиты, объединил большие куски в один коммит. Какие-то, имеет смысл развернуть обратно в несколько коммитов, но сейчас, как будто, и так норм. Если какие-то коммиты считаете зря удалённымим/объединёнными - feedback welcome. На всякий случай привожу тут ребейс команды, чтобы понятно было что куда уехало.
Нужно проверить, не убрал ли я чего лишнего, ну и просто пробежаться по коду и позадавать вопросы, может быть.