scratchfoundation/scratch-html5
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-html5.git synced 2024-12-02 20:07:09 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
63 commits 1 branch 0 tags 2 MiB
Commit graph

63 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nathan Dinsmore
5cacaa8e1e Fixed focus outline on project ID field 2013-11-16 01:12:46 -05:00
Nathan Dinsmore
0e062e7669 Merge github.com:djdolphin/scratch-html5 into test 
Also improved filter performance, fixed edge cases, and implemented stage filters for color, brightness, and ghost.

Conflicts:
	js/Runtime.js
	js/Sprite.js
    js/primitives/LooksPrims.js

Tested with:
	http://scratch.mit.edu/projects/14315832/
 2013-11-14 23:46:19 -05:00
Nathan Dinsmore
e3f10142a9 Fixed height of watchers on empty strings 2013-11-14 23:15:02 -05:00
Nathan Dinsmore
e74d03cb97 Fixed timer precision 2013-11-14 23:12:36 -05:00
Nathan Dinsmore
6c31987bbf Removed toFixed 2013-11-14 23:04:00 -05:00
Nathan Dinsmore
5c204b3774 Changed watcher behavior to be consistent with Flash player 
Tested with:
  http://scratch.mit.edu/projects/14315470/
 2013-11-14 23:02:16 -05:00
Nathan Dinsmore
07415badbe Merge branch 'master' of github.com:MathWizz/scratch-html5 into test 
Conflicts:
	js/Interpreter.js
	js/primitives/LooksPrims.js
	js/primitives/MotionAndPenPrims.js
	js/primitives/Primitives.js
	js/primitives/SoundPrims.js
	js/primitives/VarListPrims.js

Tested with:
  http://scratch.mit.edu/projects/13841687/
  http://scratch.mit.edu/projects/2192048/
 2013-11-14 22:27:52 -05:00
Shane M. Clements
27c277bf3c Merge pull request #37 from nathandinsmore/new-theme 
Updated theme to be more like the Flash player
 2013-11-14 18:47:36 -08:00
Nathan Dinsmore
f115c42b52 Prefixed 2013-11-14 20:21:04 -05:00
Nathan Dinsmore
c4b2652c12 Updated theme to be more like the Flash player 
Also:
- The project input field now allows pasting of URLs
- The overlay cannot be clicked while the project is loading
 2013-11-14 20:12:42 -05:00
Shane M. Clements
d302a6234c Merge pull request #33 from ipedrazas/master 
Fixed the error 'createGainNode is not a function'
 2013-11-12 09:49:11 -08:00
djdolphin
9f98f7ffb8 Fixed mistake in code 2013-11-05 20:59:48 -05:00
Ivan Pedrazas
a206f6ef86 Fixed the error 'createGainNode is not a function' with Firefox. createGainNode has been replaced with createGain 2013-11-05 23:00:19 +00:00
Shane M. Clements
01e38ecfc7 Merge pull request #29 from Hardmath123/master 
Cleaner UI
 2013-11-05 09:15:24 -08:00
Hardmath123
a0c414dbac Fixed conflicts, ready to merge. 2013-11-04 20:18:47 -08:00
Hardmath123
2786143669 Fixed clicking bug and added changes to the COMPARE page. 2013-11-04 18:52:33 -08:00
Shane M. Clements
fd3aa5a679 Merge pull request #30 from Scimonster/list-watchers 
List watchers
 2013-11-04 14:39:56 -08:00
