scratchfoundation/scratchjr
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratchjr.git synced 2024-11-28 18:15:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #122 from chrisgarrity/bug/downsample-sounds

Browse source 
Reduced sound effects to 16-bit for Android compatibility
This commit is contained in:
chrisgarrity 2017-03-13 14:15:47 -04:00 committed by GitHub
commit bd21989830
16 changed files with 36 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
android/ScratchJr/.idea/.name
View file

@ -1 +0,0 @@
ScratchJr

2
android/ScratchJr/.idea/misc.xml
View file

@ -10,7 +10,7 @@
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

10
editions/free/Free-Images.xcassets/AppIcon.appiconset/Contents.json
View file

@ -1,5 +1,15 @@
{
"images" : [
{
"idiom" : "ipad",
"size" : "20x20",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "20x20",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "29x29",

10
editions/free/Free-Images.xcassets/Free-AppIcon.appiconset/Contents.json
View file

@ -1,5 +1,15 @@
{
"images" : [
{
"idiom" : "ipad",
"size" : "20x20",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "20x20",
"scale" : "2x"
},
{
"size" : "29x29",
"idiom" : "ipad",

4
editions/free/Free-Info.plist
View file

@ -2,6 +2,10 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSMicrophoneUsageDescription</key>
<string>Used to record sounds for your projects</string>
<key>NSCameraUsageDescription</key>
<string>Used to create characters for your projects</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>

BIN
editions/free/src/sounds/boing.wav Executable file → Normal file
View file

Binary file not shown.

BIN
editions/free/src/sounds/copy.wav Executable file → Normal file
View file

Binary file not shown.

BIN
editions/free/src/sounds/cut.wav Executable file → Normal file
View file

Binary file not shown.

BIN
editions/free/src/sounds/entertap.wav Executable file → Normal file
View file

Binary file not shown.

BIN
editions/free/src/sounds/exittap.wav
View file

Binary file not shown.

BIN
editions/free/src/sounds/grab.wav Executable file → Normal file
View file

Binary file not shown.

BIN
editions/free/src/sounds/keydown.wav
View file

Binary file not shown.

BIN
editions/free/src/sounds/snap.wav Executable file → Normal file
View file

Binary file not shown.

BIN
editions/free/src/sounds/splash.wav
View file

Binary file not shown.

BIN
editions/free/src/sounds/tap.wav
View file

Binary file not shown.

17
ios/ScratchJr.xcodeproj/project.pbxproj
View file

@ -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 = (