Merging experimental branch #679
Open
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
# Conflicts: # platform/android/ndk/CMakeLists.txt # platform/apple/Rtt_ApplePlatform.mm # platform/iphone/libcorona.xcodeproj/project.pbxproj # platform/linux/CMakeList.txt # platform/mac/ratatouille.xcodeproj/project.pbxproj # platform/tvos/ratatouille.xcodeproj/project.pbxproj # platform/windows/Corona.Rtt.Library/Corona.Rtt.Library.Win32.vcxproj # platform/windows/Corona.Rtt.Library/Corona.Rtt.Library.Win32.vcxproj.filters # platform/windows/Corona.Simulator.Native.Library.Win32/Main.cpp
fixing some x64 incompatibilities
… where either extension block or list could be absent (coronalabs#509)
…nto experimental
# Conflicts: # platform/mac/ratatouille.xcodeproj/project.pbxproj # platform/tvos/ratatouille.xcodeproj/project.pbxproj
…nto experimental
Factory function replacement, redesign
Modifications to use application metadata for depth and stencil buffers
…nto experimental
# Conflicts: # librtt/Display/Rtt_ShaderData.cpp # librtt/Renderer/Rtt_GLFrameBufferObject.cpp # librtt/Renderer/Rtt_GLProgram.cpp # platform/iphone/libcorona.xcodeproj/project.pbxproj # platform/mac/ratatouille.xcodeproj/project.pbxproj # platform/tvos/ratatouille.xcodeproj/project.pbxproj
… dependencies; other (coronalabs#592)
…nto experimental
HBL001
reviewed
Apr 6, 2024
There was a problem hiding this comment.
Makelist has an update here ${CORONA_ROOT}/librtt/Corona/CoronaObjects.cpp, bbbbbbut... there is no such update in the ~\corona\librtt\Corona directory. Not checked if this is specific to Linux builds.
There was a problem hiding this comment.
Hi. If it is just a botched project file—bound to happen sooner or later, especially since I don't have a Linux testing setup yet—I'd first try just removing that file from master.
(However, I wouldn't say no to some real-world Linux testing of experimental. 😃)
Was hoping to finally get this merged properly but every time that looks promising there seem to be new iOS or Android requirements to address. 😂 (And a new conflict to fix, apparently.)
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.
Well, here goes nothing. 😄
(A few conflict fix PRs will definitely follow.)
About 80 of these files are just Vulkan headers and a few binaries.
There are 10 or so JSON files related to tvos templates. I'm not sure what introduced them, or if they're a problem.
Otherwise, commentary may be found in the various PRs that have been merged into
experimental.