summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-06-22Merge pull request #39719 from Calinou/editor-monitors-horizontal-linesRémi Verschelde
Draw horizontal lines and labels in the editor performance monitors
2020-06-22Merge pull request #39755 from Faless/crypto/encryption_pr_4.0Rémi Verschelde
Crypto enhancements, AESContext, RSA public key, signature, verification.
2020-06-22Merge pull request #39763 from m4gr3d/cleanup_godotpaymentRémi Verschelde
Follow up cleanup for the godotpayment project module
2020-06-22Follow up cleanup for the godotpayment project moduleFredia Huya-Kouadio
2020-06-22Merge pull request #39751 from bruvzg/mingw_build_fixRémi Verschelde
Fix MinGW build (use uninitialized `ofs` variable introduced in 39701).
2020-06-22Merge pull request #39750 from bruvzg/win_fix_mouse_modeRémi Verschelde
[Windows] Fix mouse cursor not shown after multiple mode changes.
2020-06-22Fix use uninitialized `ofs` variable introduced in 39701.bruvzg
2020-06-22[Windows] Prevent overwriting old cursor handle on multiple mouse_mode ↵bruvzg
changes, ensure mouse_mode is set before `cursor_set_shape` is called to restore cursor.
2020-06-22Merge pull request #39745 from timoschwarzer/remove-godot-payment-plugin-4Rémi Verschelde
Remove GodotPayment android plugin
2020-06-22Merge pull request #39749 from aaronfranke/nan-editor-cameraRémi Verschelde
Avoid errors when the editor camera is inside the focused object
2020-06-22Merge pull request #39748 from bruvzg/macos_mouse_hide_counterRémi Verschelde
[macOS] Fix mouse cursor not shown after multiple mode changes.
2020-06-22Avoid errors when the editor camera is inside the focused objectAaron Franke
Prevent the gizmo distance from being zero by MAX-ing it with CMP_EPSILON
2020-06-22Merge pull request #39747 from nekomatata/fix-crash-space-queryRémi Verschelde
Fix crashes with invalid shapes in BulletPhysicsDirectSpaceState queries
2020-06-22macOS, prevent multiple CGDisplayHideCursor calls unpaired with ↵bruvzg
CGDisplayShowCursor.
2020-06-22Fix crashes with invalid shapes in BulletPhysicsDirectSpaceState queriesPouleyKetchoupp
2020-06-22Remove GodotPayment android pluginTimo Schwarzer
This is now available in a separate repository at https://github.com/godotengine/godot-google-play-billing
2020-06-22i18n: Sync translations with WeblateRémi Verschelde
(cherry picked from commit 000db65d40ede5b8cab1ce91f604c359e66f10bb)
2020-06-22Merge pull request #39741 from skyace65/Joint2DDocRémi Verschelde
Fix Joint2D disable collision description.
2020-06-21Fix Joint2D docskyace65
2020-06-21Merge pull request #39592 from vorblen/masterRémi Verschelde
Fix "Fully Axis-Locked" Freelook Navigation Scheme
2020-06-21Merge pull request #39733 from Calinou/doc-vector-color-boolean-contextRémi Verschelde
Document how Vector2, Vector3 and Color behave in a boolean context
2020-06-21Draw horizontal lines and labels in the editor performance monitorsHugo Locurcio
This partially addresses https://github.com/godotengine/godot-proposals/issues/1014.
2020-06-21Merge pull request #34236 from madmiraal/enable-bullet-debugRémi Verschelde
Enable Bullet DEBUG on debug builds.
2020-06-21Merge pull request #39717 from hinlopen/empty-scroll-eats-inputRémi Verschelde
No longer scroll vertically when scrollbars are unavailable
2020-06-21Merge pull request #34219 from madmiraal/check-motion-before-bullet-sweepRémi Verschelde
Check for motion in cast_motion() before doing Bullet convexSweepTest().
2020-06-21Merge pull request #39730 from madmiraal/fix-39718Rémi Verschelde
Fix creation of duplicate faces in CSG merge faces.
2020-06-21Check for motion in cast_motion() before doing Bullet convexSweepTest().Marcel Admiraal
Also ensure that default closest_safe and closest_unsafe values are defined in cast_motion() and before cast_motion() is called.
2020-06-21Document how Vector2, Vector3 and Color behave in a boolean contextHugo Locurcio
See #39731.
2020-06-21Check if point's index exists before adding it to the list of pointsMarcel Admiraal
that need to split faces when avoiding creating degenerate faces while merging CSG faces.
2020-06-21Merge pull request #39661 from dreamsComeTrue/restart-project-settings-msgRémi Verschelde
Project Settings 'restart' message put focus on editor rather than project itself
2020-06-21Merge pull request #39712 from akien-mga/古池や蛙飛び込む水の音Rémi Verschelde
Move Haiku platform port to external repository
2020-06-21Merge pull request #39721 from aaronfranke/boolRémi Verschelde
Update bool documentation to be more clear
2020-06-21Update bool documentation to be more clearAaron Franke
2020-06-20No longer scroll vertically when scrollbars are unavailableStijn Hinlopen
2020-06-20Merge pull request #39715 from Calinou/remove-toolbutton-iconRémi Verschelde
Remove unused ToolButton editor icon
2020-06-20Remove unused ToolButton editor iconHugo Locurcio
Left-over from 31b7f02a29cdf4f1c30cfc37962f43f67380b9ad.
2020-06-20Move Haiku platform port to external repositoryRémi Verschelde
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.
2020-06-20Merge pull request #39707 from mrushyendra/export_overwriteRémi Verschelde
Fix overwrite of manual changes in export_presets.cfg when export dialog is opened
2020-06-20Fix overwrite of manual changes in export_presets.cfg when export dialog is ↵Maganty Rushyendra
opened Ensures that behavior when export_presets.cfg file is edited manually while editor is running remains identical to before commit 44094b0.
2020-06-20Merge pull request #39687 from Calinou/2d-editor-shift-horizontal-scrollRémi Verschelde
Scroll horizontally when holding Shift with Scroll to Pan enabled
2020-06-20Merge pull request #39701 from BastiaanOlij/fix_joystick_slidersRémi Verschelde
Fix missing slider joystick handling on Windows
2020-06-20Merge pull request #39689 from Calinou/new-assetlib-iconRémi Verschelde
Replace the AssetLib tab icon with a less confusing design
2020-06-20Merge pull request #39700 from nekomatata/osx-export-zip-fixRémi Verschelde
Set proper file type attribute for OSX zip export
2020-06-20Fix "Fully Axis-Locked" Freelook Navigation SchemeVorblen
Co-authored-by: Aaron Franke <arnfranke@yahoo.com>
2020-06-20Fix missing slider joystick handling on WindowsBastiaan Olij
2020-06-20Set proper file type attribute for OSX zip exportPouleyKetchoupp
The missing file type in file attributes was causing the file to lose executable permissions when unzipped with some softwares.
2020-06-20Replace the AssetLib tab icon with a less confusing designHugo Locurcio
This closes https://github.com/godotengine/godot-proposals/issues/818.
2020-06-19Merge pull request #39053 from timoschwarzer/static-assert-variant-arg-maxRémi Verschelde
Add static_assert checks where code assumes VARIANT_ARG_MAX == 5
2020-06-19Merge pull request #39427 from hcmlax/shortcut_issue_39351Rémi Verschelde
fixed issue where shortcut doesn't work if alt is pressed before shift
2020-06-19Merge pull request #39657 from Sl3dge78/20467Rémi Verschelde
The "Anim imported" warning gets displayed properly when working on imported anims.