Commit graph

5320 commits

Author SHA1 Message Date
Alex Piola
2182ee3270 Merge remote-tracking branch 'origin/fix_velocity_at_pos' into fix_velocity_at_pos 2016-07-24 12:55:50 +02:00
Alex Piola
ffdd9f16dd Fix for incorrect velocity report due to a typo.
Closes #5854
2016-07-24 12:53:07 +02:00
Rémi Verschelde
8fbe804bd1 Merge pull request #5884 from 29jm/fix-crash-graphnode
Fix crash when GraphNode wasn't a child of a Control
2016-07-24 00:37:20 +02:00
Johan Manuel
580b4465c6 Fix crash when GraphNode wasn't a child of a Control 2016-07-24 00:25:32 +02:00
Rémi Verschelde
308d405c31 Turn some prints to error logs, remove others
Fixes #5876 in passing.
2016-07-24 00:02:19 +02:00
Rémi Verschelde
ebefdaa598 Merge pull request #5737 from neikeq/pr-issue-5269
TextEdit: Scroll search results to the center
2016-07-23 22:54:32 +02:00
Rémi Verschelde
990a23e48e Merge pull request #5821 from TheHX/issue-5795
Improved FileSystem dock "Instance" option
2016-07-23 22:53:41 +02:00
Rémi Verschelde
e2644ed188 Merge pull request #5875 from 29jm/fix-warnings
Fix warnings in core/variant_op.cpp
2016-07-23 22:33:46 +02:00
Rémi Verschelde
d248a7d78b Merge pull request #5882 from neikeq/pr-issue-1481
Project Manager: Added project list scrolling with keyboard
2016-07-23 22:32:57 +02:00
Ignacio Etcheverry
761193ecd9 Project Manager: Added project list scrolling with keyboard 2016-07-23 21:37:25 +02:00
Johan Manuel
5d52146ff7 Fix warnings in core/variant_op.cpp
Adds default cases in switches where needed, and replaces '0;' with ';;'
in macro expansions (as suggested by @vnen in #5587).
2016-07-23 14:58:37 +02:00
Juan Linietsky
221cb58382 Add some doc to ImmediateGeometry 2016-07-23 08:58:57 -03:00
Rémi Verschelde
1eefff283a Merge pull request #5872 from akien-mga/pr-libraries-update
Update embedded libraries: rg_etc1 1.04, zlib 1.2.8, RtAudio 4.1.2
2016-07-23 13:54:43 +02:00
Rémi Verschelde
c1ab343f02 RtAudio: Update to upstream version 4.1.2
The only differences we have with the upstream tarball are marked with
`// -GODOT-` comments for clarity. The changes we currently have are
just some defines for cross-platform configuration, and could likely be
moved to the SCons buildsystem (ideally in a sub-environment to avoid
having RtAudio-specific defines pollute the whole build log).

One change for WinRT was not kept, if it is needed it should ideally be
integrated upstream:
```
 #if defined(__WINDOWS_DS__) || defined(__WINDOWS_ASIO__) || defined(__WINDOWS_WASAPI__)
-#ifdef WINRT_ENABLED
-  #define MUTEX_INITIALIZE(A) InitializeCriticalSectionEx(A, 0, 0)
-#else
   #define MUTEX_INITIALIZE(A) InitializeCriticalSection(A)
-#endif
```
2016-07-23 13:25:25 +02:00
Rémi Verschelde
b13f430853 zlib: Update builtin version to upstream 1.2.8
Our only differences to the upstream distribution are:
- The `gz*.c` files are not included
- Z_PREFIX and Z_SOLO are defined in zconf.h
2016-07-23 13:06:54 +02:00
Rémi Verschelde
1d41a070f6 rg_etc1: Upstream version 1.04
From https://github.com/richgel999/rg-etc1
2016-07-23 12:44:40 +02:00
Rémi Verschelde
e7884246eb Merge pull request #5861 from akien-mga/pr-freetype-2.6.5
Upgrade FreeType to upstream version 2.6.5
2016-07-23 12:29:43 +02:00
Rémi Verschelde
abee84fe21 Merge pull request #5864 from djrm/new_icons
Modified some icons
2016-07-23 10:25:36 +02:00
Rémi Verschelde
5b12b3997b Merge pull request #5866 from MarianoGnu/master
Prevent crash in TextureRegionEditor. Fixes #5862
2016-07-23 09:50:12 +02:00
MarianoGNU
6622a3d110 Prevent crash in TextureRegionEditor. Fixes #5862 2016-07-22 21:11:12 -03:00
Daniel J. Ramirez
d49600f4a2 Modified some icons 2016-07-22 18:43:35 -05:00
Mariano Javier Suligoy
71c12b5801 Merge pull request #5863 from MarianoGnu/master
Fix pick color from screen. Closes #5853
2016-07-22 20:39:19 -03:00
MarianoGNU
f00e0b589f Fix pick color from screen. Closes #5853 2016-07-22 20:35:12 -03:00
Rémi Verschelde
4d4cb1bfab FreeType: Update to upstream version 2.6.5
The only diffs to the upstream sources are to be found in `include/ft2build.h`
and `include/freetype/config/ftoption.h`.
2016-07-22 23:29:25 +02:00
Rémi Verschelde
b13bbcecc3 FreeType: Remove unnecessary subfolder
Also sort sources alphabetically for clarity.
2016-07-22 22:01:16 +02:00
Rémi Verschelde
6b70676306 FreeType: Reduce diff with upstream 2.5.0 version
The Godot specific changes to ftoption.h are indicated with a
`// -Godot-` comment for clarity.
See #5859 for details.
2016-07-22 21:51:30 +02:00
Rémi Verschelde
5182fe2ef9 Merge pull request #5860 from 29jm/fix-itemlist-separators
Fix ItemList.clear() not removing separators
2016-07-22 17:24:34 +02:00
Johan Manuel
1a1342670e Fix ItemList.clear() not removing separators 2016-07-22 16:45:57 +02:00
Alex Piola
f46f530626 Fix #5854
Fix for #5854
2016-07-22 16:38:16 +02:00
Robert Lewicki
b1df9e016c Fixed ItemList indexing bug while selecting items.
Also added functionality for unselecting items in itemlist while clicking in empty space.
Fixes #5772.
2016-07-22 16:28:37 +02:00
Juan Linietsky
3aeafcae04 Removed support for saving paths as relative, closes #5728
Editor now has good refactoring tools, so this function is mostly obsolete
2016-07-22 10:39:46 -03:00
Juan Linietsky
e4cd01ac8c Make texture parameter optional in begin() of ImmediateGeometry. Closes #5676 and closes #5720 2016-07-22 09:59:56 -03:00
Juan Linietsky
12472534ec Show a warning that an animation must be selected in order to edit it. Avoid copying/pasting if no anim selected. Closes #5799 2016-07-22 09:42:12 -03:00
Juan Linietsky
f51a816253 Set proper line into operators when parsing GDScript, fixes #5822 2016-07-22 09:23:26 -03:00
Rémi Verschelde
51519b5d6b Merge pull request #5851 from 29jm/typo-scroll
Fix typo in ScrollContainer documentation
2016-07-22 13:32:36 +02:00
Johan Manuel
908f585ef6 Fix typo in ScrollContainer documentation 2016-07-22 12:03:10 +02:00
Rémi Verschelde
6072eb878d Merge pull request #5849 from SaracenOne/expose_add_index
SurfaceTool add_index method exposed to scripts.
2016-07-22 08:39:40 +02:00
Rémi Verschelde
c57b992774 Merge pull request #5847 from 29jm/patch-3
Expose virtual keyboard functions to GDScript
2016-07-22 08:39:07 +02:00
Rémi Verschelde
a812e15603 Merge pull request #5846 from leezh/regex_doc
Added examples to RegEx doc #5827
2016-07-22 08:36:04 +02:00
Rémi Verschelde
82d18f4c1c Merge pull request #5845 from hurikhan/x11_cleanup
Code cleanup in platform/x11
2016-07-22 08:35:26 +02:00
Rémi Verschelde
51b03f0bf5 Fix binding for ItemList.sort_items_by_text
Also forces to recompute the cached rect for all items.
Fixes #5799
2016-07-22 08:08:17 +02:00
Saracen
f86b698765 SurfaceTool add_index method exposed to scripts. 2016-07-22 04:52:41 +01:00
Johan Manuel
ec8c6e2c7c Expose virtual keyboard functions to GDScript 2016-07-21 23:58:58 +02:00
Juan Linietsky
93c3c801db properly implement item disabling, fixes #5683 2016-07-21 18:24:56 -03:00
Juan Linietsky
925e5e9f2a Update profiler curves on item toggled, closes #5680 2016-07-21 18:02:43 -03:00
Zher Huei Lee
3dd5ffb48a Added examples to RegEx doc 2016-07-21 22:01:53 +01:00
Mario Schlack
503f9ab9d9 Code cleanup in platform/x11 2016-07-21 21:11:34 +02:00
Rémi Verschelde
2a0dff9ae3 Merge pull request #5842 from hurikhan/x11_request_attention
Implement OS.request_attention() for X11
2016-07-21 20:18:08 +02:00
Mario Schlack
d04ada3973 Implement OS.request_attention() for X11 2016-07-21 19:40:36 +02:00
Rémi Verschelde
b623acb718 Merge pull request #5841 from vnen/fix-windows-wheel
Fix mouse wheel event position on Windows
2016-07-21 17:31:24 +02:00