235 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
chrisgarrity	19699e18b4	Fix Android (gradle) build error ... Builds that worked one day, suddenly fail the next. The error is: `Could not find play-services-basement.aar (com.google.android.gms:play-services-basement:15.0.1).` Re-ordering the repositories fixes the issue (from Stack Overflow): https://stackoverflow.com/questions/50563407/could-not-find-play-services-basement-aar	2018-10-29 09:35:57 -04:00
chrisgarrity	2da0c818bf	Merge pull request #192 from Murkantilism/develop ... Replaced hardcoded value of 136 with a variable.	2018-10-29 09:05:17 -04:00
Deniz Ozkaynak	ae0d60cb43	Replaced hardcoded value of 136 with a variable.	2018-10-13 20:36:29 -04:00
Deniz Ozkaynak	844765bde6	Created a variable to replace a hardcoded value ... In ../src/editor/ui/UI.js there's a random hardcoded value of 136 that helps determine the scale of fullscreen mode. Not sure what this number represents but it should be a variable.	2018-10-13 20:35:10 -04:00
chrisgarrity	b79fc90fb9	Merge pull request #189 from chrisgarrity/update-translations ... update translations and languages	2018-10-03 14:01:43 -04:00
chrisgarrity	02ebb629c1	update translations and languages	2018-10-03 13:58:37 -04:00
chrisgarrity	c0bdc36268	Merge pull request #187 from chrisgarrity/rebuild-versions ... Rebuild versions	2018-10-02 08:17:45 -04:00
chrisgarrity	1fcdff79f2	Remove unnecessary screen settings from manifest	2018-10-01 17:12:03 -04:00
chrisgarrity	21bb1a1eb6	Updated versions to allow building	2018-10-01 16:32:29 -04:00
chrisgarrity	c90c1ce37f	Merge pull request #162 from yida921/develop ... updated android SDK versions	2018-09-27 08:22:37 -04:00
chrisgarrity	6d022384de	Merge pull request #180 from jndrm/typescript ... Add .editorconfig file & upgrade webpack	2018-09-26 11:28:25 -04:00
chrisgarrity	85a68eb017	Merge pull request #179 from jndrm/develop ... Fix Runtime Issues:	2018-09-26 09:28:27 -04:00
Donald	29ebbeece6	Code format & sort npm script params	2018-09-11 14:27:15 +08:00
Donald	d60ea5e7cb	Upgrade webpack to 4.18.0 ... Add 'watch' and 'dev' npm scripts	2018-09-11 14:13:38 +08:00
Donald	ee48c72922	Add .editorconfig file	2018-09-11 12:59:48 +08:00
Donald	2da2fad26c	Fix Runtime Issues: ... ScratchJr.m: runtime: UI API called from background thread: -[UIView removeFromSuperview] must be used from main thread only IO.m: runtime: UI API called from background thread: -[UIWebView stringByEvaluatingJavaScriptFromString:] must be used from main thread only	2018-09-11 09:32:02 +08:00
chrisgarrity	6f59d224e7	Merge pull request #176 from apple502j/patch-1 ... Change 日本語 to にほんご	2018-08-14 12:15:35 -04:00
apple502j	8ab8fefb55	Change 日本語 to にほんご	2018-08-05 20:46:48 +09:00
Andrew Sliwinski	3622608970	Update TRADEMARK	2018-06-18 13:19:00 -04:00
chrisgarrity	d19d63dc73	Merge pull request #170 from chrisgarrity/issue/gh137-paint-calibration ... Don’t adjust paintEditor point on Android	2018-05-03 09:30:17 -04:00
chrisgarrity	a4737a4399	Don’t adjust paintEditor point on Android ... Fixes the issue where the editor doesn’t draw where the finger is touching on Android.	2018-05-02 15:01:45 -04:00
Practical Education Network	8908e40915	updated android SDK versions	2018-04-04 12:47:32 -04:00
Andrew Sliwinski	fdd930ee50	Merge pull request #150 from VutonDesign/develop ... Markdown files clean-up	2017-09-25 09:26:40 -04:00
Vuton Design	6a1fdc962c	Clean-Up	2017-09-25 14:24:31 +01:00
Vuton Design	ec0e28bbda	Clean-Up	2017-09-25 12:29:09 +01:00
Vuton Design	8fa91d05a0	Clean-Up	2017-09-25 12:24:45 +01:00
chrisgarrity	827d8b1508	Merge pull request #148 from chrisgarrity/feature/add-languages ... Add languages	2017-09-19 11:42:45 -04:00
chrisgarrity	9336953985	Add languages ... Added: - German - Japanese - Portuguese - Swedish - Chinese (China) Needed to modify Localization utilities to handle China locale in additional to language.	2017-09-16 14:33:28 -04:00
chrisgarrity	8d1d3069b0	Merge pull request #144 from chrisgarrity/bug/speech-balloon ... Revert balloon SVG to fix speech balloon bug	2017-08-25 11:17:49 -04:00
chrisgarrity	24ee71d95e	Revert balloon SVG to fix speech balloon bug	2017-08-24 16:31:30 -04:00
chrisgarrity	40392040fa	Merge pull request #142 from chrisgarrity/usage-splash ... Usage splash	2017-08-23 14:55:11 -04:00
chrisgarrity	0f2c31bfc9	Add documentation for AppUsage ... Also make ternary operators easier to read.	2017-08-23 11:53:13 -04:00
chrisgarrity	7a530be88b	Update to xcode recommended settings ... Set minimum iOS version to 8.0	2017-08-14 16:27:07 -04:00
chrisgarrity	1862c41394	Revise cookie	2017-08-14 15:58:57 -04:00
chrisgarrity	e5d1e2ab10	Optimize SVGs ... Ran svgo on all the UI SVGs to minify them. Library svgs are converted to pngs as part of the build process, so they are not optimized (it breaks the current conversion script)	2017-08-14 10:26:49 -04:00
chrisgarrity	b6a36dbf32	Handle official catface and logo ... Hide all the usage elements, and re-show the logo/catface if coming from the usage page.	2017-08-11 09:13:52 -04:00
chrisgarrity	952ce54b52	Don’t reload index ... Instead of reloading the page, just load Start and have Start hide the usage parts.	2017-08-10 17:03:30 -04:00
chrisgarrity	852df3edbb	Add splash page for usage tracking ... * Adds a usage cookie * Only asks for usage on first launch * will need checking with the official version to make sure the right elements are showing/hiding.	2017-08-10 10:00:22 -04:00
chrisgarrity	3143ec01d4	Merge pull request #139 from chrisgarrity/develop ... Bring develop up to date with master	2017-07-18 09:06:59 -04:00
chrisgarrity	5c2cd3ce23	Merge pull request #138 from chrisgarrity/reduce-sound-sizes ... Limit size of sounds	2017-07-17 16:01:33 -04:00
chrisgarrity	16e4b7ce27	Limit size of sounds ... We know that projects with lots of (large) sounds tend to crash ScratchJr. Hopefully reducing the size of the sounds will help to reduce the number of crashes.	2017-07-17 11:25:59 -04:00
chrisgarrity	f6c75c3019	Merge pull request #133 from chrisgarrity/email-text-typo ... Fix typo in SHARING_EMAIL_TEXT	2017-05-24 12:23:56 -04:00
chrisgarrity	6626ba6cea	Fix typo in SHARING_EMAIL_TEXT ... missing space	2017-05-05 11:49:21 -04:00
chrisgarrity	02fc0fd26a	Update README.md	2017-05-05 11:39:07 -04:00
chrisgarrity	d4a6b2885d	Merge pull request #121 from chrisgarrity/bug/iOS-sound ... Rewrite iOS sound management to use native audio instead of webaudio. Quirks are consistent with Android which was already doing native audio.	2017-03-14 21:56:59 -04:00
chrisgarrity	7e4f6682d6	Fun with sound timers ... If the same sound gets triggered while it’s playing, the sound restarts and both sound blocks will be highlighted until the sound completes - this matches what happens on Android. Also more formatting changes.	2017-03-14 18:09:43 -04:00
chrisgarrity	f752ff5760	Fix formatting and restart bug ... In the current system you can’t have the same sound playing more than once at the same time - this is how it was implemented on Android, so we used the same restriction on iOS. However in the previous version if you interrupted the sound to play it again, it continued from where it was instead of starting over. So it didn’t appear to do anything. Added resetting the current time to 0.0 on play to restart sounds.	2017-03-14 14:31:18 -04:00
chrisgarrity	bd21989830	Merge pull request #122 from chrisgarrity/bug/downsample-sounds ... Reduced sound effects to 16-bit for Android compatibility	2017-03-13 14:15:47 -04:00
chrisgarrity	46f77164d8	Reduced sound effects to 16-bit for Android compatibility ... - down sampled all the .wav files - updated plist for free edition to include new required keys for iOS10	2017-03-13 13:56:02 -04:00
chrisgarrity	e9d0d0d7be	Change iOS to use native sound. ... This is after the coding session with Paula - mostly just clean up of obsolete code and leftover debugging output.	2017-03-08 11:16:31 -05:00