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

Godot 3.2 #7

Open
wants to merge 41 commits into
base: official-3.2
Choose a base branch
from
Open

Godot 3.2 #7

wants to merge 41 commits into from

Conversation

jkb0o
Copy link
Collaborator

@jkb0o jkb0o commented Mar 3, 2020

Это мерж-реквест относительно оригинальной версии 3.2 (относительно нашей не имеет смысла). После аппрува, я форс-пушну godot-3.2 - в мастер.

Реорганизовал и привёл в порядок все наши коммиты, объединил большие куски в один коммит. Какие-то, имеет смысл развернуть обратно в несколько коммитов, но сейчас, как будто, и так норм. Если какие-то коммиты считаете зря удалённымим/объединёнными - feedback welcome. На всякий случай привожу тут ребейс команды, чтобы понятно было что куда уехало.

Нужно проверить, не убрал ли я чего лишнего, ну и просто пробежаться по коду и позадавать вопросы, может быть.

drop 2921994b1d fix nativescript export properties order
drop 9837079e69 Support ViewportTexture.get_data() on gles devices
pick 5d5e05bc44 Respect res://.import/* resource dependencies on export
pick 524cf248db Extend iphone exporter with embedable frameworks and some extra linker flags
squash 80927287b1 Create default loader images for iOS export when no image defined
squash ae5b855ed9 Fix ios export pathes when copying frameworks
squash a9b225c716 Generate missed icons from main icon on ios export
squash 371f1fb6dc Enable icloud in ios templates
squash 9d4bdb2b99 [funexpected] enable background modes for xcode template
squash 5737df2932 [funexpected] allow automaticaly provisionong profiles signing by xcode
squash f0522f032f [funexpected] min os version = 10.0
squash 8737519e05 [funexpected] fix ios export didn't work with special symbols frameworks
squash ee1fbe04bd [funexpected] remove iCloud support
squash 944f856e94 [funexpected] allow to edit ios entitlements from EditorExportPlugin
squash 41124d9de2 [funexpected] set com.apple.SafariKeychain as 1 in xcode template
pick 1c3822de3d [funexpected] bypass debug/release feature tags when exporting
pick 716f46011f Expose Viewport.find_control to gdscript
pick 82a567b3ce Do not reset controls's scale inside containers
pick 2bf965540b Add parallax_visibility_notifier
pick 63c3f06ec3 add steering_behaviours module
squash 61e77f843d follow behaviour bind
squash b55547ed74 [funexpected.steering_behaviours] support follow offset
squash c5c769305a steering avoid behavior masks
squash ef53ae8f01 [funexpected] fix SteerningBehaviours property
squash 4bfb69ab8b [funexpected.steering_behaviours] remove unnecessary prints
drop 21e4093683 Add firebase module
drop bf712ec251 Add amplitude module
pick 808a412380 Add spine module
squash 09b6c7d5ff Update spine module
squash 8e3d285088 Support spine clipping
squash 2e01899851 Fix crash becouse of clipping
squash e9a741a99f Fix Spine clipping
squash eb5cb9fd60 Load spine skeletons outside project dir
squash 630724b23 t
squash 50ec2ad1e0 min spine
squash a8dfeb569b [Spine] expose attachment names for each slot to Spine.get_skeleton
squash 33e549b5a6 [spine] fix Spine::is_playing, expose Spine::get("slot/<name>/color")
squash 3f94f0cb90 [funexpected.spine] disable command pool
squash 5f9940926e [funexpected] update spine
squash d6d415c2c8 [funexpected] update new spine
squash e7c4be800c spine modification for SpineMaterial
squash 32f5064a22 spine modification for SpineMaterial
drop 33adb5848f Update amplitude
drop a56fb4ad4a Update firebase module
pick c324959490 Increase threads stack size.
pick 1e128e3f10 Add ios template build/install script
squash 5926e5b346 Add script for install osx template
squash 45f4cca332 Disable GameCenter
squash a6c2556f15 [script] build ios binaries with less size
squash 62bd2c23e6 [funexpected] do not strip symbols
squash cbc81c93e2 [funexpected] faster ios exports
squash 146c4fb98f force full debug symbols
squash 485d65b855 [funexpected] better template location detection
squash 44e39cb209 [funexpected.build] fix debug symbols generation
pick cc6a6c1fdb add test point in polygon
pick 942e0263d1 simple reattach
squash dbfc4a8e6f detach method
squash 35ada11b64 attach_to method
squash 6628b853b removed some warnings
squash d0fe808cdb [funexpected] Node::set_parent/remove instead of attach_to/reattach/detach
squash 956c0890a0 [funexpected] rename tween.remove to tween.clear
squash 1ecfa6eb97 [funexpected] node.remove() now also do queue_delete
squash 506ea112e1 [funexpeted] do not free node by Node.remove()
pick 9c3fef4e10 fix buttom up gestures
drop 16d51ca1bf [VGTexture] basic shapes implementation
drop 7efdd39ff3 [vg_texture] implement gradients
pick 1f7bd24011 [nanosvg] fix gradients for gradientUnit=abjectBoundingBox
pick 8927853e9e Build proper ios debug templates with script
pick 9cab05c808 fix line builder crash
drop ed4af21c2a amplitude upd
drop d2d4eebb0f fix
pick 04b852a8f1 Add ios receipt validation & attributes parsing
squash 4024575e0a Add missing opennssl libs for receipt verification && remove unnecesary prints
squash f1023d9b6c InAppStore::get_payload() now include sandbox flag
squash d1f867e98a Support for subsription duration in product info for ios iap
squash 0c9d98e94a fix how sandbox mode detected on iphone
squash d248bf5fad add introductory_price_period && trial_period to receipts for ios inapp
squash 11362dfd80 [funexpected] support restore purchases for ios
squash 474f8e9dc5 [funexpected] add also error code for fallen tranactions in ios inapps
squash 694e9621df [funexpected] bypass error message when ios inapp restore purchases fails
squash 353876ec27 [funexpected] don't send subscription period for ios subscriptions
squash ff66857b15 [funexpected] add shouldAddStorePayment for in AppStore purchases
squash 272142f5e4 [funexpected] check introductoryPrice for Apple products
squash 9c58d8e26f [funexpected] don't use iOS 12.2 staff when check introductoryPrice for Apple products
drop a48cf5193f Fix crash on exit
drop 5b1569a28b More crash on exit fixes
drop 49fb87ac56 Disable vg_tetxure for now
drop 0e00a1343b Fix some `this shouldn't happen` crashes
drop bab721f356 SceneTree::find_control works with ParralaxLayer WIP
pick d8246df3ab Optional `store_compressed` flag for vram textures to reduce disk usage
drop 5e3f35b079 remove some debug prints
drop pick 4dd682438e use global_position for calcculating audio2d listener (buggy)
drop pick 57bc5f2d9c update amplitude
pick c12894c240 [funexpected] expose nsobject_to/from_variant to app_delegate
pick 77d349ae67 [funexpected] store launch options
pick 141a258bf1 [funexpected] expose Object.call_multilevel/call_multilevel_reversed
pick 819ca666a7 [funexpected] scene pausing by branches also
drop 39c2b94026 Revert "SceneTree::find_control works with ParralaxLayer WIP"
pick 7411694def [funexpected] translate link button
drop ed1ea2efd7 [funexpected] smth was wrong with viewport
pick 39d03b3222 [rich text] kill text field
drop 71720c3c2d [ui.scroll] scroll smooth factor 2 project settings
pick 7f988f3d61 [funexpected] expose resource cached resource pathes for leak detection
drop 8d3595d19f [funexpected] fix badly rasterizer_storage_gles3 rebase
pick a1336fb94d [funexpected] keep gdscript stack for crash reports
squash c0fa311bd0 [funexpected][crashlytics] change Engine::get_stack() for Crashlytics
drop 0953e443df [funexpected] update scripts right on startup
pick 3a59a86812 ImageTexture::get_data returns same images in editor each call
pick 6126859d7c fix string capitalization & to_lower
pick 1f0c559306 [funexpected] Object._as_string() for string representatiopn
pick 7b7625e396 [funexpected] gdnative loads dependenent dynamic libraries
drop 702beb79b1 [funexpected] compilable windows
pick c9aab9c261 [funexpected] add traditional and simplified chinese translations
pick ddf558d7ad [funexpected] migrate submodules to github
pick 7760997b3d [funexpected] expandable RichTextLabel
pick f70ab41779 [funexpected] better translatoin selection
pick 59f74ad409 [funexpected] add instance_id check to is_instance_valid()
pick c874ebd03e [funexpected] send messages to NotificationCenter to allow init native addons as early as possible
pick 6b55f59e80 [funexpected] expose ios AppStore request review
pick efe396ee2d [funexpected] expose ios sharing
pick 3392e6c71b [funexpected] fix wrong import
pick 6ba7a6cbbc [funexpected] now `is` in GDScript can handle NativeScript as well
pick c93f3d49f8 [funexpected] prevent crash on ios13 when entering background mode
pick 0ae69724d7 [funexpected] implemented system font rendering for osx & ios
pick dabb52ff7d [funexpected] fix build for xcode 13
pick 83fda27f91 [funexpected] support for orientation change
squash 249379bd48 [funexpected] expose UIDevice.orientation to iOS singletion
squash 51179e7911 [funexpected] expose iOS.get_interface_orientation
drop e5a4ac5ea2 Improve glBufferSubData usage where safe
pick 981531eaa3 [funexpected] stop set ios_launch_options in didFinishLaunchingWithOptions
pick 7a6eadceec [funexpected] add iOS::get_app_version

jkb0o and others added 30 commits February 27, 2020 08:54
- 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
- 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
@@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
1F1575721F582BE20003B889 /* $binary.entitlements in Resources */ = {isa = PBXBuildFile; fileRef = 1FF4C1881F584E6300A41E41 /* dylibs */; };
Copy link
Contributor

Choose a reason for hiding this comment

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

погуглил про файл .pbxproj. Было бы неплохо послушать про него

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants