mirror of
https://github.com/zakk4223/CocoaSplit.git
synced 2026-05-15 22:00:34 -06:00
[PR #83] [MERGED] 2.1 release #91
Labels
No labels
enhancement
enhancement
pull-request
No milestone
No project
No assignees
1 participant
Notifications
Due date
No due date set.
Dependencies
No dependencies set.
Reference: github-starred/CocoaSplit#91
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
📋 Pull Request Information
Original PR: https://github.com/zakk4223/CocoaSplit/pull/83
Author: @zakk4223
Created: 12/25/2017
Status: ✅ Merged
Merged: 12/25/2017
Merged by: @zakk4223
Base:
master← Head:2.1📝 Commits (10+)
afeeb1bWhen a animation script fails show the exception to the userce1ba16Cleaned up interface for script/layout view switching3f1fdf8Remove all references to animations attached to layouts; use scripts now2fdf078Bounce all updates of topLevelSourceList through main thread5e6427dRemoved pending animation/CATransaction hack for layout switching since there are no longer any animationscb09441Rewrote layout merging/replacing so it doesn't call input comparison functions more than once.e05279dRestored undo functionality for layout changesf8da540Added standalone script grid window.f2b77b1Added runScriptByName() function to python library. TODO: infinite recursion detectiond61c019Add animatable volume control to audio nodes📊 Changes
482 files changed (+28382 additions, -13486 deletions)
View changed files
➖
.DS_Store(+0 -0)➕
.gitignore(+3 -0)📝
CSFFMpegCapturePlugin/CSFFMpegCapturePlugin.xcodeproj/project.pbxproj(+17 -1)➖
CSFFMpegCapturePlugin/CSFFMpegCapturePlugin.xcodeproj/xcuserdata/zakk.xcuserdatad/xcschemes/CSFFMpegCapturePlugin.xcscheme(+0 -80)➖
CSFFMpegCapturePlugin/CSFFMpegCapturePlugin.xcodeproj/xcuserdata/zakk.xcuserdatad/xcschemes/xcschememanagement.plist(+0 -22)📝
CSFFMpegCapturePlugin/CSFFMpegCapturePlugin/CSFFMpegCapture.h(+8 -3)📝
CSFFMpegCapturePlugin/CSFFMpegCapturePlugin/CSFFMpegCapture.m(+220 -43)📝
CSFFMpegCapturePlugin/CSFFMpegCapturePlugin/CSFFMpegCaptureViewController.h(+2 -3)📝
CSFFMpegCapturePlugin/CSFFMpegCapturePlugin/CSFFMpegCaptureViewController.m(+123 -2)📝
CSFFMpegCapturePlugin/CSFFMpegCapturePlugin/CSFFMpegCaptureViewController.xib(+123 -38)📝
CSFFMpegCapturePlugin/CSFFMpegCapturePlugin/CSFFMpegInput.h(+9 -4)📝
CSFFMpegCapturePlugin/CSFFMpegCapturePlugin/CSFFMpegInput.m(+289 -209)📝
CSFFMpegCapturePlugin/CSFFMpegCapturePlugin/CSFFMpegPlayer.h(+17 -3)📝
CSFFMpegCapturePlugin/CSFFMpegCapturePlugin/CSFFMpegPlayer.m(+194 -80)📝
CSNotifications.m(+19 -0)📝
CapturePlugins/CSAVFCapturePlugin/CSAVFCapturePlugin.xcodeproj/project.pbxproj(+26 -1)➖
CapturePlugins/CSAVFCapturePlugin/CSAVFCapturePlugin.xcodeproj/xcuserdata/zakk.xcuserdatad/xcschemes/CSAVFCapturePlugin.xcscheme(+0 -71)➖
CapturePlugins/CSAVFCapturePlugin/CSAVFCapturePlugin.xcodeproj/xcuserdata/zakk.xcuserdatad/xcschemes/CSAVFCapturePlugin_BACKUP_26129.xcscheme(+0 -75)➖
CapturePlugins/CSAVFCapturePlugin/CSAVFCapturePlugin.xcodeproj/xcuserdata/zakk.xcuserdatad/xcschemes/CSAVFCapturePlugin_BACKUP_26694.xcscheme(+0 -75)➖
CapturePlugins/CSAVFCapturePlugin/CSAVFCapturePlugin.xcodeproj/xcuserdata/zakk.xcuserdatad/xcschemes/CSAVFCapturePlugin_BASE_26129.xcscheme(+0 -68)...and 80 more files
📄 Description
Merge 2.1 branch into master
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.