maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
6318 commits 10 branches 35 tags 1.1 GiB
Commit graph

6318 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémi Verschelde b61462268e Revert "Display the Y angle properly when rotating from gizmo, partially helps #1479" 
This reverts commit 641135ba21.
 2017-08-27 18:25:12 +02:00
Rémi Verschelde df70d283d8 Release 2.1.4-stable 2017-08-27 14:39:17 +02:00
Rémi Verschelde 9d598833d2 Use HTTPS URL for Godot's website in the headers 2017-08-27 14:11:45 +02:00
Rémi Verschelde 886c7d82d0 Re-apply clang-format to all files 
Some badly formatted code has managed to pass through our CI...
 2017-08-27 14:11:11 +02:00
Rémi Verschelde f3e302c07c classref: Sync with current source 2017-08-27 13:59:44 +02:00
Rémi Verschelde a9521ef996 Buildsystem: Reduce verbosity of font and translation generation 
(cherry picked from commit 21e53c4267)
 2017-08-27 13:46:16 +02:00
Rémi Verschelde dde0e93af8 Copyright: Various fixes 2017-08-27 13:23:09 +02:00
Rémi Verschelde 23813b4179 stb: Update to upstream stb_truetype 1.17 
Also fix documented OpenSSL version, it was updated to 1.0.2l in
67305d1b0a.

(cherry picked from commit 560fc0f199)
 2017-08-27 13:05:52 +02:00
Rémi Verschelde 765b500c85 libpng: Update to upstream version 1.6.32 
Fixes security vulnerability in our 1.6.31rc01 snapshot.

(cherry picked from commit ee1d0179c5)
 2017-08-27 13:05:12 +02:00
Poommetee Ketson 3629f23d81 Fix double single quotes in connect error print 
(cherry picked from commit 4950ef7478)
 2017-08-27 13:03:38 +02:00
Rémi Verschelde 449ef95c40 Node: Add debug info to add_child reparenting check 
(cherry picked from commit 3c5ce736e6)
 2017-08-27 13:03:05 +02:00
Wilson E. Alvarez 48b85347c6 Free memory when Main::setup returns an error 
(cherry picked from commit bd257153dc)
 2017-08-27 13:02:15 +02:00
Hein-Pieter van Braam 3b9ee55c32 Ignore gprof output files 
When building a profile build it is easy to accidentally create gmon.out
files all over the place. Ignore these so they won't get accidentally
pushed.

(cherry picked from commit aa91640c7e)
 2017-08-27 13:01:09 +02:00
Hein-Pieter van Braam b9e992d803 Ignore Eclipse CDT project files 
Since we have explicit .gitignore rules for QT creator and several other
editor-specific swap/utility files I'd like to add Eclipse CDT projects
also as this is my editor of choice.

(cherry picked from commit 90ab7162e7)
 2017-08-27 13:01:04 +02:00
Fabio Alessandrelli cc9d701658 Allow building fat binaries with osxcross 
(cherry picked from commit d7f08ead4e)
 2017-08-27 13:00:24 +02:00
Andreas Haas f9ad5c3c4f TextEdit: Copy whole line if not having selection. 
The functionality was already there but hidden behind a bogus return statement.
Fixes #10485

(cherry picked from commit 5d25f6397f)
 2017-08-27 12:58:25 +02:00
Hein-Pieter van Braam bec8fd1732 Fix color_ramp indexing negative elements 
The 'pos' variable passed to get_color() and get_offset() can be
negative if the color ramp itself is empty. This causes a lookup in an
empty position in the color Vector which leads to a crash.

We add a check so we never do a lookup in the color Vector if the
gradient is empty.

This fixes #10501

(cherry picked from commit 67b9d6eef2)
 2017-08-27 12:56:05 +02:00
Juan Linietsky e8fb68e038 simplify the way window is allowed to steal focus, no longer relying on project.godot. Closes #9459 
(cherry picked from commit 533014b88c)
 2017-08-27 12:53:45 +02:00
Sipaha a6b160660c Move wait_for_flush out of queue lock 
(cherry picked from commit f6ee4cac39)
 2017-08-27 12:49:09 +02:00
Paulb23 802fab11e4 Fixed not being able to scroll to eof 
(cherry picked from commit a0457341fc)
 2017-08-27 12:48:33 +02:00
Rémi Verschelde 215ce6ab2b Rename "Default" window placement mode to "Top Left" 
It is no longer the default value ;)

(cherry picked from commit 686294e4f2)
 2017-08-27 12:47:52 +02:00
Andreas Haas 8ed6ddd49f SceneTreeEditor: Fix node_selected signal emission. 
Fixes #10131

(cherry picked from commit a80371ce0a)
 2017-08-27 12:46:01 +02:00
Rémi Verschelde 8bbe893319 minizip: Fix compatibility with Gentoo's unique zlib API 
Fixes #10539 in a diplomatic way (as opposed to telling Gentoo users
to just change their distro or rebuild zlib from upstream...).

(cherry picked from commit 67e6c1b735)
 2017-08-27 12:41:52 +02:00
Rémi Verschelde 67a093e844 minizip: Reapply Godot-specific changes for seek support 
I have not assessed whether they are still all relevant.

(cherry picked from commit 53fffa12f1)
 2017-08-27 12:41:00 +02:00
Rémi Verschelde 487684921c minizip: Sync with pristine contrib/minizip from zlib 1.2.4 
Godot-specific changes are undone in this commit, they will be readded
and properly documented in the following commit.

