summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | merge upstreamGubolin2015-05-067-17/+137
|\| | | | | |
| * | | | | | update historyJens Mönig2015-05-011-0/+8
| * | | | | | parameters for embedding projectsJens Mönig2015-05-011-2/+15
| * | | | | | hide “save to disk” option behind shift-click again (has issues in Chrome)Jens Mönig2015-05-011-7/+10
| * | | | | | return empty string when querying first letter of a listJens Mönig2015-05-011-1/+4
| * | | | | | indicate numeric inputs in the block prototype with the # signJens Mönig2015-05-011-2/+8
| * | | | | | select all text when first clicking an input slotJens Mönig2015-05-011-1/+10
| * | | | | | Morphic: event hook for first mouse click on editable textJens Mönig2015-05-011-1/+4
| * | | | | | OOP: Prototypal inheritance of sprite-local custom blocks (palette only)Jens Mönig2015-04-172-2/+48
| * | | | | | fixed #770Jens Mönig2015-04-152-4/+27
| * | | | | | flush Stage>>keysPressed when prompting the userJens Mönig2015-04-152-1/+7
* | | | | | | Merge OOPGubolin2015-04-012-2/+5
|\| | | | | |
| * | | | | | OOP: integrated and adjusted fix for #752 and #745Jens Mönig2015-03-252-4/+20
* | | | | | | Merge masterGubolin2015-04-012-4/+17
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | fixed #752 and #745Jens Mönig2015-03-252-6/+19
* | | | | | | Merge branch 'mobileapp' into developmentGubolin2015-03-246-1220/+14
|\ \ \ \ \ \ \
| * | | | | | | support cloud projectsmobileappGubolin2015-03-041-5/+13
| * | | | | | | drop "binary mode" support (too difficult to mantain)Gubolin2015-03-042-1108/+4
| * | | | | | | I just lost my git repository the second time.Gubolin2015-03-041-2/+0
| * | | | | | | Merge branch 'master' into mobileappGubolin2015-03-042-1/+15
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into mobileappGubolin2015-03-0110-39/+171
| |\ \ \ \ \ \ \ \
| * | | | | | | | | remove language and location blocksGubolin2015-03-014-108/+0
* | | | | | | | | | merge branch p2pGubolin2015-03-243-53/+43
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | create one peer per IDEp2pGubolin2015-03-203-40/+38
| * | | | | | | | | | solve connection issuesGubolin2015-03-081-10/+4
| * | | | | | | | | | another attempt to fix disconnect issuesGubolin2015-03-082-13/+6
| * | | | | | | | | | destroy old peers properlyGubolin2015-03-081-5/+3
| * | | | | | | | | | speed up connections to selfGubolin2015-03-081-2/+8
* | | | | | | | | | | merge branch OOPGubolin2015-03-249-85/+405
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | tweak inherited variable watcher slider deserializationJens Mönig2015-03-244-22/+28
| * | | | | | | | | | fix (part of) "show variable" primitive for inheritanceJens Mönig2015-03-231-1/+1
| * | | | | | | | | | OOP: Fix variable watcher slider functionalityJens Mönig2015-03-231-1/+5
| * | | | | | | | | | OOP: Tweaks for scope conflicts when adding / removing varsJens Mönig2015-03-234-21/+59
| * | | | | | | | | | Prototypal inheritance of sprite-local variablesJens Mönig2015-03-219-63/+335
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'master' into developmentGubolin2015-03-205-20/+30
|\| | | | | | | | |
| * | | | | | | | | switch from beta to release candidateJens Mönig2015-03-153-3/+4
| * | | | | | | | | fixed #743Jens Mönig2015-03-152-2/+7
| * | | | | | | | | Only enable input caching for blocksJens Mönig2015-03-092-13/+6
| * | | | | | | | | fixed #738Jens Mönig2015-03-092-3/+14
* | | | | | | | | | Merge remote-tracking branch 'upstream/master' into developmentGubolin2015-03-082-2/+30
|\| | | | | | | | |
| * | | | | | | | | fixed #736Jens Mönig2015-03-062-2/+30
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch p2p into developmentGubolin2015-03-086-0/+2904
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | fix localization bug; accept lists as peer message receiverGubolin2015-03-082-4/+13
| * | | | | | | | translate peer blocksGubolin2015-03-081-0/+13
| * | | | | | | | rewrite peering flow; add peer id blocksGubolin2015-03-083-59/+126
| * | | | | | | | add Todo with workaroundGubolin2015-03-071-0/+6
| * | | | | | | | send lists and blocks via "send"Gubolin2015-03-071-4/+23
| * | | | | | | | first working version of p2p cloud variablesGubolin2015-03-063-0/+2791
| |/ / / / / / /
* | | | | | | | Merge branch 'master' into developmentGubolin2015-03-042-1/+15
|\| | | | | | |
| * | | | | | | fixed #730Jens Mönig2015-03-022-1/+15
| | |/ / / / / | |/| | | | |