diff --git a/android/ScratchJr/.idea/.name b/android/ScratchJr/.idea/.name deleted file mode 100644 index ed9926a..0000000 --- a/android/ScratchJr/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -ScratchJr \ No newline at end of file diff --git a/android/ScratchJr/.idea/misc.xml b/android/ScratchJr/.idea/misc.xml index e45faed..1d9d626 100644 --- a/android/ScratchJr/.idea/misc.xml +++ b/android/ScratchJr/.idea/misc.xml @@ -10,7 +10,7 @@ - + diff --git a/editions/free/Free-Images.xcassets/AppIcon.appiconset/Contents.json b/editions/free/Free-Images.xcassets/AppIcon.appiconset/Contents.json index 843b897..abd908f 100644 --- a/editions/free/Free-Images.xcassets/AppIcon.appiconset/Contents.json +++ b/editions/free/Free-Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,5 +1,15 @@ { "images" : [ + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "2x" + }, { "idiom" : "ipad", "size" : "29x29", diff --git a/editions/free/Free-Images.xcassets/Free-AppIcon.appiconset/Contents.json b/editions/free/Free-Images.xcassets/Free-AppIcon.appiconset/Contents.json index 31afabe..e023e76 100644 --- a/editions/free/Free-Images.xcassets/Free-AppIcon.appiconset/Contents.json +++ b/editions/free/Free-Images.xcassets/Free-AppIcon.appiconset/Contents.json @@ -1,5 +1,15 @@ { "images" : [ + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "2x" + }, { "size" : "29x29", "idiom" : "ipad", diff --git a/editions/free/Free-Info.plist b/editions/free/Free-Info.plist index f39c165..3119fb6 100644 --- a/editions/free/Free-Info.plist +++ b/editions/free/Free-Info.plist @@ -2,6 +2,10 @@ + NSMicrophoneUsageDescription + Used to record sounds for your projects + NSCameraUsageDescription + Used to create characters for your projects CFBundleDevelopmentRegion en CFBundleDisplayName diff --git a/editions/free/src/sounds/boing.wav b/editions/free/src/sounds/boing.wav old mode 100755 new mode 100644 index 0d9d30d..151ec14 Binary files a/editions/free/src/sounds/boing.wav and b/editions/free/src/sounds/boing.wav differ diff --git a/editions/free/src/sounds/copy.wav b/editions/free/src/sounds/copy.wav old mode 100755 new mode 100644 index 84bdac7..7736c9e Binary files a/editions/free/src/sounds/copy.wav and b/editions/free/src/sounds/copy.wav differ diff --git a/editions/free/src/sounds/cut.wav b/editions/free/src/sounds/cut.wav old mode 100755 new mode 100644 index b125402..c4dc7d2 Binary files a/editions/free/src/sounds/cut.wav and b/editions/free/src/sounds/cut.wav differ diff --git a/editions/free/src/sounds/entertap.wav b/editions/free/src/sounds/entertap.wav old mode 100755 new mode 100644 index c56f1bb..b4502c0 Binary files a/editions/free/src/sounds/entertap.wav and b/editions/free/src/sounds/entertap.wav differ diff --git a/editions/free/src/sounds/exittap.wav b/editions/free/src/sounds/exittap.wav index 7198a4a..52a30cf 100644 Binary files a/editions/free/src/sounds/exittap.wav and b/editions/free/src/sounds/exittap.wav differ diff --git a/editions/free/src/sounds/grab.wav b/editions/free/src/sounds/grab.wav old mode 100755 new mode 100644 index d460698..314f5da Binary files a/editions/free/src/sounds/grab.wav and b/editions/free/src/sounds/grab.wav differ diff --git a/editions/free/src/sounds/keydown.wav b/editions/free/src/sounds/keydown.wav index d28f7fe..d33cd8d 100644 Binary files a/editions/free/src/sounds/keydown.wav and b/editions/free/src/sounds/keydown.wav differ diff --git a/editions/free/src/sounds/snap.wav b/editions/free/src/sounds/snap.wav old mode 100755 new mode 100644 index a77d168..b27549b Binary files a/editions/free/src/sounds/snap.wav and b/editions/free/src/sounds/snap.wav differ diff --git a/editions/free/src/sounds/splash.wav b/editions/free/src/sounds/splash.wav index 63d2d74..6747115 100644 Binary files a/editions/free/src/sounds/splash.wav and b/editions/free/src/sounds/splash.wav differ diff --git a/editions/free/src/sounds/tap.wav b/editions/free/src/sounds/tap.wav index 481604a..7747a5d 100644 Binary files a/editions/free/src/sounds/tap.wav and b/editions/free/src/sounds/tap.wav differ diff --git a/ios/ScratchJr.xcodeproj/project.pbxproj b/ios/ScratchJr.xcodeproj/project.pbxproj index 78218a4..2a1b937 100644 --- a/ios/ScratchJr.xcodeproj/project.pbxproj +++ b/ios/ScratchJr.xcodeproj/project.pbxproj @@ -306,6 +306,9 @@ DevelopmentTeam = TTT4R28WVF; TestTargetID = 204D80A418A4140600ECBB8B; }; + D92D0F861C33381B00C573AD = { + DevelopmentTeam = W7AR3WMP87; + }; }; }; buildConfigurationList = 204D80A018A4140600ECBB8B /* Build configuration list for PBXProject "ScratchJr" */; @@ -460,8 +463,8 @@ CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; COPY_PHASE_STRIP = NO; ENABLE_BITCODE = NO; ENABLE_TESTABILITY = YES; @@ -481,7 +484,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 7.0; ONLY_ACTIVE_ARCH = YES; - PROVISIONING_PROFILE = "F235859C-8E18-45F4-A1BC-E701420F3770"; + PROVISIONING_PROFILE = "8f58b6d2-97d0-4e4a-ac2e-3c4ee99770bf"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = 2; }; @@ -503,8 +506,8 @@ CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Distribution"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; COPY_PHASE_STRIP = YES; ENABLE_BITCODE = NO; ENABLE_NS_ASSERTIONS = NO; @@ -516,7 +519,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 7.0; - PROVISIONING_PROFILE = "F235859C-8E18-45F4-A1BC-E701420F3770"; + PROVISIONING_PROFILE = "8f58b6d2-97d0-4e4a-ac2e-3c4ee99770bf"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = 2; VALIDATE_PRODUCT = YES; @@ -579,6 +582,7 @@ ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Free-LaunchImage"; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + DEVELOPMENT_TEAM = W7AR3WMP87; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "ScratchJr/ScratchJr-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -602,6 +606,7 @@ ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Free-LaunchImage"; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + DEVELOPMENT_TEAM = W7AR3WMP87; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "ScratchJr/ScratchJr-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = (