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

27229 commits

This branch
This branch
All branches
Author SHA1 Message Date
Rémi Verschelde 1575820207
Merge pull request #39791 from PoqXert/ios 
[iOS] Replace purchase receipt
 2020-06-24 15:15:40 +02:00
Poq Xert bd71925726 Updated purchase receipt suitable for sending to apple verification server 2020-06-24 17:34:20 +10:00
Rémi Verschelde c7bbe262dd
Merge pull request #39333 from Aroweeri/environment 
Environment doc update regarding Viewport usage.
 2020-06-24 08:19:19 +02:00
Ignacio Etcheverry d0f365fe0f [3.2] C#: Fix completion request with case insensitive resource path 
Sometimes Visual Studio documents have the root path all in upper case.
Since Godot doesn't support loading resource files with a case insensitive path,
this makes script resource loading to fail when the Godot editor gets code
completion requests from Visual Studio.
This fix allows the resource path part of the path to be case insensitive. It
still doesn't support cases where the rest of the path is also case insensitive.
For that we would need a proper API for comparing paths. However, this fix
should be enough for our current cases.
 2020-06-23 21:04:08 +02:00
Ignacio Etcheverry d8af79140e [3.2] C#: Add VisualStudio support 2020-06-23 21:01:54 +02:00
Rémi Verschelde 7ec072f7e7
Merge pull request #39774 from lawnjelly/kessel_tex_wrapping_fix 
GLES2 Batching - Fix texture wrapping state bug.
 2020-06-23 10:17:52 +02:00
lawnjelly 491059ca82 GLES2 Batching - Fix texture wrapping state bug. 
For textures that were imported as wrapping, the legacy renderer relied on GL repeat state being set as a once off during load, and didn't alter the GL wrapping state at runtime.

Batching was setting wrapping according to the CANVAS_RECT_TILE flag on rects, however this reset GL wrapping to clamp after use, which was conflicting with later drawcalls that relied on the default wrapping being preserved.

In this PR we only set the wrapping in GL if the texture has not been imported with wrapping. This duplicates the logic in the legacy renderer and solves the state bug.
 2020-06-23 08:34:17 +01:00
Dylan 198bd4cb0f Environment doc update regarding Viewport usage. 2020-06-22 17:59:44 -04:00
Sergey Minakov 45a6628b15 SCons: Enable iOS modules for ARKit and Camera 2020-06-22 23:23:03 +03:00
Sergey Minakov e564ca0c1b Export: Fix iOS enabling push notifications capability 2020-06-22 23:16:22 +03:00
Sergey Minakov bc6a75786c Export: Remove system frameworks from xcode template 2020-06-22 23:16:22 +03:00
Sergey Minakov a678ceaeae SCons: Enable modules for iOS 2020-06-22 23:15:52 +03:00
bruvzg a662b853dd Fix use uninitialized ofs variable introduced in 39701. 
(cherry picked from commit 439c97e0ff)
 2020-06-22 15:41:36 +02:00
Rémi Verschelde 8fd861ab11 doc: Sync classref with current source 2020-06-22 13:24:11 +02:00
bruvzg 1468c0b4d4 [Windows] Prevent overwriting old cursor handle on multiple mouse_mode changes, ensure mouse_mode is set before cursor_set_shape is called to restore cursor. 
(cherry picked from commit fc1d1c3557)
 2020-06-22 13:08:53 +02:00
Rémi Verschelde f2f11bc752
Merge pull request #39744 from timoschwarzer/remove-godot-payment-plugin 
Remove GodotPayment android plugin (3.2)
 2020-06-22 12:15:36 +02:00
Aaron Franke 44c3908c7b Avoid errors when the editor camera is inside the focused object 
Prevent the gizmo distance from being zero by MAX-ing it with CMP_EPSILON

(cherry picked from commit ed2bbdbbef)
 2020-06-22 12:04:52 +02:00
bruvzg e2675e9462 macOS, prevent multiple CGDisplayHideCursor calls unpaired with CGDisplayShowCursor. 
(cherry picked from commit 7a250b579f)
 2020-06-22 12:04:31 +02:00
PouleyKetchoupp d2aa3031dc Fix crashes with invalid shapes in BulletPhysicsDirectSpaceState queries 
(cherry picked from commit 8b0232bf29)
 2020-06-22 12:03:21 +02:00
Timo Schwarzer 5053ab684a
Remove GodotPayment android plugin 
This is now available in a separate repository
at https://github.com/godotengine/godot-google-play-billing
 2020-06-22 11:11:41 +02:00
Rémi Verschelde 571a0c60c0 Revert "Implement Skew in Node2D" 
This reverts commit 7f61710183.

See #38868, in its current implementation a small skew value might end up
serialized to scene files due to floating point precision errors, which is
detrimental to VCS.

This can be cherry-picked anew once a fix for #38868 has been found.
 2020-06-22 10:26:06 +02:00
Rémi Verschelde 75791358c6
Merge pull request #39736 from naithar/fix/deleted-object-stringify 
Fix for a crash on printing freed object
 2020-06-22 10:02:30 +02:00
Sergey Minakov af1788baf3 Variant: Fix potential crash when stringifying deleted Object 
Fixes #38597.
 2020-06-22 08:53:47 +02:00
Rémi Verschelde 000db65d40 i18n: Sync translations with Weblate 2020-06-22 08:43:14 +02:00
skyace65 0b1d9f9d88 Fix Joint2D doc 
(cherry picked from commit a94ba7be59)
 2020-06-22 08:37:57 +02:00
Rémi Verschelde 327479472e Revert "return boxed long when marshalling a godot int to mono runtime in dynamic contexts" 
This reverts commit 42a31501a8.

It breaks compat as is and needs some further work before it can be
cherry-picked for 3.2.x.
 2020-06-22 08:35:21 +02:00
Vorblen 4c638f98ab Fix "Fully Axis-Locked" Freelook Navigation Scheme 
Co-authored-by: Aaron Franke <arnfranke@yahoo.com>
(cherry picked from commit 29e901c342)
 2020-06-21 21:48:12 +02:00
Hugo Locurcio 9889641bae Document how Vector2, Vector3 and Color behave in a boolean context 
See #39731.

(cherry picked from commit 227f12478d)
 2020-06-21 21:44:02 +02:00
Aaron Franke d9beab34c5 Update bool documentation to be more clear 
(cherry picked from commit 08577fab14)
 2020-06-21 21:42:56 +02:00
Rémi Verschelde 8ac13e50cf Move Haiku platform port to external repository 
The Haiku port now resides at:
https://github.com/godotengine/godot-haiku-platform

While we're happy to support as many Free and Open Source platforms as we can,
we need to put the main focus on the platforms that we can reasonably maintain,
and for Haiku we have been lacking maintainers ever since the port was first
merged in 2015.

The Haiku code has not been compiling and much less working at least since the
release of Godot 3.0, and while some attempts have been made at fixing things,
it's still not functional today in the `3.2` branch (and much less in `master`,
understandably).

Having it in an external repository should hopefully enable Haiku contributors
to fix issues in their own time, and possibly tag versions compatible with
past Godot releases once they are ready.

(cherry picked from commit efcc508ee5)
 2020-06-21 21:42:26 +02:00
Maganty Rushyendra 7e3d7417e3 Fix overwrite of manual changes in export_presets.cfg when export dialog is opened 
Ensures that behavior when export_presets.cfg file is edited manually
while editor is running remains identical to before commit 44094b0.

(cherry picked from commit 4a7c19e719)
 2020-06-21 21:41:39 +02:00
Bastiaan Olij 70fb79efa0 Fix missing slider joystick handling on Windows 
(cherry picked from commit aa01b327d6)
 2020-06-21 21:41:14 +02:00
PouleyKetchoupp cdbbc75e90 Set proper file type attribute for OSX zip export 
The missing file type in file attributes was causing the file to lose
executable permissions when unzipped with some softwares.

(cherry picked from commit 4501771fd8)
 2020-06-21 21:40:57 +02:00
Hugo Locurcio 371f1e951e Replace the AssetLib tab icon with a less confusing design 
This closes https://github.com/godotengine/godot-proposals/issues/818.

(cherry picked from commit ebabedc615)
 2020-06-21 21:40:39 +02:00
Hugo Locurcio c5d70fc6a6 Scroll horizontally when holding Shift with Scroll to Pan enabled 
This closes https://github.com/godotengine/godot-proposals/issues/1077.

(cherry picked from commit 84e1c5e4c3)
 2020-06-21 21:40:10 +02:00
Rémi Verschelde f99cbb94cc Export: Rename 'Windows Universal' to 'UWP' 
It's otherwise too easy to be confused between 'Windows Desktop' (Win32)
and 'Windows Universal' (UWP).

(cherry picked from commit 08ef0aab16)
 2020-06-21 21:39:44 +02:00
Sl3dge78 6e835a4820 Autofilled path gets set properly on animation subresources 
(cherry picked from commit d731f43794)
 2020-06-21 21:39:23 +02:00
Dominik 'dreamsComeTrue' Jasiński af43748dd5 Prevent having spaces in signal's method in Connect Dialog 
Fixes: #39647
(cherry picked from commit 79f46da1a3)
 2020-06-21 21:38:17 +02:00
Sl3dge78 d99f6c4d5c Fix #20467. The "Anim imported" warning gets displayed properly when working on imported anims. 
(cherry picked from commit 95cd74fc4b)
 2020-06-21 21:36:12 +02:00
unknown d080c0de51 adding check for syskeydown on control and alt 
(cherry picked from commit d191a8b9f8)
 2020-06-21 21:34:50 +02:00
Tomasz Chabora 8f3eec930b Add unique icon to Polygon2D 
(cherry picked from commit 225622e5e3)
 2020-06-21 21:33:23 +02:00
Rémi Verschelde 804b53bdbb
Merge pull request #37500 from madmiraal/check-motion-before-bullet-sweep-3.2 
[3.2] Check for motion in cast_motion() before doing Bullet convexSweepTest().
 2020-06-21 18:31:52 +02:00
Rémi Verschelde 6cf8709808
Merge pull request #39729 from madmiraal/fix-39718-3.2 
[3.2] Fix creation of duplicate faces in CSG merge faces.
 2020-06-21 17:58:40 +02:00
Marcel Admiraal b006f5402d Check for motion in cast_motion() before doing Bullet convexSweepTest(). 
Also ensure that default closest_safe and closest_unsafe values are
defined in cast_motion() and before cast_motion() is called.
 2020-06-21 16:28:01 +01:00
Marcel Admiraal fa0ee28826 Check if point's index exists before adding it to the list of points 
that need to split faces when avoiding creating degenerate faces
while merging CSG faces.
 2020-06-21 14:41:05 +01:00
Rémi Verschelde bd16fd9d19
Merge pull request #39683 from asmaloney/3.2-FileAccessBuffered-init 
[3.2] Ensure FileAccessBuffered structs are properly initialized
 2020-06-19 23:44:17 +02:00
Andy Maloney 7f18163ea6 [3.2] Ensure FileAccessBuffered structs are properly initialized 2020-06-19 11:32:53 -04:00
Michael Belousov 42a31501a8 return boxed long when marshalling a godot int to mono runtime in dynamic contexts 
(cherry picked from commit 60fcefba69)
 2020-06-19 16:17:27 +02:00
PouleyKetchoupp b3af0b2a39 Option in RichTextLabel for height to fit content 
(cherry picked from commit ad8081216c)
 2020-06-19 16:17:27 +02:00
Rémi Verschelde 307a9551ae
Merge pull request #39658 from asmaloney/3.2-macos-command-backspace 
[3.2][macOS] Command-backspace in line edit
 2020-06-19 13:19:51 +02:00