Scimonster
d0b9f61494 Some list watcher style changes. 2013-11-04 23:06:54 +02:00
Scimonster
01c35969d0 Add show/hide list blocks, fix list reporters, and fix show/hide var (issue was with multiple sprites having same local variable name). 2013-11-04 22:28:23 +02:00
MathWizz
2bc7a4afc0 Fixed Interpreter.boolarg incorrectly checking strings 2013-11-04 12:35:43 -06:00
Shane M. Clements
374c3ccf19 Fixed look of the green flag over the HTML5 player. Moved some styles into compare.css from compare.html. Implemented debug logs for Javascript and Actionscript to compare the operation of both virtual machines. Moved start and stop buttons above the players. 2013-11-04 06:11:05 +00:00
Hardmath123
26ee03976a Removed node stuff 2013-11-03 19:31:41 -08:00
Hardmath123
45adfecb30 4 space indentation 2013-11-03 19:30:34 -08:00
Shane M. Clements
b2644c0365 Added guidelines for contributing code 2013-11-03 19:49:55 -07:00
Hardmath123
5dee692345 Autoprefixed css. 2013-11-03 18:46:05 -08:00
Hardmath123
4d16d6b268 Whoops--removed some of my junk... 2013-11-03 17:59:42 -08:00
Hardmath123
ae86e1d43b Some final touch-ups 2013-11-03 17:57:46 -08:00
Scimonster
ba40cd3396 Merge branch 'LLK/master' 2013-11-03 18:01:50 +02:00
Scimonster
2d07f95c55 Fixed scrolling. 2013-11-03 17:47:32 +02:00
djdolphin
c40c1b4027 Removed evil evals 
Filters now reset when the stop button is clicked.
 2013-11-03 07:10:45 -05:00
Hardmath123
7866a108af Unicode arrow glyphs 2013-11-02 16:32:58 -07:00
Hardmath123
bcbfd4f718 Initial css changes 2013-11-02 16:00:36 -07:00
djdolphin
64535641fc Fixed Safari Bug 2013-11-02 18:50:26 -04:00
djdolphin
fc0e2f4218 Delete .DS_Store 2013-11-02 18:21:31 -04:00
djdolphin
9177ecfe9b Delete .DS_Store 2013-11-02 18:21:24 -04:00
djdolphin
294342f115 Delete .DS_Store 2013-11-02 18:21:07 -04:00
djdolphin
422da2fd87 Added color and brightness effects 2013-11-02 18:16:18 -04:00
Shane M. Clements
9a368d679f Merge pull request #23 from nathandinsmore/formatting 
Formatting and indentation fixes
 2013-11-02 09:44:15 -07:00
djdolphin
6bd32857be Partially implemented filter effects 
Implemented ghost effect
 2013-11-02 10:19:44 -04:00
MathWizz
68bbfc962a Removed debugger statement 2013-11-02 01:58:01 -05:00
MathWizz
2778e0a3fd Corrected casting numbers and fixed blocks under ifs not running 2013-11-02 00:38:29 -05:00
Nathan Dinsmore
1a72b01b31 Formatting and indentation fixes 2013-11-01 23:14:39 -04:00
Amos Blanton
d25c07538a Merge pull request #17 from blob8108/testing-info 
Instructions for running locally in TESTING.md
 2013-11-01 12:24:26 -07:00
Scimonster
896f3c643d Worked more on list watchers - they now scroll mostly, and with a Scratch-style scrollbar. 2013-10-31 10:24:34 +02:00
blob8108
eefa922f26 Move instructions to a separate file 2013-10-30 22:45:50 +00:00
blob8108
f90e551d75 Add Ubuntu installation guide to Readme 2013-10-30 22:43:04 +00:00
Shane M. Clements
73fdd4b7eb Merge pull request #15 from Scimonster/master 
Date/Time blocks (not working on all browsers)
 2013-10-30 13:08:22 -07:00
Scimonster
78220904e2 List watchers will now scroll. 2013-10-30 21:47:46 +02:00
Scimonster
8934e1e577 Start work on List class. I'm not quite sure what i'm doing here, but it seems to work. 2013-10-30 21:16:15 +02:00
Scimonster
dcd0a43348 Merge branch 'LLK/master' 
Replace my timeAndDate code with Shane's.
 2013-10-30 21:01:42 +02:00