summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Merge branch 'github_backend' into developmentGubolin2015-02-240-0/+0
|\ \ \
| * \ \ Merge branch 'master' into github_backendGubolin2015-02-2427-820/+2785
| |\ \ \ | | | |/ | | |/|
* | | | Merge branch 'mobileapp' into developmentGubolin2015-01-242-13/+23
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'master' into mobileappGubolin2015-01-2414-817/+1361
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'mobileapp' of https://github.com/Gubolin/snap into mobileappGubolin2015-01-241-1/+1
| |\ \ \
| | * | | update binary.sh helpv0.1.0-alphaGubolin2015-01-101-1/+1
| * | | | mobile: set orientation to landscape as defaultGubolin2015-01-241-0/+1
| * | | | add the possibility to load binary projects dynamicallyGubolin2015-01-241-12/+20
| * | | | don't include help files in binary projectsGubolin2015-01-241-0/+1
| |/ / /
* | | | Merge branch 'master' of https://github.com/jmoenig/Snap--Build-Your-Own-Bloc...Gubolin2015-01-2414-720/+968
|\ \ \ \ | | |/ / | |/| |
| * | | Update README.mdJens Mönig2015-01-211-1/+1
| * | | Fix speech bubbles of dragged nested spritesjmoenig2015-01-212-5/+8
| * | | Integrated Korean and Catalan translation updatesjmoenig2015-01-214-7/+8
| * | | Merge pull request #703 from bromagosa/contribJens Mönig2015-01-211-19/+53
| |\ \ \
| | * | | updated Catalan translationBernat Romagosa2015-01-211-6/+6
| | * | | updated Catalan translationBernat Romagosa2015-01-161-25/+59
| * | | | Merge pull request #676 from janggoons/masterJens Mönig2015-01-211-98/+394
| |\ \ \ \
| * | | | | Fix Zoom Dialog’s sample background in “flat” designjmoenig2015-01-212-0/+2
| * | | | | Generate ScriptsPaneTexture programmaticallyjmoenig2015-01-216-10/+26
| * | | | | Keep layering of nested sprites thru drag & dropjmoenig2015-01-212-1/+30
| | |/ / / | |/| | |
| * | | | fixed #680jmoenig2015-01-132-1/+15
| * | | | fixed #702jmoenig2015-01-131-8/+10
| * | | | Force Chrome to show GUI messagesjmoenig2015-01-122-0/+7
| * | | | correct threads.js versionjmoenig2015-01-121-1/+1
| * | | | Update historyjmoenig2015-01-121-0/+8
| * | | | Italian translation update, thanks, Alberto Firpo!jmoenig2015-01-122-8/+105
| * | | | Make clones non-editablejmoenig2015-01-121-3/+7
| * | | | Speed up messages received by clonesjmoenig2015-01-121-3/+5
| * | | | Check project for compatibilityjmoenig2015-01-122-23/+49
| * | | | Backend load balancing supportjmoenig2015-01-121-639/+642
* | | | | Merge pull request #677Gubolin2015-01-112-1/+8
|\ \ \ \ \
| * | | | | draw rotation center coordinates near crosshairsJohn2014-12-271-0/+7
| * | | | | indentation fixJohn2014-12-271-1/+1
| * | | | | make 'Obsolete!' label translatable (fix #677)John2014-12-271-1/+1
* | | | | | Ooops, forgot to solve merge conflictGubolin2015-01-111-7/+0
* | | | | | Merge pull request #700Gubolin2015-01-111-1/+1
|\ \ \ \ \ \
| * | | | | | Add ask and answer blocks to the tool spriteMichael Ball2015-01-101-1/+1
| | |/ / / / | |/| | | |
* | | | | | merge mobileappGubolin2015-01-1110-4/+1502
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |