aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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 definitionBojidar Marinov2016-11-031-1/+10
* | 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.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 descriptiveRémi Verschelde2016-11-031-15/+51
* | | | Merge pull request #7019 from vnen/rename-winrt-uwpRémi Verschelde2016-11-0638-230/+230
|\ \ \ \
| * | | | 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 clickvolzhs2016-11-013-37/+4
* | | | | | Merge pull request #7022 from neikeq/pr-issue-7013Ignacio Etcheverry2016-11-061-0/+6
|\ \ \ \ \ \
| * | | | | | 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 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 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 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 commentvolzhs2016-11-041-12/+12
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #7029 from timroes/masterRémi Verschelde2016-11-031-3/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | 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 clarityRémi Verschelde2016-11-0321-84/+89
| | |_|/ / | |/| | |
* | | | | Merge pull request #7021 from akien-mga/pr-libpng-1.6.26Rémi Verschelde2016-11-0323-1095/+1416
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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 Playerm4nu3lf2016-10-312-17/+4
| | |/ / | |/| |
* | | | Merge pull request #7004 from volzhs/fix-itemlistRémi Verschelde2016-11-021-1/+4
|\ \ \ \
| * | | | 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)Pedro J. Estébanez2016-11-021-87/+100
| * | | | Make regex compilable with RTTI disabledPedro J. Estébanez2016-11-011-4/+9
* | | | | Merge pull request #6995 from mateka/issue-6934George Marques2016-11-012-3/+39
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Option for detaching script from node (#6934).Mateusz Adamczyk2016-11-012-3/+39
|/ / / /
* | | | Merge pull request #7006 from vnen/fix-ipv6-uwpGeorge Marques2016-11-011-0/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Fix IPv6 linking for UWPGeorge Marques2016-10-311-0/+4
| |/ /
* | | Merge pull request #6985 from akien-mga/python-pep8Rémi Verschelde2016-11-01120-6856/+6779
|\ \ \ | |/ / |/| |
| * | style: Various other PEP8 fixes in Python filesRémi Verschelde2016-11-0125-369/+370
| * | style: Fix PEP8 blank lines issues in Python filesRémi Verschelde2016-11-0153-193/+115
| * | style: Fix PEP8 whitespace issues in Python filesRémi Verschelde2016-11-0193-2293/+2293
| * | style: Start applying PEP8 to Python files, indentation issuesRémi Verschelde2016-11-0188-6280/+6280
|/ /
* | Merge pull request #6994 from eska014/wasmRémi Verschelde2016-10-314-32/+30
|\ \
| * | Add option 'wasm' to compile to WebAssembly in web exporteska2016-10-314-32/+30
|/ /
* | Merge pull request #6993 from eska014/remove-js-compressionRémi Verschelde2016-10-311-8/+1
|\ \
| * | Remove JavaScript compilation option `compress`.eska2016-10-211-8/+1
* | | Merge pull request #6981 from Faless/ipv6_fixRémi Verschelde2016-10-3118-47/+144
|\ \ \