summaryrefslogtreecommitdiff
path: root/objects.js
Commit message (Expand)AuthorAgeFilesLines
* merge upstreamdevelopmentGubolin2015-07-231-8/+11
|\
| * remove some spacesjmoenig2015-06-251-3/+3
| * Merge pull request #826 from bromagosa/contribJens Mönig2015-06-251-1/+4
| |\
| | * fixes #815Bernat Romagosa2015-06-091-1/+4
| * | Revert to "new" for object creationjmoenig2015-06-251-12/+12
| * | Optimize moveBy and friendsNathan Dinsmore2015-06-171-1/+1
| * | Remove clone function (unused)Nathan Dinsmore2015-06-171-1/+1
| * | Use Object.create(…) instead of new …() for inheritance (faster)Nathan Dinsmore2015-06-171-11/+11
| |/
| * Fix encoding for exported sprites (esp. comments)Jens Mönig2015-05-181-2/+2
| * fixed #770Jens Mönig2015-04-151-3/+3
* | Merge branch 'OOP' into developmentGubolin2015-07-011-2/+2
|\ \
| * | Fix encoding for exported sprites (esp. comments)Jens Mönig2015-05-181-2/+2
* | | merge upstreamGubolin2015-05-061-3/+68
|\| |
| * | OOP: Prototypal inheritance of sprite-local custom blocks (palette only)Jens Mönig2015-04-171-2/+44
| * | fixed #770Jens Mönig2015-04-151-3/+26
* | | Merge branch 'mobileapp' into developmentGubolin2015-03-241-16/+0
|\ \ \
| * \ \ Merge branch 'master' into mobileappGubolin2015-03-011-17/+72
| |\ \ \ | | | |/ | | |/|
| * | | remove language and location blocksGubolin2015-03-011-16/+0
* | | | merge branch p2pGubolin2015-03-241-45/+1
|\ \ \ \
| * | | | create one peer per IDEp2pGubolin2015-03-201-32/+1
| * | | | solve connection issuesGubolin2015-03-081-10/+4
| * | | | another attempt to fix disconnect issuesGubolin2015-03-081-9/+4
| * | | | destroy old peers properlyGubolin2015-03-081-5/+3
* | | | | merge branch OOPGubolin2015-03-241-29/+213
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | tweak inherited variable watcher slider deserializationJens Mönig2015-03-241-11/+13
| * | | | OOP: Fix variable watcher slider functionalityJens Mönig2015-03-231-1/+5
| * | | | OOP: Tweaks for scope conflicts when adding / removing varsJens Mönig2015-03-231-16/+22
| * | | | Prototypal inheritance of sprite-local variablesJens Mönig2015-03-211-17/+189
| | |_|/ | |/| |
* | | | Merge branch p2p into developmentGubolin2015-03-081-0/+128
|\ \ \ \ | | |/ / | |/| |
| * | | fix localization bug; accept lists as peer message receiverGubolin2015-03-081-4/+4
| * | | rewrite peering flow; add peer id blocksGubolin2015-03-081-59/+83
| * | | 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-061-0/+79
| |/ /
* | | mergeGubolin2015-03-011-17/+72
|\| |
| * | slightly optimize warped / turbo executionJens Mönig2015-02-281-6/+9
| * | fix a bug in the automatic block migration mechanismjmoenig2015-02-231-2/+2
| * | Add user-interaction choices to the “When I am ...” hat blockjmoenig2015-02-231-11/+63
* | | mergeGubolin2015-02-241-2/+2
|\ \ \ | | |/ | |/|
| * | mergeGubolin2015-02-221-2/+2
| |\|
| | * Fixed #710jmoenig2015-01-281-2/+2
| * | Merge branch 'master' into mobileappGubolin2015-01-241-7/+38
| |\|
* | | Merge branch 'master' of https://github.com/jmoenig/Snap--Build-Your-Own-Bloc...Gubolin2015-01-241-7/+38
|\ \ \ | | |/ | |/|
| * | Fix speech bubbles of dragged nested spritesjmoenig2015-01-211-5/+7
| * | Keep layering of nested sprites thru drag & dropjmoenig2015-01-211-1/+26
| * | Make clones non-editablejmoenig2015-01-121-3/+7
* | | merge mobileappGubolin2015-01-111-0/+52
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' into mobileappGubolin2015-01-081-2/+25
| |\|
| * | merge upstreamGubolin2015-01-031-45/+99
| |\ \
| * | | remove file blocksGubolin2015-01-031-44/+0