Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Merge develop 9.0 24.07.18#6612

Merged
livecodeali merged 69 commits into
livecode:developfrom
livecodeali:merge-develop_9.0-24.07.18
Jul 24, 2018
Merged

Merge develop 9.0 24.07.18#6612
livecodeali merged 69 commits into
livecode:developfrom
livecodeali:merge-develop_9.0-24.07.18

Conversation

@livecodeali

@livecodeali livecodeali commented Jul 24, 2018

Copy link
Copy Markdown
Member

Conflict in build-android.md (I think some conflict markers were previously left in the file)

<<<<<<< HEAD
android-ndk-r14/build/tools/make_standalone_toolchain.py \
    --arch arm --api 19 \
=======
android-ndk-r15/build/tools/make_standalone_toolchain.py \
<<<<<<< HEAD
    --arch arm --api 26 \
>>>>>>> upstream/develop-9.0
=======
    --arch arm --api 16 --deprecated-headers \
>>>>>>> upstream/develop-9.0
    --install-dir ${HOME}/android/toolchain/standalone

resolved with

android-ndk-r15/build/tools/make_standalone_toolchain.py \
    --arch arm --api 16 --deprecated-headers \
    --install-dir ${HOME}/android/toolchain/standalone

livecodepanos and others added 30 commits May 18, 2018 16:42
`MCField::compactdata` iterates over all of the data stored for each field.  If not shared, then there is data for each card where the object had existed.  Due to the way `MCStack::checkid` was constructed, if the card was not found then the check was done against the current card.  This has an unintended effect of keeping all field data around for deleted cards if the owning group is on the current card.

This change ensures that the `cardid` is always checked to be sure it matches the card before checking to see if the group is on the card.  Due to the way the code is constructed in the Field and Button side, the `cardid` will never be 0.
This patch audits java calls that return strings to check using `MCStringIsEmpty`
instead of `null` as `null` return values are being translated to empty strings.
This patch ensures that MCStack::view_render returns immediately if
`ECS_DONTDRAW` is set. This exstended state is set/unset on a stack
when a new stack is opened on mobile causing it to become the stack
which should be rendered to screen. Previously portions of other
open stacks could be rendered over the top stack.
This patch fixes an issue where showAll fullscreen mode was not correctly dirtying
the entire rect that needed to be re-rendered causing the letterbox area to remain
the same as the previous card. The issue was twofold:

- The code paths for dirty in the entire stack were not consistent with many places
calling view_dirty_all and many calling dirtyall
- view_dirty_all was not dirtying the entire visible stack rect

This patch removes `view_dirty_all` by routing `dirtyall` through `dirtyrect` to
`view_dirty_rect`.
This patch ensures that objects are clipped to the visible stack rect
when in fullscreen with the exception of `showAll` mode which should not
clip.
This patch fixes the issue where if the acceleratedRendering was set to true
in a preOpenStack or startup handler on Android the SurfaceHandler callbacks
were never called. By moving the creation and adding of the view to a runnable
this issue no longer occurs.
(imported from commit a66d49a)
This patch fixes an issue where the sprite layer id was being set to the layer
id of the scenery layer below it when an object below the sprite was relayered
causing the scenery layer above to be merged.
This patch fixes the android external filter pattern to ensure that it
will only match files from the specified arch and still retains the ability
to include support libraries with `lib` prefix and `<arch>.so` suffix.
This mergExt update includes builds of mergJSON, mergMarkdown and blur
externals armeabi-v7a, arm64-v8a, x86, x86_64, mips and mips64.
…ersion_26

Force targetSdkVersion to API 26
The NDK platform version used to compile the android engine needs
to be 16 at the moment, in order to continue to support older
devices (4.1 upwards)
[[ API 26 ]] Use app platform 16 with target sdk 26
This patch ensures that the entire stack is redrawn before hiding the bitmap
view. Previously if toggling acceleratedRendering rapidly it was possible for
the bitmap view to be hidden while the openGL view had not been redrawn.
iOS UIViews do not clip child views to their bounds by default so the
child view is drawn iv it is on screen regardless of whether portions
are outside the bounds of the parent view. This patch sets the clipsToBounds
property of native container layers so that they will clip to the rect
of the group as intended.
[[ Bug 21386 ]] Set clipsToBounds of native container layer
…gbitmap

[[ Bug ]] Redraw the entire stack before hiding bitmap view
…d_minversions

Remove unsupported Android min versions
[Bug 21368] Ensure device can register for and receive remote notifications on Android
[[ Bug 21304 ]] Clear unshared data when compacting stack
[21171] Ensure unicode characters in app label are shown correctly
livecodepanos and others added 20 commits July 3, 2018 11:16
…ed-text

 [[ Bug 20839 ]] Improve appearance of Motif theme disabled button text / icons
[[ Player ]] Fix player not playing without setting playrate
Ensure MClicenseparameters struct is cleared in X_clear_globals
so that it does not contain any dangling pointers when android
apps are resumed.
[[ Bug 19420 ]] Fix crash on resume in commercial android engine
Do not split up .framework folders between MacOS and Resources/_MacOS…
[[ PlayerPanning ]] Add stereo balance & panning properties to mac player
@livecodeali

Copy link
Copy Markdown
Member Author

@livecode-vulcan review ok addc9d1

@livecodeali livecodeali added this to the 9.1.0-dp-1 milestone Jul 24, 2018
@livecodeali

Copy link
Copy Markdown
Member Author

Taking a few liberties with the clean-merge label here.

@livecode-vulcan

Copy link
Copy Markdown
Contributor

💙 review by @livecodeali ok addc9d1

livecode-vulcan added a commit that referenced this pull request Jul 24, 2018
…7.18

Merge develop 9.0 24.07.18

Conflict in build-android.md (I think some conflict markers were previously left in the file)

```
<<<<<<< HEAD
android-ndk-r14/build/tools/make_standalone_toolchain.py \
    --arch arm --api 19 \
=======
android-ndk-r15/build/tools/make_standalone_toolchain.py \
<<<<<<< HEAD
    --arch arm --api 26 \
>>>>>>> upstream/develop-9.0
=======
    --arch arm --api 16 --deprecated-headers \
>>>>>>> upstream/develop-9.0
    --install-dir ${HOME}/android/toolchain/standalone
```

resolved with
```
android-ndk-r15/build/tools/make_standalone_toolchain.py \
    --arch arm --api 16 --deprecated-headers \
    --install-dir ${HOME}/android/toolchain/standalone
```
@livecode-vulcan

Copy link
Copy Markdown
Contributor

😎 test success addc9d1

  • try-community-armv6-android-sdk26_ndk16r15: success
  • try-community-armv7-android-sdk26_ndk16r15: success
  • try-community-arm64-android-sdk26_ndk16r15: success
  • try-community-x86-android-sdk26_ndk16r15: success
  • try-community-x86_64-android-sdk26_ndk16r15: success
  • try-community-js-emscripten-sdk1.35: success
  • try-community-universal-ios-iphoneos11.4: success
  • try-community-universal-ios-iphonesimulator11.4: success
  • try-community-universal-mac-macosx10.9: success
  • try-community-x86-linux-debian8: success
  • try-community-x86_64-linux-debian8: success
  • try-community-x86-win32: success
  • try-community-x86_64-win32: success

@livecodeali livecodeali merged commit b177a44 into livecode:develop Jul 24, 2018
@livecodeali livecodeali deleted the merge-develop_9.0-24.07.18 branch July 24, 2018 21:33
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants