godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,923 Commits 15 Branches 59 Tags 2.2 GiB
6ef0de3f23
Commit Graph

26923 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémi Verschelde
c7c608166d
Merge pull request #38749 from akien-mga/3.2-android-modules-GodotPaymentV3 
Android: Check for use of deprecated GodotPaymentV3 module, direct to new plugin
 2020-05-15 18:02:39 +02:00
Hugo Locurcio
fa279d02f7 Rename the ErrorWarning icon file to match the 3.2 naming scheme 2020-05-15 14:16:46 +02:00
Rémi Verschelde
d45b96d2b1 Android: Check for deprecated GodotPaymentV3 module, direct to new plugin 
Fixes #38581.
 2020-05-15 13:32:30 +02:00
Thakee Nathees
d13f46bc41 shadowed var warning in nested block bug fix 
Fix: #38552
(cherry picked from commit 79eee93b9a)
 2020-05-14 22:01:45 +02:00
Thakee Nathees
40c43da96f set parser error when infer type is null 
(cherry picked from commit 687b1941b4)
 2020-05-14 22:01:26 +02:00
Rémi Verschelde
f5a3d34593
Merge pull request #38734 from lawnjelly/polyline_bug 
GLES2 polyline drawn as GL_LINE_STRIP to match GLES3
 2020-05-14 20:25:19 +02:00
lawnjelly
8005175ea5 GLES2 polyline drawn as GL_LINE_STRIP to match GLES3 
The behaviour of TYPE_POLYLINE appeared incorrect in GLES2, and inconsistent with GLES3 and the docs, which state that draw_polyline 'Draws interconnected line segments'. Also when drawing with triangles GLES2 draws interconnected segments.

This PR simply changes the primitive from GL_LINES to GL_LINE_STRIP as in GLES3.
 2020-05-14 10:38:12 +01:00
Thakee Nathees
e42318e41c regression: var declaration type info parser bug fix 
(cherry picked from commit e5d735851d)
 2020-05-13 16:14:22 +02:00
Thakee Nathees
6d7fb3d322 regression: static func can't access const fix 
(cherry picked from commit e7f056dfac)
 2020-05-13 16:14:08 +02:00
Marcel Admiraal
dd7f9b1c08 Make it clear that PhysicsDirectSpaceState is only available from 
within _physics_process().

(cherry picked from commit bb9c104695)
 2020-05-13 16:13:47 +02:00
Marcel Admiraal
253d211102 Silence EQ::Band::c1, c2 and c3 may be used uninitialized warnings. 
(cherry picked from commit d02143905f)
 2020-05-13 16:12:37 +02:00
Hugo Locurcio
e22cff8ccf Update the editor icons README to remove outdated information 
This closes #38684.

(cherry picked from commit c6afb9f6ea)
 2020-05-13 16:12:22 +02:00
Hugo Locurcio
6692681618 Tweak the error message displayd when a post-import script fails 
See #38662.

(cherry picked from commit 0d7b627936)
 2020-05-13 16:12:03 +02:00
Ashesh3
40d8ed023c Better file naming for AppVeyor artifacts 
This builds upon https://github.com/godotengine/godot/pull/38625 and improves the file name format as mentioned in https://github.com/godotengine/godot/pull/38189#issuecomment-626585363

The resulting file stored has the name `godot.windows.opt.tools.64-$(VERSION_HASH).zip` where `VERSION_HASH` is obtained from `it rev-parse --short=9 HEAD` , the zip file contains the built exe file.

(cherry picked from commit 4f055c93a5)
 2020-05-13 16:11:30 +02:00
etienne.frank
46327d48a2 Fix minimap selection offset 
The minimap selection was shifted of 1 line too late.

(cherry picked from commit 72ab355945)
 2020-05-13 16:10:12 +02:00
Hugo Locurcio
0b6bcf90f5 Rename the editor action "Revert Scene" to "Reload Saved Scene" 
This option can be used to workaround various issues with stuff
not reloading properly when changes are made.
The option was renamed to clarify the fact that it actually
reloads the scene saved on the filesystem.

(cherry picked from commit 2962819d1c)
 2020-05-13 16:09:38 +02:00
