Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-10 22:23:07 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
6,336 Commits 15 Branches 59 Tags 3.2 GiB
e59bb87fb6
Commit Graph

6336 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémi Verschelde
e59bb87fb6 Merge pull request #10690 from volzhs/editor-font 
Replace default editor font to NotoSansUI
 2017-08-31 11:50:44 +02:00
Rémi Verschelde
1757ef1d4c Merge pull request #10792 from RandomShaper/fix-android-dbg-pre-21-2.1 
Fix pre-Lollipop Android debug (2.1)
 2017-08-31 11:00:04 +02:00
Juan Linietsky
df173f194f Moved mirror and rotations to the tile mapen, to avoid taking up too much toolbar space, fixes #6461 
(cherry picked from commit dbb6a39722)
 2017-08-30 21:09:08 +02:00
Pedro J. Estébanez
d6d1c55505 Fix pre-Lollipop (21) Android debug 
Namely, automatically pick debug over Wi-Fi for devices with an older release and debug over USB otherwise.

A message is printed both in editor output window and console (uppercase here) to let the user know about what mechanism is being used and why.

Fixes #10458.
 2017-08-30 20:35:42 +02:00
Pedro J. Estébanez
8d49cdcfeb Fix parsing of Android API level 
And renaming the `Device.release` field to `api_level` for correctness.
 2017-08-30 20:12:35 +02:00
Rémi Verschelde
2c60a5560f Merge pull request #10362 from RandomShaper/tilemap-global-mtl-2.1 
Let TileMap apply its material (2.1)
 2017-08-30 16:02:28 +02:00
Rémi Verschelde
f48f6cea06 Revert "Fixed not being able to scroll to eof" 
This reverts commit 802fab11e4,
it was not relevant for the 2.1 branch.

Fixes #10738.
 2017-08-30 15:58:34 +02:00
Rémi Verschelde
01ef7a73de Merge pull request #10681 from cryptonaut/issue9187 
Cleaned up logic in Tween::_tween_process(), fixes #9187
 2017-08-30 12:47:26 +02:00
volzhs
30f4a16cdf Use Noto fonts for Arabic, Hebrew and Thai 2017-08-29 21:01:31 +09:00
volzhs
412afe42e7 Update source code pro font to 2.030 2017-08-29 17:48:41 +09:00
volzhs
110da7f816 Replace default editor font to NotoSansUI 2017-08-29 17:42:55 +09:00
Rémi Verschelde
213ca00e33 Merge pull request #10744 from eon-s/fix-move-and-slide-wall-detection 
Fix wall detection on move_and_slide (2.1).
 2017-08-29 07:46:12 +02:00
eon-s
abad609e1b Fix wall detection on move_and_slide (2.1). 
Fixed a bug on wall detection, now  `is_on_wall/ceiling/floor` methods give the correct results.

Also added floor angle as optional parameter like on the 3.0 counterpart (floor and ceiling share the same parameter).
 2017-08-28 22:35:44 -03:00
Rémi Verschelde
891f6c9b63 Merge pull request #10530 from RandomShaper/remove-old-android-setting-2.1 
Sanitize Android debug (2.1)
 2017-08-29 00:10:31 +02:00
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
cryptonaut
14f806ed9d Cleaned up logic in Tween::_tween_process(), fixes #9187 2017-08-26 22:34:15 -07: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