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

6069 commits

This branch
This branch
All branches
Author SHA1 Message Date
volzhs 05443bd5a8 Update freetype to 2.8 2017-06-25 11:16:45 +09:00
Andreas Haas 4b6e43f67e Merge pull request #9341 from GodotExplorer/pr-rich-text-vscroll-type 
Add type statements for RichTextLabel
 2017-06-24 13:24:58 +00:00
geequlim 82224d0b80 Add type statements for RichTextLabel 2017-06-24 14:10:44 +08:00
Rémi Verschelde 1432d575dd Merge pull request #9252 from dumitru-stama/blendfill21 
Added two new methods 'blend_rect_mask' and 'fill'
 2017-06-20 00:38:45 +02:00
Thomas Herzog 2bd3792d6a Merge pull request #8434 from hikari-no-yume/Sprite3D_double_sided_flag 
Add double-sided flag to SpriteBase3D (fixes #8007)
 2017-06-19 23:47:33 +02:00
Rémi Verschelde ba87ef3d12 Merge pull request #9265 from RandomShaper/fix-dbg-regression-2.1 
Fix regression in script debugger (2.1)
 2017-06-19 13:12:32 +02:00
Pedro J. Estébanez 5b4f40666b Fix regression in script debugger 2017-06-19 11:56:16 +02:00
Rémi Verschelde a912ae5762 Merge pull request #9245 from toger5/project_manager_hiDpi 
project manager HiDpi size fix [2.1]
 2017-06-18 20:31:41 +02:00
d 48f8931d48 Added two new methods 'blend_rect_mask' and 'fill' 2017-06-18 10:27:50 -07:00
ageazrael fc27e46af4 Used in the macOS HiDPI options window is too small 
(cherry picked from commit 109ad227d3)
 2017-06-17 16:03:13 -07:00
Rémi Verschelde eeb1d94dc9 Bump version to 2.1.4-beta 2017-06-17 14:05:00 +02:00
aswinmohanme 945f40303a Prevent Editor from hang when importing stl as mesh 
When Importing an stl file into Godot from the import mesh menu, the
editor hangs indefinitely. Since only Obj files are supported, the data
remains unparsed and hence the editor enters an infinte loop.

This commit fixes this issue by exiting the loop when godot has finished
parsing the file, irrespective of whether any meaningful data was
extracted out.

Fixes: #9200
 2017-06-17 12:55:46 +02:00
Rémi Verschelde e17966ca01 Merge pull request #9167 from dumitru-stama/blitalpha 
Added new "blend_rect" method as an alpha-aware blit_rect
 2017-06-17 12:54:15 +02:00
dumitru.stama e99d13c6bc Fixed a blit_rect crash with out-of-bounds coords 2017-06-17 12:53:32 +02:00
Kryptocron cb2697e98e Added option to not save a scene when played. 
(cherry picked from commit 4bee1d98fa)
 2017-06-17 12:53:29 +02:00
Rémi Verschelde f1af9f380b Merge pull request #9119 from pixelpicosean/improve-tileset-convert-shape-offset-2.1 
Subtract body position from shape offset during tileset convert
 2017-06-17 12:52:52 +02:00
Rémi Verschelde ff002ada5d Merge pull request #9022 from RandomShaper/improve-mem-class-2.1 
Remove mutex-locking from non-debug memory routines (2.1)
 2017-06-17 12:45:12 +02:00
Bojidar Marinov 9c44d72b3c Fix EditorFileSystem duplicating root folder in new folders 
Also, add some uninitialized variables into constructors (I like to applease cppcheck).
Also, remove unused md_count.
Fixes #3662.

(cherry picked from commit c89d9720f0)
 2017-06-17 12:31:27 +02:00
Rémi Verschelde bc7ceebc19 Add more recent contributors to AUTHORS 
(cherry picked from commit bd33fd0435)
 2017-06-17 12:31:27 +02:00
Hugo Locurcio db2cb08057 Increase the default perspective camera FOV 
This does not affect existing projects, but will affect newly-created
editor settings and Camera nodes.

(cherry picked from commit cdcc3c919b)
 2017-06-17 12:31:27 +02:00
Martin Capitanio 3213ddd060 Don't append standard ports to the request header. 
Breaks the SSL communication with some servers,
do the same that the other curl, wget, firefox & co clients do.

Fixes #9146

(cherry picked from commit 5cabe5f0fc)
 2017-06-17 12:16:45 +02:00
Fabio Alessandrelli f6f8628ec9 Editor now shows error when debug port is in use 
(cherry picked from commit fc1368bee0)
 2017-06-17 12:09:09 +02:00
Poommetee Ketson f1901d8e3f Fix unsaved scene not running after save 
(cherry picked from commit 6b7021ad90)
 2017-06-17 12:07:27 +02:00
Nuno Donato 575ee17779 Run project after selecting main scene. Fixes #9077 
(cherry picked from commit 1ab0a779d8)
 2017-06-17 12:07:18 +02:00
Nuno Donato ef2a962bad Automatically open new project after creating it in project manager. 
Fixes #9075

(cherry picked from commit 9fd41416a9)
 2017-06-17 12:07:10 +02:00
toger5 e1f4abe062 added grow functions to Rect2 
- grow_individual
 - grow_margin

(cherry picked from commit 66b308925c)
 2017-06-17 12:04:49 +02:00
toger5 314fa89978 project manager, fixed siing of sort button 
(cherry picked from commit c33eff4bf9)
 2017-06-17 12:03:59 +02:00
Poommetee Ketson 44864eb663 About: add contributors list 
(cherry picked from commit db439308e6)
 2017-06-17 12:03:19 +02:00
Poommetee Ketson 0aa6b4aac7 Fix autoplay animation starts from last editor state #8976 
(cherry picked from commit c7ac90c97f)
 2017-06-17 12:00:23 +02:00
Gilles Roudiere cbca1d8343 Formatting CONTRIBUTING.md to 80 colums 
Added a little paragraph about how to contribute to Godot's translations

(cherry picked from commit 4f874e4f8e
and synced with master text)
 2017-06-17 11:58:55 +02:00
Andreas Haas c0747b22c3 X11: Turn warning about not finding cursor theme into verbose output. 
Failing to get the cursor theme should not cause any issues since we're then using the default one anyway.
So I removed the warning and made it a verbose-only print instead, as people tend to mistake it for a real error..
(pretty much like `iCCP: known incorrect sRGB profile` :P)

(cherry picked from commit d6333066fc)
 2017-06-17 11:55:05 +02:00
Rémi Verschelde 75a6e0f65a opus: Update to upstream version 1.1.5 
(cherry picked from commit 47e0e530a9)
 2017-06-17 11:53:19 +02:00
Poommetee Ketson 15ab3804df CreateDialog: fix activating recent item creates node selected in search result 
(cherry picked from commit db64fcdd5f)
 2017-06-17 11:52:45 +02:00
Poommetee Ketson 76955cc187 CreateDialog: select root if search exactly match 
(cherry picked from commit 9fb90d7aea)
 2017-06-17 11:52:23 +02:00
Rémi Verschelde 1fea09bfeb openssl: Sync with upstream 1.0.2l 
(cherry picked from commit 67305d1b0a)
 2017-06-17 11:51:29 +02:00
Rémi Verschelde 22e1512638 openssl: Reapply necessary WinRT changes from patch 
(cherry picked from commit 996f1ae29e)
 2017-06-17 11:51:28 +02:00
Rémi Verschelde b5d200898e openssl: Define WIN32_LEAN_AND_MEAN on Windows 
This avoids namespace collisions with things such as X509_NAME.
Also force include of necessary definitions in `crypto/o_str.c`
which seem missing on MSVC (but work on MinGW).

(cherry picked from commit c1b0662b40)
 2017-06-17 11:51:28 +02:00
Rémi Verschelde c2e022c7c9 openssl: Sync with pristine upstream 1.0.2h 
Our necessary custom changes will be reapplied in later commits for clarity,
and saved as patches for future updates.

(cherry picked from commit cb0f771aaa)
 2017-06-17 11:51:28 +02:00
Rémi Verschelde 8301137b38 openssl: Document update process and delete unused files 
(cherry picked from commit 022541d917)
 2017-06-17 11:51:28 +02:00
Rémi Verschelde c4a0679776 Merge pull request #8948 from RandomShaper/improve-mobile-builds-2.1 
Improve/harmonize mobile builds (2.1)
 2017-06-17 11:51:17 +02:00
Rémi Verschelde 90a07122c2 Merge pull request #9197 from vnen/fix-wheel-pos 
Fix MouseWheel position on Windows
 2017-06-15 18:24:48 +02:00
George Marques 7174d706aa
Fix MouseWheel position on Windows 2017-06-15 13:18:58 -03:00
Rémi Verschelde 734045667d Merge pull request #9100 from RandomShaper/optimize-2d-lighting-2.1 
Add optimizing AT_LIGHT_PASS builtin to canvas shaders (2.1)
 2017-06-15 15:12:43 +02:00
Rémi Verschelde 8536d21931 Merge pull request #9101 from RandomShaper/filtered-texscreen-2.1 
Add option for filtered texscreen (2.1)
 2017-06-15 13:35:33 +02:00
Rémi Verschelde 89621fee5d Merge pull request #9178 from RandomShaper/fix-touchbutton-2.1 
Fix/improve TouchScreenButton (2.1)
 2017-06-15 12:39:04 +02:00
Pedro J. Estébanez 184ef18420 Add optimizing AT_LIGHT_PASS builtin to canvas shaders 
This one allows for complex shaders paired with a simple lighting shader to skip code that would otherwise be pointlessly (and wastefully) run during the light pass.
You can use `if (AT_LIGHT_PASS) , negated or not, and that will be converted to a preprocessed #if when the shader is compiled.
Depending on your game (number of items and lights), this can be a *significant* performance gain, or at least avoids relying on the driver's optimizing abilities.
 2017-06-15 02:03:25 +02:00
Pedro J. Estébanez 693ebbb807 Fix/improve TouchScreenButton 
- Refactor touch acceptance logic so the same is used whether passby is enabled or not.
- Remove the check for visibility during input handling as it should never fail; instead using now an ERR_FAIL_COND() just in case since we have been checking for that so far.

Fixes #9159.
 2017-06-14 17:13:58 +02:00
Rémi Verschelde a514518aa8 Merge pull request #9172 from StraToN/signals-description 
[2.1] Add Signals descriptions when they exist.

[ci skip]
 2017-06-14 16:13:07 +02:00
Julian Murgia e15162ccc3 Add Signals descriptions when they exist 2017-06-14 15:55:27 +02:00
dumitru.stama 95dcd22b46 Added a new 'blend_rect' method acting as 'blit_rect' with alpha-blending 2017-06-14 00:55:52 -07:00