Thakee Nathees
72aa9ce7fc range() with non-numeric const argument crash fix 
(cherry picked from commit 3e10392d48)
 2020-05-13 16:08:33 +02:00
Rémi Verschelde
ee7bde231c
Merge pull request #38706 from nathanfranke/fix-rename-sizing 
Fix rename dialog size in 3.2
 2020-05-13 07:19:34 +02:00
Rémi Verschelde
b7ce9ad1bf
Merge pull request #38694 from lawnjelly/kessel_builtins 
GLES2 Batching - Prevent baking colors with COLOR writes
 2020-05-13 07:12:38 +02:00
nathanwfranke
814f72c524
Fix rename dialog size in 3.2 2020-05-12 18:34:00 -05:00
Author Lawnjelly
94ed206bfc GLES2 Batching - Prevent baking colors with COLOR writes 
Writing to COLOR in a custom shader can result in incorrect results if colors are baked (vertex color and modulate). This PR prevents baking with COLOR output, except under the special circumstances that final modulate is (1, 1, 1, 1), in which case the result will be correct. This should still allow color baking in many scenarios with custom shaders.
 2020-05-12 14:04:53 +01:00
Rémi Verschelde
8cb67bb359
Merge pull request #38692 from Calinou/doc-projectsettings-ssl-certificates 
Clarify that the SSL certificate setting overrides the default bundle
 2020-05-12 12:55:19 +02:00
Hugo Locurcio
47d003fbb8 Clarify that the SSL certificate setting overrides the default bundle 
See https://github.com/godotengine/godot-docs/issues/2531.
 2020-05-12 11:52:57 +02:00
Rémi Verschelde
d999e1519c
Merge pull request #38686 from Calinou/doc-tilemap-used-cells-by-index 
Clarify the `id` parameter in `TileMap.get_used_cells_by_id()`
 2020-05-12 09:45:36 +02:00
Hugo Locurcio
e77313b3ed Clarify the id parameter in TileMap.get_used_cells_by_id() 2020-05-12 09:26:38 +02:00
Rémi Verschelde
44c1c5840c
Merge pull request #38674 from madmiraal/fix-physicsw-warning-3.2 
[3.2] Fix 'physicsw' may be used uninitialized warning in csg_shape.cpp
 2020-05-11 21:19:34 +02:00
Rémi Verschelde
499e945da9
Merge pull request #38651 from neikeq/3.2-dotnet-cli-support 
[3.2] C#: Support for building with the dotnet CLI
 2020-05-11 21:17:56 +02:00
Ignacio Etcheverry
3928fe200f [3.2] C#: Support for building with the dotnet CLI 
By adding a reference to the 'Microsoft.NETFramework.ReferenceAssemblies' nuget
package, we can build projects targeting .NET Framework with the dotnet CLI.
By referencing this package we also don't need to install Mono on Linux/macOS
or .NET Framework on Windows, as the assemblies are taken from the package.
 2020-05-11 19:48:50 +02:00
Rémi Verschelde
4b91111acb
Merge pull request #38669 from lawnjelly/kessel_vertex_read 
GLES2 Batching - Fix custom shaders reading VERTEX
 2020-05-11 19:32:37 +02:00
lawnjelly
57c70d8e9c GLES2 Batching - Prevent VERTEX baking within items in custom shaders 
In addition to prevent item joins when VERTEX reads are present in a custom shader, it is also necessary to prevent baking extra matrices (extra transforms) WITHIN items, because these can also report incorrect results.
 2020-05-11 17:18:57 +01:00
lawnjelly
d096ce1644 GLES2 Batching - Fix custom shaders reading VERTEX 
In situations where custom canvas shaders read VERTEX values, they could read incorrect global positions rather than local positions where batching had baked item transforms. This PR prevents joining items that read VERTEX built in in shaders, and thus prevents this situation arising (as unjoined items will not bake transforms).
 2020-05-11 15:54:15 +01:00
Marcel Admiraal
b4302d0d04 Fix 'physicsw' may be used uninitialized warning in csg_shape.cpp 2020-05-11 13:33:20 +01:00
Rémi Verschelde
a9bcd8ba26
Merge pull request #38659 from akien-mga/3.2-cherrypicks 
Cherry-picks for the 3.2 branch (future 3.2.2) - 5th batch
 2020-05-11 12:55:46 +02:00
