summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* | mergeGubolin2015-03-0110-39/+171
|\|
| * fixed #716Jens Mönig2015-02-282-2/+3
| * fixed #715Jens Mönig2015-02-282-3/+4
| * slightly optimize warped / turbo executionJens Mönig2015-02-282-6/+10
| * Cache inputs - accelerate recursive reportersJens Mönig2015-02-284-7/+42
| * fixed #725Jens Mönig2015-02-242-2/+10
| * fix a bug in the automatic block migration mechanismjmoenig2015-02-231-2/+2
| * Avoid incompatibility warning for very old (pre-earmarked) projectsjmoenig2015-02-232-2/+3
| * Update German translationjmoenig2015-02-234-10/+26
| * Add user-interaction choices to the “When I am ...” hat blockjmoenig2015-02-233-12/+78
* | mergeGubolin2015-02-241-1/+1
* | mergeGubolin2015-02-2410-59/+4049
|\ \
| * | fix mobile.sh typo and add better info messagesv0.1.1-alpha-androidGubolin2015-02-222-12/+15
| * | use another approach for loading projects at startup; remove more unneeded filesGubolin2015-02-221-26/+12
| * | update to allow building with crosswalkGubolin2015-02-222-7/+37
| * | mergeGubolin2015-02-228-20/+3991
| |\|
| | * Make “project data in URLs” a hidden dev optionjmoenig2015-02-202-6/+38
| | * Update German translationjmoenig2015-02-203-2/+8
| | * Un-hide “Save to disk” featurejmoenig2015-02-201-9/+6
| | * Malayam, Tamil and Telagu translations, thanks, Vinay Kumar!!jmoenig2015-02-205-1/+3888
| | * Added url switch #cloud: to open a shared project in edit modejmoenig2015-02-062-1/+46
| | * Fixed #710jmoenig2015-01-282-2/+6