Commit Graph

18439 Commits

Author SHA1 Message Date
Rémi Verschelde
42a5b7545a
Merge pull request #24791 from humblers/blend-gles2
Change blend equations for GLES2 canvasitems
2019-01-05 20:40:51 +01:00
Rémi Verschelde
c1f6852a6a
Merge pull request #24792 from Paulb23/wrap_zoom_issue_23896
Fix text edit wrapping beyond control size, issue 23896
2019-01-05 18:22:43 +01:00
Paulb23
411df08711 Fix text edit wrapping beyond control size, issue 23896 2019-01-05 16:58:54 +00:00
Daeil Kim
ecf520b70e Change blend equation for canvasitems 2019-01-06 00:57:52 +09:00
Rémi Verschelde
021421e180
Merge pull request #24782 from SoIAS/duplicated_code_24781
Removed duplicated code in animation_track_editor.cpp
2019-01-05 11:29:09 +01:00
Rémi Verschelde
07014864d0
Merge pull request #24778 from Rubonnek/fix-out-of-bounds
Fixed out of bounds axis name access
2019-01-05 10:35:21 +01:00
Wilson E. Alvarez
caf5e92121
Fixed out of bounds axis name access 2019-01-04 19:34:14 -05:00
Dawid Wdowiak
855a82211f Removed duplicated code 2019-01-04 22:18:54 +01:00
Hein-Pieter van Braam
5e6c6f3bb7
Merge pull request #21708 from hpvb/fix-21242v2
String[size()] should return a default constructed CharType
2019-01-04 20:57:22 +01:00
Rémi Verschelde
b6cf37cb57
Merge pull request #24767 from godotengine/revert-24546-fix_blend_tree
Revert "Fix blend tree generating wrong node names"
2019-01-04 19:47:56 +01:00
Rémi Verschelde
495e40cff8
Revert "Fix blend tree generating wrong node names" 2019-01-04 19:45:39 +01:00
Rémi Verschelde
1ba0b2bc0b
Merge pull request #24741 from timoschwarzer/24697-fix-autocomplete-segfault-in-inner-classes
Fix segfault when trying to autocomplete in inner classes
2019-01-04 19:41:24 +01:00
Rémi Verschelde
2c118d754d
Merge pull request #24689 from BrodyEller/master
Fix viewport not updating with make_current() for Camera2D
2019-01-04 19:04:13 +01:00
Hein-Pieter van Braam
ac99ed3cda String[size()] should return a default constructed CharType
As per the C++ standard 21.3.4.1 for std::string:
Returns: If pos < size(), returns data()[pos]. Otherwise, if pos ==
size(), the const version returns charT(). Otherwise, the behavior is
undefined.

Since the behavior is undefined Godot now does the same thing for const
and non-const versions of operator[].

This fixes #21242 and fixes #22221.
2019-01-04 17:48:03 +00:00
Rémi Verschelde
bd6ab5360f
Merge pull request #24592 from volzhs/android-etc
Make possible to use ETC texture format with GLES3 on Android
2019-01-04 16:49:49 +01:00
Rémi Verschelde
5809be9641
Merge pull request #24582 from Xrayez/script-encrypt
Bring back script encryption in export preset
2019-01-04 16:34:38 +01:00
Rémi Verschelde
70de8ca9a9
Merge pull request #24585 from Xrayez/fix-crash-hex-number
Fix crash when checking empty string for valid hex number
2019-01-04 16:19:29 +01:00
Rémi Verschelde
d8f0087dc8
Merge pull request #24568 from Shinryuuji/fix-wrong-texture-array-target
Fix wrong default target for sampler2DArray
2019-01-04 16:14:29 +01:00
Rémi Verschelde
bc9899fb9f
Merge pull request #24504 from harrisyu/AtlasCheckPixelOpaque
Fix #24470 Atlas Texture with margin setting cause error in editor.
2019-01-04 16:11:37 +01:00
Rémi Verschelde
1504c96112
Merge pull request #24539 from BastiaanOlij/override_gl_position
Override GL_position
2019-01-04 15:40:05 +01:00
Rémi Verschelde
99c4faf837
Merge pull request #24575 from nekomatata/android-curve-texture
Fixed CurveTexture with GLES3 on Android
2019-01-04 15:31:08 +01:00
Rémi Verschelde
d54894ffae
Merge pull request #24647 from WindyDarian/gltf_morph_fix
Fix for blend shape incorrectly scaling skinned gltf mesh
2019-01-04 15:21:38 +01:00
Rémi Verschelde
578c6316c8
Merge pull request #24732 from hpvb/vector-pod-optimization
Optimizations for trivial types
2019-01-04 15:09:05 +01:00
Rémi Verschelde
fa5ca1bbf0
Merge pull request #24738 from timoschwarzer/24725-fit-child-in-rect-null-check
Check if p_child is not null in Container.fit_child_rect()
2019-01-04 14:54:57 +01:00
Rémi Verschelde
bdbcf29246
Merge pull request #24754 from guilhermefelipecgs/fix_17374
Update zstd to 1.3.8
2019-01-04 10:13:15 +01:00
Guilherme Felipe
e64391f47b Update zstd to 1.3.8 2019-01-03 22:35:20 -02:00
Hein-Pieter van Braam
b1e3215f3a
Merge pull request #24477 from lupoDharkael/nouveau
Don't enable DRI_PRIME if nouveau is loaded
2019-01-03 23:35:47 +01:00
Timo Schwarzer
a8f367a4b8
Check if p_child is not null in Container.fit_child_rect()
Fixes #24725
2019-01-03 22:33:07 +01:00
Rémi Verschelde
65a86ae17c
Merge pull request #24683 from SoIAS/autocompletion_menu_position_24674
Fixed autocompletion menu vertical position
2019-01-03 21:33:12 +01:00
Rémi Verschelde
1808241d16
Merge pull request #24688 from Supatier/add-additional-vscode-name
Add code-oss, vscode-oss, and visual-studio-code-oss to vscode path
2019-01-03 21:32:41 +01:00
Rémi Verschelde
bea0a579b7
Merge pull request #24748 from timoschwarzer/no-target-fps-in-editor
Don't apply target_fps in editor
2019-01-03 20:38:58 +01:00
Rémi Verschelde
59c5b42076
Merge pull request #24747 from corrigentia/patch-6
Docs: Fix "equal to" and code markup in float.xml
2019-01-03 20:11:49 +01:00
Rémi Verschelde
c82db39cd4
Merge pull request #24746 from timoschwarzer/24745-pathfollow2d-offset
Allow offset and unit_offset to be set higher than one loop
2019-01-03 20:10:58 +01:00
Leon Krause
c0fcf77b38
Merge pull request #24040 from guilhermefelipecgs/implements_custom_mouse_cursor_for_javascript
Implements OS_JavaScript::set_custom_mouse_cursor
2019-01-03 18:24:11 +01:00
Timo Schwarzer
8d79fea969
Don't apply target_fps in editor 2019-01-03 18:22:42 +01:00
corrigentia
fe85e50006
Docs: Fix "equal to" and code markup in float.xml
Docs: Fix "be [equal to](https://www.thefreedictionary.com/equal%20to)" in float.xml. Attempt correction of code snippet markup.
2019-01-03 18:42:25 +02:00
Timo Schwarzer
a1fbef3d60
Allow offset and unit_offset to be set higher than one loop
Fixes #24745
2019-01-03 17:32:20 +01:00
Guilherme Felipe
86d626e9cb Implements OS_JavaScript::set_custom_mouse_cursor 2019-01-03 13:51:16 -02:00
Timo Schwarzer
d77643562b
Fix segfault when trying to autocomplete in inner classes
Fixes #24697
2019-01-03 15:51:34 +01:00
Rémi Verschelde
a58c3fb4b7
Merge pull request #24736 from timoschwarzer/ltex-thumbnails
Add thumbnails to LargeTexture
2019-01-03 14:04:11 +01:00
Rémi Verschelde
6b1c3d6310
Merge pull request #24722 from Calinou/improve-graphedit-line-drawing
Make GraphEdit lines smoother and scale their width on hiDPI displays
2019-01-03 13:47:52 +01:00
Timo Schwarzer
163e0e3ebd
Add thumbnails to LargeTexture 2019-01-03 13:09:25 +01:00
Rémi Verschelde
200be0795d
Merge pull request #24730 from PrestonKnopp/master
escaped '&' in macos osx_tools.app Info.plist
2019-01-03 11:06:51 +01:00
Hein-Pieter van Braam
4240e3d668 Optimizations for trivial types
Relying on various compiler primitives we can reduce the work done
in our memory allocators and CowData. For types with trivial ctors or
dtors we can skip looping over all elements when creating, resizing,
and destroying lists of objects.

These primitives are supported by clang, msvc, and GCC. However, once
we've moved to C++11 we can rely on several std:: primitives that do
the same thing and are standardized.

In my testing the extra conditionals introduced here get removed from
the generated program entirely as the results for these primitives is
known at compile time.
2019-01-03 08:47:34 +01:00
Dawid Wdowiak
615ca1d59e Fixed autocompletion menu vertical position 2019-01-03 07:11:40 +01:00
PrestonKnopp
8adc611bf5 escaped '&' in macos osx_tools.app Info.plist 2019-01-02 18:11:21 -08:00
Hugo Locurcio
574f90605d
Make GraphEdit lines smoother and scale their width on hiDPI displays 2019-01-02 23:29:48 +01:00
Rémi Verschelde
d930c909f2
Merge pull request #24715 from dragmz/patch-4
Fix negative size rectangle drawing in GLES2
2019-01-02 19:42:10 +01:00
Rémi Verschelde
03b8168c2e
Merge pull request #24691 from BlackCatter/line2d-fix
Fix line 2D intersection behavior
2019-01-02 19:39:31 +01:00
Rémi Verschelde
1ff502c5f4
Merge pull request #24712 from Chaosus/script
Improved script attachment/removal buttons behavior a bit
2019-01-02 15:52:36 +01:00