aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7829 from volzhs/libwebp-0.6.0-2.1Rémi Verschelde2017-02-26139-3705/+10205
|\
| * Update libwebp to 0.6.0volzhs2017-02-18139-3705/+10205
|/
* Godot 2.1 to 3.0 conversion should be more or less finalJuan Linietsky2017-02-154-17/+612
* -WIP Exporter to Godot 3.0, only text scenes (no .scn) and still kind of buggyJuan Linietsky2017-02-1217-66/+2395
* Merge pull request #7756 from volzhs/str-formatRémi Verschelde2017-02-121-6/+9
|\
| * Fix zero padding formattingvolzhs2017-02-081-6/+9
* | Merge pull request #7754 from volzhs/tr-buttonarrayRémi Verschelde2017-02-122-5/+10
|\ \
| * | Translate ButtonArray textvolzhs2017-02-082-5/+10
| |/
* | Merge pull request #7751 from bojidar-bg/sort-scripts-by-path-2.1Rémi Verschelde2017-02-122-4/+49
|\ \
| * | Sort settings for scripts in the editorBojidar Marinov2017-02-072-4/+49
| |/
* | Merge pull request #7750 from Faless/2.1.x_fix_7697Rémi Verschelde2017-02-121-2/+4
|\ \
| * | HTTPClient properly handle partial data in non-blocking modeFabio Alessandrelli2017-02-071-2/+4
| |/
* | Merge pull request #7742 from karroffel/json_parsingRémi Verschelde2017-02-121-2/+2
|\ \
| * | JSON::parse reports errors on open-ended objectsKarroffel2017-02-061-2/+2
* | | Merge pull request #7721 from RandomShaper/improve-touch-button-2.1Rémi Verschelde2017-02-122-85/+56
|\ \ \
| * | | Solve TouchScreenButtons issuesPedro J. Estébanez2017-02-102-85/+56
| | |/ | |/|
* | | Merge pull request #7719 from RandomShaper/backport-code-edit-goodies-2.1Rémi Verschelde2017-02-127-58/+75
|\ \ \
| * | | Backport goodies for the code editorsPedro J. Estébanez2017-02-047-58/+75
| |/ /
* | | Added "Scots" locale name, fixing #7630Nuno Donato2017-02-081-0/+1
* | | Revert "Fixes #7630 Hint was be appending for every language. Changed to on...Rémi Verschelde2017-02-081-1/+4
* | | Merge pull request #7711 from williamd1k0/cherrypick-colorframeRémi Verschelde2017-02-074-0/+60
|\ \ \ | |/ / |/| |
| * | Add ColorFrame control (2.1)William Tumeo2017-02-024-0/+60
|/ /
* | Merge pull request #7678 from volzhs/fix-save-branchRémi Verschelde2017-02-021-0/+7
|\ \
| * | Fix crash when saving root node by "Save Branch as Scene" with unsaved scenevolzhs2017-01-301-0/+7
* | | Merge pull request #7671 from RandomShaper/load-placeholder-dup-2.1Rémi Verschelde2017-02-021-0/+1
|\ \ \
| * | | Replicate load-as-placeholder state on node duplication (2.1)Pedro J. Estébanez2017-01-291-0/+1
* | | | Merge pull request #7660 from zombieCraig/translationfixRémi Verschelde2017-02-021-4/+1
|\ \ \ \
| * | | | Fixes #7630 Hint was be appending for every language. Changed to only fill ...Craig Smith2017-01-271-4/+1
| | |/ / | |/| |
* | | | Merge pull request #7651 from leezh/collada_import_tweaksRémi Verschelde2017-02-021-21/+38
|\ \ \ \
| * | | | Re-Implemented Texture Actions for Scene ImportZher Huei Lee2017-01-261-21/+38
* | | | | Merge pull request #7650 from pkowal1982/fix_7011Rémi Verschelde2017-02-021-2/+2
|\ \ \ \ \
| * | | | | Fix #7011 ScrollContainer takes into account child's EXPAND flag when scrolli...Pawel Kowal2017-01-261-2/+2
| |/ / / /
* | | | | Merge pull request #7641 from RandomShaper/touch-button-shapeRémi Verschelde2017-02-022-3/+78
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add shape property to TouchScreenButtonPedro J. Estébanez2017-01-252-3/+78
| | |/ / | |/| |
* | | | Merge pull request #7646 from RandomShaper/vcs-friendliness-2.1Rémi Verschelde2017-01-256-21/+32
|\ \ \ \
| * | | | Improve .tscn VCSPedro J. Estébanez2017-01-256-21/+32
| |/ / /
* | | | Merge pull request #7639 from volzhs/fix-scrollbar-2d-editor-2.1Rémi Verschelde2017-01-251-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix weird scrollbar appearance on 2D editor (2.1)volzhs2017-01-251-2/+2
* | | | Merge pull request #7632 from RandomShaper/hide-lock-icons-2.1Rémi Verschelde2017-01-252-1/+2
|\ \ \ \
| * | | | 2D Editor: Don't show lock icons for hidden nodes.Andreas Haas2017-01-252-1/+2
* | | | | Merge pull request #7634 from RandomShaper/fs-split-layout-2.1Rémi Verschelde2017-01-252-0/+11
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Include filesystem dock split offset in editor layoutsPedro J. Estébanez2017-01-252-0/+11
|/ / / /
* | | | Merge pull request #7625 from RandomShaper/fix-android-module-resRémi Verschelde2017-01-251-2/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix resources for Android modules not being mergedPedro J. Estébanez2017-01-241-2/+1
| |/ /
* | | Release 2.1.2-stable2.1.2-stableRémi Verschelde2017-01-212-3/+3
* | | classref: Sync with current sourceRémi Verschelde2017-01-211-71/+152
* | | Remove Quick Filter Files and fix FS search hotkeyRémi Verschelde2017-01-215-27/+29
|/ /
* | Merge pull request #7557 from RandomShaper/ordered-image-group-files-2.1Rémi Verschelde2017-01-161-4/+12
|\ \
| * | Make image-groups map in export.cfg orderedPedro J. Estébanez2017-01-161-4/+12
* | | Merge pull request #7561 from eska014/web-presentation-2.1Rémi Verschelde2017-01-161-13/+28
|\ \ \