godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,141 Commits 15 Branches 59 Tags 2.2 GiB
09c4d65b64
Commit Graph

5141 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémi Verschelde
6273ec901f Merge pull request #5902 from 29jm/fix-warnings 
Fix some warnings
 2016-07-25 18:41:25 +02:00
Johan Manuel
a2b8ef6d51 Fix some warnings 2016-07-25 16:46:26 +02:00
Rémi Verschelde
f86176d20b Merge pull request #5900 from bojidar-bg/fix-integer-ranges 
Fix default ranges of the inspector, as well as Range.
 2016-07-25 12:46:10 +02:00
Bojidar Marinov
7dbdfe8dbd
Fix default ranges of the inspector 
Probably closes #3091
(Should apply to Variant::REAL and Variant::INT)
 2016-07-25 12:41:17 +03:00
Rémi Verschelde
29c1a6eb23 Merge pull request #5898 from MarianoGnu/master 
expose bottom panel button to EditorPlugin scripts
 2016-07-25 08:58:58 +02:00
MarianoGNU
23a20791d1 Update documentation. 2016-07-24 18:09:56 -03:00
MarianoGNU
ed094d52a9 expose bottom panel button to EditorPlugin scripts 2016-07-24 16:42:40 -03:00
Juan Linietsky
ab93fd1af9 Add thread support to HTTPRequest, changed assetlib to use it. 2016-07-24 16:09:43 -03:00
Juan Linietsky
85f365bbff shows progress (bytes) on download even if getting chunked content 2016-07-24 14:37:52 -03:00
Rémi Verschelde
991d9394d7 Bump version to 2.1-rc1 2016-07-24 18:17:20 +02:00
Rémi Verschelde
dc3c32b488 Merge pull request #5894 from vnen/windows-set-position 
Avoid changing position when the window is fullscreen
 2016-07-24 17:55:25 +02:00
Rémi Verschelde
f8f3f30248 Merge pull request #5893 from akien-mga/pr-invisible-col 
Fix non-visible col number in text editor
 2016-07-24 17:55:12 +02:00
Juan Linietsky
6b0a810970 Merge pull request #5855 from Alex-doc/fix_velocity_at_pos 
Fix #5854 (get_contact_collider_velocity_at_pos() strange behavior)
 2016-07-24 12:53:07 -03:00
Juan Linietsky
62cdfeaf58 Merge pull request #5881 from neikeq/pr-fix-propagation 
Viewport: Replace obsolete "windows" group calls
 2016-07-24 12:37:59 -03:00
Juan Linietsky
6e3c7fe5fe Merge pull request #5803 from jarfil/issue/origin5695-pr 
Fix tooltips blinking
 2016-07-24 12:37:17 -03:00
Juan Linietsky
0b75f894c3 Merge pull request #5746 from Ovnuniarchos/FileDialogExposed 
Corrections and additions to FileDialog
 2016-07-24 12:36:05 -03:00
Juan Linietsky
c9d0053754 Merge pull request #5524 from pkowal1982/master 
Array has(var value) function
 2016-07-24 12:21:29 -03:00
Juan Linietsky
ba625a14c6 Merge pull request #5447 from RandomShaper/parallax-layer-fix-tidy 
Improve parallax mirroring algorithm
 2016-07-24 12:19:27 -03:00
Juan Linietsky
9213400cd5 Merge pull request #5415 from volzhs/improve-android-payment 
Improve android payment
 2016-07-24 12:18:13 -03:00
Rémi Verschelde
60d9373547 Fix non-visible col number in text editor 
The issue itself cannot be fully fixed due to the changes in 864c0e8,
but this solution makes the bug less likely to happen (it would only
happen with > 5 digits for line or column, and/or a much bigger font.
Could be further refined by taking the configured font into account...

Fixed #5890.
 2016-07-24 17:12:11 +02:00
George Marques
7be70c5a3c
Avoid changing position when the window is fullscreen 2016-07-24 12:07:59 -03:00
Juan Linietsky
bafcabb157 Merge pull request #5832 from Algrin6/patch-1 
Fixes defects in Curve2D and Curve3D
 2016-07-24 11:44:42 -03:00
Ignacio Etcheverry
67640c84eb Viewport: Replace obsolete "windows" group calls 
- Fixes neighbour focusing event propagation not being stopped
 2016-07-24 14:11:30 +02:00
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