Antti Tapaninen aet
aet
/ .gitconfig
Created
May 26, 2020 16:55
Fix using Unity's UnityYAMLMerge with Apple File Merge (/usr/bin/opendiff) on a Mac
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
| [merge] | |
| tool = unityyamlmerge | |
| [mergetool "unityyamlmerge"] | |
| # Create /usr/local/UnityYAMLMerge directory (any other location will do) | |
| # /usr/local/UnityYAMLMerge/UnityYAMLMerge is a symlink to a release of your choice, /Applications/Unity/Hub/Editor/XXX/Unity.app/Contents/Tools/UnityYAMLMerge | |
| # Copy mergeresolving.txt, mergerules.txt and mergespecfile.txt from there and maintain possible customizations outside the core Unity installation | |
| # | |
| # For Mac, mergespecfile.txt has a configuration issue out of the box the way it uses Apple File merge (/usr/bin/opendiff), it doesn't block! | |
| # Switch it to use this dummy wrapper instead: |
aet
/ unity-avkit.patch
Last active
October 17, 2016 15:12
Workaround for Unity fullscreen videoplayer missing "done" button when using AVKit implementation on iOS 8 and later
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
| diff --git a/Classes/UI/UnityAppController+ViewHandling.h b/Classes/UI/UnityAppController+ViewHandling.h | |
| --- a/Classes/UI/UnityAppController+ViewHandling.h | |
| +++ b/Classes/UI/UnityAppController+ViewHandling.h | |
| @@ -72,10 +72,13 @@ | |
| // creates initial UI hierarchy (e.g. splash screen) and calls willStartWithViewController | |
| - (void)createUI; | |
| // shows game itself (hides splash, and bring _rootView to front) | |
| - (void)showGameUI; | |
| +// returns the topmost presentedViewController if there is one, or just rootViewController |
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
| Annoyed by mDNSResponder flood like this after OS X Yosemite 10.10.4 upgrade? | |
| Jul 7 12:44:11 aet.local mDNSResponder[92] <Error>: Unknown DNS packet type 636F from 10.1.0.78 :63062 to 224.0.0.251 :5353 length 24 on 0000000000000004 (ignored) | |
| Jul 7 12:44:12 aet.local mDNSResponder[92] <Error>: Unknown DNS packet type 636F from 10.1.1.122 :50585 to 224.0.0.251 :5353 length 24 on 0000000000000004 (ignored) | |
| Add the following lines at the beginning of /etc/asl.conf | |
| ? [= Sender mDNSResponder] file mDNSResponder.log file_max=128k all_max=128k | |
| ? [= Sender mDNSResponder] ignore |