(cherry picked from commit 5681b7b60a)
 2017-08-27 12:40:46 +02:00
Andreas Haas e41b44747c TextEdit: Fix line padding. 
off-by-one error in the line count calculation.

Fixes #10411

(cherry picked from commit 58b2f441a7)
 2017-08-27 12:40:27 +02:00
Rémi Verschelde 5bcfe43a14 Workaround missing WM_TOUCH on mingw-w64 < 4.0 
Upstream bug report: https://sourceforge.net/p/mingw-w64/bugs/460/

(cherry picked from commit 2ed87f33cf)
 2017-08-27 12:36:55 +02:00
Andreas Haas 2ab7a6feb0 TextEdit: Moving between words now works across lines. 
Fixes #10403

(cherry picked from commit 3f2d806b02)
 2017-08-27 12:36:33 +02:00
Juan Linietsky f6575f8d9a Fixes crash related to animatio editor, closes #8687 
(cherry picked from commit cf2fdcb63e)
 2017-08-27 12:26:07 +02:00
Jakub Grzesik da15a1b50d spatial selection if subscene geometry is far from origin 
(cherry picked from commit 78e72c8e79)
 2017-08-27 12:23:09 +02:00
TwistedTwigleg 34263fd39f Exposed create_from_mesh in Navmesh 
(cherry picked from commit deaf095dcf)
 2017-08-27 12:22:37 +02:00
Rémi Verschelde a6805f37d3 Buildsystem: Prevent building X11/server with GCC 6+ 
This is due to a Godot bug which is now fixed in the master branch, but would require
too much work for a short-lived branch such as 2.1. Building release binaries with GCC 6+
will trigger segfaults due to UB when dereferencing pointers with Object::cast_to.

In theory this check should also be made for Windows cross-compilation with MinGW,
but I am more concerned about Linux distros shipping broken binaries than adventurous
cross-compilers hitting a wall.
 2017-08-27 11:11:35 +02:00
Rémi Verschelde cf80fbc95c RtAudio: Restore previous (incorrect but safer) buffer size 
See #10683 for a potential better fix, but this close to the 2.1.4 release
I am taking the safe route.
 2017-08-27 10:12:25 +02:00
George Marques 40a778a709
WinRT: Remove unneeded include 
Fix #10642
 2017-08-25 19:52:20 -03:00
Rémi Verschelde 2656d7c32a Bump version to 2.1.4-rc 2017-08-25 19:27:01 +02:00
Rémi Verschelde 4e2ae2720f doc: Sync with current source 2017-08-25 19:26:30 +02:00
Rémi Verschelde 711259e6c9 Merge pull request #10604 from DrMoriarty/2.1_atlas_packing 
more efficient atlas packing algorithm
 2017-08-25 16:34:09 +02:00
Vasiliy Makarov bbf66945e7 more efficient atlas packing algorithm 2017-08-25 09:57:55 +03:00
elasota 0895f02d87 "On Top" flag for Sprite3D 2017-08-24 23:12:11 +02:00
elasota 91140904cc Fix AtlasTexture + Sprite3D using the wrong UV region 
- Change get_rect_region to return UV region instead of pixel rect
- Fixed atlas texture Sprite3D Y offsets being applied in the wrong direction and fixed Flip not adjusting the geometry.
- Changed get_rect_region name to get_rect_region_uv_rect
 2017-08-24 23:05:49 +02:00
Rémi Verschelde 5164eefdbe Merge pull request #10606 from AlexHolly/fix-dummy-rasterizer 
fix dummy rasterizer
 2017-08-24 15:49:18 +02:00
AlexHolly b18049c2aa fix dummy rasterizer 2017-08-24 15:13:37 +02:00
Rémi Verschelde fb90ac8e48 Merge pull request #10544 from hpvb/fix-10524-2.1 
[2.1] Change order of Null check for ParallaxLayer
 2017-08-22 15:26:18 +02:00
Hein-Pieter van Braam 7d190b61c8 Change order of Null check for ParallaxLayer 
The change in #10524 subtly changes the behavior of set_motion_scale()
and set_motion_offset() if the ParallaxLayer does not have a parent
node. Previously it would still set the corresponding property, but
after this change the property change would be discarded.

I'm not entirely sure if this actually matters as there doesn't appear
to be any code that picks up this change if the ParallaxLayer gets
re-parented later, but it's better to not change behavior regardless.
 2017-08-22 15:17:59 +02:00
Rémi Verschelde 3e397586bb Merge pull request #10521 from RandomShaper/fix-double-parsing-2.1 
Fix tokenization of doubles (2.1)
 2017-08-22 15:03:33 +02:00
Rémi Verschelde 371473db89 Merge pull request #10510 from marcelofg55/osx_window_position_2.1 
Fix y axis for set_window_position on OS X
 2017-08-22 08:10:26 +02:00
Rémi Verschelde 6fab2a6314 Merge pull request #10525 from hpvb/fix-10515-2.1 
[2.1]  Add null check to ParallaxLayer get_parent() calls
 2017-08-22 08:08:33 +02:00
Hein-Pieter van Braam f33e8d7793 [2.1] Add null check to ParallaxLayer get_parent() calls 
This fixes #10515
 2017-08-22 02:14:07 +02:00
Pedro J. Estébanez c97435cfa5 Fix tokenization of doubles 
(cherry picked from commit 6759a28050)
 2017-08-22 00:01:04 +02:00
Marcelo Fernandez e3394fc437 Fix y axis for set_window_position on OS X 2017-08-21 15:36:55 -03:00