Commit graph

6158 commits

Author SHA1 Message Date
George Marques
88b00cb658 Merge pull request #7048 from neikeq/pr-marshals-singleton
Add singleton instance to _Marshalls
2016-11-06 13:34:18 -02:00
Paulb23
7b036a94bf Caret blink will no longer cause redraw without focus, issue 6167 2016-11-06 14:15:59 +00:00
Paulb23
0e2c15e91a Made background and symbol color follow the color API 2016-11-06 13:50:23 +00:00
Rémi Verschelde
a4570cb461 Merge pull request #7035 from volzhs/undo-redo-duplicate
Prevent to make UndoRedo for duplicate if no selected node
2016-11-06 12:09:49 +01:00
Rémi Verschelde
9f7b781657 Merge pull request #7050 from DTV96Calibre/master
Fixed minor typo
2016-11-06 12:09:40 +01:00
Rémi Verschelde
c099b32b6c Merge pull request #7036 from volzhs/spinbox-prefix
Fix updating value of SpinBox with prefix
2016-11-06 12:07:54 +01:00
Rémi Verschelde
57cc953cff Merge pull request #7028 from bojidar-bg/gdscript-multiline-comment-fixup
Make GDScript parser ignore floating strings in class definition
2016-11-06 12:07:02 +01:00
Rémi Verschelde
415f5a7cfe Merge pull request #7026 from SaracenOne/value_track_flag_fix
Fixed flag for importing animation and skipping value tracks.
2016-11-06 12:04:04 +01:00
Rémi Verschelde
a3724b596d Merge pull request #7020 from akien-mga/pr-readme
Rewrite the README to be more descriptive
2016-11-06 12:03:28 +01:00
Rémi Verschelde
be4eff1d8b Merge pull request #7019 from vnen/rename-winrt-uwp
Rename WinRT platform to UWP
2016-11-06 12:03:10 +01:00
Rémi Verschelde
20a33e809e Merge pull request #7009 from volzhs/fix-double-click
Fix to focus or rename node by double click
2016-11-06 12:02:51 +01:00
DTV96Calibre
37098419c5 Fixed minor typo 2016-11-06 01:38:41 -05:00
Ignacio Etcheverry
d76f622c92 Merge pull request #7022 from neikeq/pr-issue-7013
Keep groups when replacing nodes
2016-11-06 02:00:21 +01:00
George Marques
79e8c7fc0d Merge pull request #7045 from pkowal1982/script_create_icon
Fix #7016, add script create icon
2016-11-05 17:57:20 -02:00
Pawel Kowal
544194053a Fix #7016, add script create icon 2016-11-05 18:20:59 +01:00
Ignacio Etcheverry
6d6d9bc7f9 Core: Add singleton instance to _Marshalls 2016-11-05 17:13:04 +01:00
Pedro J. Estébanez
0e1972aa51 Clean/fix triangulation internals
Drop unused variable
Remove commented-out code
Fix leak by using Vector instead of raw memory
2016-11-05 10:16:44 +01:00
volzhs
80b6507071 Fix updating value of SpinBox with prefix 2016-11-05 02:34:19 +09:00
volzhs
d82928eb49 Prevent to make UndoRedo for duplicate if no selected node 2016-11-05 00:52:53 +09:00
Rémi Verschelde
90519b295c Merge pull request #7033 from akien-mga/pr-server-libs
server: Allow building against system libraries
2016-11-04 16:21:43 +01:00
Rémi Verschelde
5e360fe178 server: Allow building against system libraries 2016-11-03 22:53:18 +01:00
Rémi Verschelde
611a94e3a6 opus: Move public headers to match system install 2016-11-03 21:18:23 +01:00
Rémi Verschelde
f0b7162177 Merge pull request #7032 from ScotFlux/fix_tiny_typo
Fix a tiny typo on label.cpp
[ci skip]
2016-11-03 20:07:32 +01:00
ScotFlux
8639d6e806 fix a tiny typo 2016-11-04 01:50:21 +06:00
Rémi Verschelde
ab9fa604d1 Rewrite the README to be more descriptive 2016-11-03 19:29:31 +01:00
George Marques
411faaa6f4
Rename remaining WinRT references to UWP 2016-11-03 14:51:08 -02:00
George Marques
b113c7b7a3
Rename WINRT_ENABLED to UWP_ENABLED 2016-11-03 14:51:08 -02:00
George Marques
fb5a73a39f
Rename WinRT files to UWP 2016-11-03 14:51:08 -02:00
Rémi Verschelde
69932149bb Merge pull request #7031 from volzhs/fix-wrong-index
Fix wrong number for ERR_* on comment
2016-11-03 17:03:23 +01:00
volzhs
42f2380190 Fix wrong number for ERR_* on comment 2016-11-04 00:57:34 +09:00
Rémi Verschelde
a262524a43 Merge pull request #7029 from timroes/master
Fix typos and missing newlines in --help
2016-11-03 16:31:59 +01:00
Tim Roes
c34aa331ec Fix typos and missing newlines in --help 2016-11-03 16:27:40 +01:00
Keetz
2afcbc4b1f Fix scene tree drag & drop places node as child (#6912) 2016-11-03 13:59:36 +01:00
Bojidar Marinov
074bcb2a7b
Make GDScript parser ignore floating strings in class definition
Fixes #1320
2016-11-03 12:26:38 +02:00
Saracen
0063471edd Fixed flag for importing animation and skipping value tracks. 2016-11-03 08:45:35 +00:00
Rémi Verschelde
0cc8a641ce Merge pull request #7023 from akien-mga/pr-scons-opts
scons: Reorder options for clarity
2016-11-03 08:35:57 +01:00
Rémi Verschelde
9548faf998 Merge pull request #7021 from akien-mga/pr-libpng-1.6.26
libpng: Update to upstream 1.6.26
2016-11-03 08:33:45 +01:00
Rémi Verschelde
cc95d4448c scons: Reorder options for clarity
Also prefix all thirdparty-related toggles with `builtin`.
2016-11-03 07:45:08 +01:00
Ignacio Etcheverry
305956bf70 Keep groups when replacing nodes 2016-11-03 00:19:32 +01:00
Rémi Verschelde
7504a85e5a libpng: Update to upstream 1.6.26 2016-11-02 23:25:39 +01:00
Rémi Verschelde
cc54189911 Merge pull request #7000 from m4nu3lf/master
Fixed Mix nodes in Animation Tree Player
2016-11-02 22:12:47 +01:00
Rémi Verschelde
6abe49f88d Merge pull request #7004 from volzhs/fix-itemlist
Fix to fit stylebox with ItemList
2016-11-02 22:10:30 +01:00
Rémi Verschelde
218c258f2a Merge pull request #6958 from RandomShaper/android-clang-tidy
Improve Android build (Clang + tidyness)
2016-11-02 20:29:45 +01:00
Pedro J. Estébanez
b18ff942be Improve Android build (Clang + tidyness) 2016-11-02 10:54:51 +01:00
George Marques
20dd5a62cf Merge pull request #6995 from mateka/issue-6934
Option for detaching script from node (#6934).
2016-11-01 22:29:11 -02:00
Mateusz Adamczyk
ce5200b30e Option for detaching script from node (#6934). 2016-11-01 22:49:01 +01:00
Pedro J. Estébanez
f935d7ab0e Make regex compilable with RTTI disabled 2016-11-01 19:16:46 +01:00
George Marques
3958171a7a Merge pull request #7006 from vnen/fix-ipv6-uwp
Fix IPv6 linking for UWP
2016-11-01 12:39:45 -02:00
volzhs
fd9aebd4fa Fix to focus or rename node by double click 2016-11-01 22:26:29 +09:00
George Marques
4160b3c9fe
Fix IPv6 linking for UWP 2016-10-31 21:39:45 -02:00