aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #7060 from volzhs/label-valignRémi Verschelde2016-11-091-3/+3
|\ | | | | Fix Label valign position
| * Fix Label valign positionvolzhs2016-11-071-3/+3
| | | | | | | | Fix #7055
* | Merge pull request #7058 from SPTelur/Add-Missing-LicenseRémi Verschelde2016-11-092-0/+59
|\ \ | |/ |/| Add License Notice for Two Files (A_Star)
| * Some missing License notice has been addedSPTelur2016-11-072-0/+59
|/
* Merge pull request #7053 from Paulb23/caret_blink_redraw_issue_6167George Marques2016-11-062-2/+2
|\ | | | | Caret blink will no longer cause redraw without focus, issue 6167
| * Caret blink will no longer cause redraw without focus, issue 6167Paulb232016-11-062-2/+2
| |
* | Merge pull request #7048 from neikeq/pr-marshals-singletonGeorge Marques2016-11-063-2/+14
|\ \ | |/ |/| Add singleton instance to _Marshalls
| * Core: Add singleton instance to _MarshallsIgnacio Etcheverry2016-11-053-2/+14
| |
* | Merge pull request #7035 from volzhs/undo-redo-duplicateRémi Verschelde2016-11-061-0/+2
|\ \ | | | | | | Prevent to make UndoRedo for duplicate if no selected node
| * | Prevent to make UndoRedo for duplicate if no selected nodevolzhs2016-11-051-0/+2
| | |
* | | Merge pull request #7050 from DTV96Calibre/masterRémi Verschelde2016-11-061-1/+1
|\ \ \ | | | | | | | | Fixed minor typo
| * | | Fixed minor typoDTV96Calibre2016-11-061-1/+1
| | | |
* | | | Merge pull request #7036 from volzhs/spinbox-prefixRémi Verschelde2016-11-061-1/+4
|\ \ \ \ | | | | | | | | | | Fix updating value of SpinBox with prefix
| * | | | Fix updating value of SpinBox with prefixvolzhs2016-11-051-1/+4
| | | | |
* | | | | Merge pull request #7028 from bojidar-bg/gdscript-multiline-comment-fixupRémi Verschelde2016-11-061-1/+10
|\ \ \ \ \ | | | | | | | | | | | | Make GDScript parser ignore floating strings in class definition
| * | | | | Make GDScript parser ignore floating strings in class definitionBojidar Marinov2016-11-031-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #1320
* | | | | | Merge pull request #7026 from SaracenOne/value_track_flag_fixRémi Verschelde2016-11-063-44/+51
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixed flag for importing animation and skipping value tracks.
| * | | | | | Fixed flag for importing animation and skipping value tracks.Saracen2016-11-033-44/+51
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #7020 from akien-mga/pr-readmeRémi Verschelde2016-11-061-15/+51
|\ \ \ \ \ \ | | | | | | | | | | | | | | Rewrite the README to be more descriptive
| * | | | | | Rewrite the README to be more descriptiveRémi Verschelde2016-11-031-15/+51
| | | | | | |
* | | | | | | Merge pull request #7019 from vnen/rename-winrt-uwpRémi Verschelde2016-11-0638-230/+230
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Rename WinRT platform to UWP
| * | | | | | | Rename remaining WinRT references to UWPGeorge Marques2016-11-0318-169/+169
| | | | | | | |
| * | | | | | | Rename WINRT_ENABLED to UWP_ENABLEDGeorge Marques2016-11-0317-30/+30
| | | | | | | |
| * | | | | | | Rename WinRT files to UWPGeorge Marques2016-11-0322-31/+31
| | | | | | | |
* | | | | | | | Merge pull request #7009 from volzhs/fix-double-clickRémi Verschelde2016-11-063-37/+4
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | Fix to focus or rename node by double click
| * | | | | | | Fix to focus or rename node by double clickvolzhs2016-11-013-37/+4
| | | | | | | |
* | | | | | | | Merge pull request #7022 from neikeq/pr-issue-7013Ignacio Etcheverry2016-11-061-0/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Keep groups when replacing nodes
| * | | | | | | | Keep groups when replacing nodesIgnacio Etcheverry2016-11-031-0/+6
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #7045 from pkowal1982/script_create_iconGeorge Marques2016-11-054-2/+98
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | Fix #7016, add script create icon
| * | | | | | | Fix #7016, add script create iconPawel Kowal2016-11-054-2/+98
|/ / / / / / /
* | | | | | | Merge pull request #7033 from akien-mga/pr-server-libsRémi Verschelde2016-11-041-0/+45
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | server: Allow building against system libraries
| * | | | | | | server: Allow building against system librariesRémi Verschelde2016-11-031-0/+45
|/ / / / / / /
* | | | | | | opus: Move public headers to match system installRémi Verschelde2016-11-0310-3/+4
| | | | | | |
* | | | | | | Merge pull request #7032 from ScotFlux/fix_tiny_typoRémi Verschelde2016-11-031-2/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | Fix a tiny typo on label.cpp [ci skip]
| * | | | | | fix a tiny typoScotFlux2016-11-041-2/+2
|/ / / / / /
* | | | | | Merge pull request #7031 from volzhs/fix-wrong-indexRémi Verschelde2016-11-031-12/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix wrong number for ERR_* on comment
| * | | | | | Fix wrong number for ERR_* on commentvolzhs2016-11-041-12/+12
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #7029 from timroes/masterRémi Verschelde2016-11-031-3/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix typos and missing newlines in --help
| * | | | | Fix typos and missing newlines in --helpTim Roes2016-11-031-3/+2
|/ / / / /
* | | | | Merge pull request #7023 from akien-mga/pr-scons-optsRémi Verschelde2016-11-0321-84/+89
|\ \ \ \ \ | | | | | | | | | | | | scons: Reorder options for clarity
| * | | | | scons: Reorder options for clarityRémi Verschelde2016-11-0321-84/+89
| | |_|/ / | |/| | | | | | | | | | | | | Also prefix all thirdparty-related toggles with `builtin`.
* | | | | Merge pull request #7021 from akien-mga/pr-libpng-1.6.26Rémi Verschelde2016-11-0323-1095/+1416
|\ \ \ \ \ | |/ / / / |/| | | | libpng: Update to upstream 1.6.26
| * | | | libpng: Update to upstream 1.6.26Rémi Verschelde2016-11-0223-1095/+1416
|/ / / /
* | | | Merge pull request #7000 from m4nu3lf/masterRémi Verschelde2016-11-022-17/+4
|\ \ \ \ | | | | | | | | | | Fixed Mix nodes in Animation Tree Player
| * | | | Fixed Mix nodes in Animation Tree Playerm4nu3lf2016-10-312-17/+4
| | |/ / | |/| |
* | | | Merge pull request #7004 from volzhs/fix-itemlistRémi Verschelde2016-11-021-1/+4
|\ \ \ \ | | | | | | | | | | Fix to fit stylebox with ItemList
| * | | | Fix to fit stylebox with ItemListvolzhs2016-11-011-1/+4
| |/ / /
* | | | Merge pull request #6958 from RandomShaper/android-clang-tidyRémi Verschelde2016-11-022-91/+109
|\ \ \ \ | | | | | | | | | | Improve Android build (Clang + tidyness)
| * | | | Improve Android build (Clang + tidyness)Pedro J. Estébanez2016-11-021-87/+100
| | | | |
| * | | | Make regex compilable with RTTI disabledPedro J. Estébanez2016-11-011-4/+9
| | | | |