Rémi Verschelde
8056bdf605
Merge pull request #38658 from bruvzg/wintab_32 
WinTab: Make movement smoother and handle pressure/tilt changes when cursor is not moving [3.2].
 2020-05-11 12:39:45 +02:00
Hugo Locurcio
c1cf8a5068 Tweak the editor log selection color to match the current editor theme 
This overrides the default blue color.

(cherry picked from commit 411af2c750)
 2020-05-11 11:39:35 +02:00
Hugo Locurcio
b1455c68eb Rename the Clear Script editor action to Detach Script 
This makes it more obvious that the script won't be modified
in any way.

See comments in #27813.

(cherry picked from commit 7fc0e38e92)
 2020-05-11 11:38:22 +02:00
Hugo Locurcio
d7f1a43d1a Use a different icon for the debugger tab with both warnings and errors 
This makes it possible to see if both errors and warnings were
pushed without having to open the tab.

(cherry picked from commit 564f8ccc13)
 2020-05-11 11:35:07 +02:00
bruvzg
bd5413e05f
WinTab: Make movement smoother and handle pressure/tilt changes when cursor is not moving [3.2]. 2020-05-11 12:32:15 +03:00
Ashesh
df87ae6eb8 Store build as artifact in appveyor 
7z is already available in path in appveyor
zip the build .exe files and store them ( appveyor retains for ~6 months)

(cherry picked from commit 7ae70625f3)
 2020-05-11 11:25:24 +02:00
Rémi Verschelde
a5a7b1d462 Input: Readd 'Default Android Gamepad' magic binding 
Removed by mistake in #38292 like the Windows `__XINPUT_DEVICE__`,
this magic binding is referenced directly in our code.

(cherry picked from commit 1c61b31109)
 2020-05-11 11:22:21 +02:00
Eduardo Nunes Pereira
55ab98233a Using the common behaviour when use command+shift on text line for osx 
* On press left+command+shift or right+command+shift it should behave like shift+home or shift+end and select the text
* Using home and end events as reference

(cherry picked from commit d8f8a3c606)
 2020-05-11 11:13:22 +02:00
Rémi Verschelde
938a9c95d0 freetype: Update to upstream version 2.10.2 
(cherry picked from commit 9c1b20eab6)
 2020-05-11 11:12:39 +02:00
hoontee
8d0a925419 Re-add __XINPUT_DEVICE__ 
Required for `JoypadWindows::probe_joypads`.
Partially reverts 510e83498e. Fixes #38554.

(cherry picked from commit 9aa29b85a8)
 2020-05-11 11:04:21 +02:00
Eric M
77ef3bb416 Added mapping for KEY_MENU to VK_APPS (0x5d) so context menu's triggered by the keyboard menu button work 
(cherry picked from commit 97e77bcd19)
 2020-05-11 11:04:04 +02:00
Thakee Nathees
7bc293b081 Fix: printing empty string does nothing in editor output pannel 
Fix: #38490
(cherry picked from commit 5640cad1e1)
 2020-05-11 11:02:53 +02:00
JFonS
9828c6bc86 Keep mouse inside 3D viewport rotation widget 
Hide and keep the mouse in place when the user oribts the scene via the 3D
rotation widget.

(cherry picked from commit 051f02a3a0)
 2020-05-11 11:01:13 +02:00
Ignacio Etcheverry
683e19306e Mono: Use msbuild instead of nuget.exe for restoring 
- Make GodotTools output directly to the SCons output directory.
- Removed xbuild_fallback from the build system.

(cherry picked from commit b61ffef0ab)
 2020-05-11 11:01:13 +02:00
Ignacio Etcheverry
34132d2f67 Mono: Fix hot-reloading of nested classes 
(cherry picked from commit e0a001549e)
 2020-05-11 11:01:13 +02:00
Thakee Nathees
7cfbde19c9 Fix: can't convert Transform -> Transform2D 
Fix: #38528
(cherry picked from commit e32cdbe568)
 2020-05-11 11:01:13 +02:00
Thakee Nathees
55b4e0c44a parser error for static func access non-static variables 
Fix: #38408
(cherry picked from commit ce978517e0)
 2020-05-11 11:01:13 +02:00