summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-06-11Fix error macro calls not ending with semicolonRémi Verschelde
It's not necessary, but the vast majority of calls of error macros do have an ending semicolon, so it's best to be consistent. Most WARN_DEPRECATED calls did *not* have a semicolon, but there's no reason for them to be treated differently.
2019-06-11Merge pull request #29539 from qarmin/fix_crash_with_get_keywords_colorRémi Verschelde
Fix crash with get_keywords_color
2019-06-11Merge pull request #29526 from YeldhamDev/connections_dialog_improvements_rebornRémi Verschelde
Improve conections dialog
2019-06-11Merge pull request #29418 from AndreaCatania/upbulRémi Verschelde
Updated Bullet version to the actual bullet master commit
2019-06-11Merge pull request #29467 from zaksnet/patch-1Rémi Verschelde
replaced "divisor" with "delimiter" for methods split,rsplit and split_floats.
2019-06-11bullet: Sync with current upstream master branchRémi Verschelde
This updates our local copy to commit 5ec8339b6fc491e3f09a34a4516e82787f053fcc. We need a recent master commit for some new features that we use in Godot (see #25543 and #28909). To avoid warnings generated by Bullet headers included in our own module, we include those headers with -isystem on GCC and Clang. Fixes #29503.
2019-06-11Improved documentation of rsplit Method for String class.Zak
Improved documentation of rsplit Method for String class. Removed "divisor" (i will also change variants_call.cpp) and added "delimiter" in its place. Also moved the example at the bottom of the description.
2019-06-11Merge pull request #29558 from SamSindt/fix-lifetime-reversed-CPUParticles2DRémi Verschelde
Reversed operator in SortLifetime fixing #29440
2019-06-11Merge pull request #29519 from Ranoller/masterRémi Verschelde
Make tilemap texture origin point top-left.
2019-06-11Merge pull request #29515 from Calinou/editor-inspector-checkbox-hseparationRémi Verschelde
Add a margin to "checkable" property checkboxes in the editor inspector
2019-06-11Merge pull request #29508 from Calinou/doc-hex-constant-uppercaseRémi Verschelde
Use uppercase for all hexadecimal constants in the editor help
2019-06-11Merge pull request #29498 from bruvzg/fix_line_edit_alt_keysRémi Verschelde
Fix third and fourth level (AltGr / ⌥ modifier) keys input in LineEdit.
2019-06-11Merge pull request #29496 from clayjohn/dlopen-fix-gles2Rémi Verschelde
Use def ANDROID_ENABLED so android features are not included in web builds
2019-06-11Merge pull request #29671 from bruvzg/x11_borderless_fullscreen_fixRémi Verschelde
Fix borderless state restoration after exiting fullscreen.
2019-06-11Merge pull request #29669 from akien-mga/doc-url-formatRémi Verschelde
makerst: Fix format of [url] links in reST
2019-06-11Merge pull request #29667 from Ertain/masterRémi Verschelde
Corrected spelling error
2019-06-11[X11] Add window borderless state detection, fix borderless state ↵bruvzg
restoration after exiting fullscreen.
2019-06-11makerst: Fix format of [url] links in reSTRémi Verschelde
Moved some logic to make_url in an attempt to reuse it in the parser, but it proved too complex so I ended up not using it. I kept it as a separate method nevertheless.
2019-06-11Corrected spelling errorErtain
2019-06-11Fix third and fourth level (AltGr / ⌥ modifier) keys input in LineEdit.bruvzg
2019-06-10Merge pull request #29546 from hpvb/fix-random-ssl-crashRémi Verschelde
Fix random ssl crash
2019-06-10Merge pull request #29497 from qarmin/fix_memory_leak_in_filesRémi Verschelde
Fix memory leak after closing files
2019-06-10Merge pull request #29651 from qarmin/fix_crash_animated_spriteGilles Roudière
Fix crash when frames are empty
2019-06-10Fix crash when frames are emptyqarmin
2019-06-09Merge pull request #29527 from YeldhamDev/orphan_dialog_dependencies_tooltipMichael Alexsander Silva Dias
Add tooltip for the dependencies buttons in the orphan explorer dialog
2019-06-09Merge pull request #29629 from volzhs/editor-file-dialogGilles Roudière
Fix crash when selecting favorate directory on EditorFileDialog
2019-06-10Fix crash when selecting favorate directory on EditorFileDialogvolzhs
The problem was that favorite tool button kept to change pressed and unpressed state with toggled event. This is a quick fix for crash. EditorFileDialog might need to be refactor later.
2019-06-08Merge pull request #29606 from neikeq/remove-unneeded-mono-patchesIgnacio Roldán Etcheverry
Remove obsolete mono patch for pthread_mutexattr_setprotocol
2019-06-08Remove obsolete mono patch for pthread_mutexattr_setprotocolIgnacio Etcheverry
This has already been fixed in Mono both master and 2019-06 (no other branch other than the skipped 2019-04 branch uses pthread_mutexattr_setprotocol).
2019-06-07Merge pull request #29557 from qarmin/fix_2d_line_crashGilles Roudière
Fix 2D Line crash
2019-06-06Reversed operator in SortLifetime fixing #29440SamSindt
2019-06-06Fix 2D Line crashqarmin
2019-06-06Fix a random SSL crash I saw once.Hein-Pieter van Braam-Stewart
I don't know why this happened, I was debugging another issue. This should take care of it though.
2019-06-06Fix crash with get_keywords_colorqarmin
2019-06-06Add tooltip for the dependencies buttons in the orphan explorer dialogMichael Alexsander Silva Dias
2019-06-06Improve conections dialogMichael Alexsander Silva Dias
2019-06-05Make tilemap texture origin point top-left.Ranoller
Fix https://github.com/godotengine/godot/issues/29487. In this commit: https://github.com/godotengine/godot/pull/28896 bad offset of textures and shapes was fixed, but a center of texture was added too, and this seems not dessired by default because breaks too much compatibility with demos and user projects. A future Check box for center texture can be added
2019-06-05Add a margin to "checkable" property checkboxes in the editor inspectorHugo Locurcio
This makes "checkable" property checkboxes look more consistent with other checkboxes.
2019-06-05Use uppercase for all hexadecimal constants in the editor helpHugo Locurcio
2019-06-05Fix memory leak after closing filesqarmin
2019-06-04use def ANDROID_ENABLED so android features are not included in javascript ↵clayjohn
builds
2019-06-04Merge pull request #29411 from clayjohn/multimesh_instance_2dRémi Verschelde
Added MultiMeshInstance2D node for using MultiMesh in 2D
2019-06-04Merge pull request #29469 from bojidar-bg/29446-graphnode-seperationRémi Verschelde
Fix GraphNode not adding separation after the first node
2019-06-04Merge pull request #29473 from neikeq/fix-envvars-monoRémi Verschelde
Mono: Fix SCons options added to the wrong environment
2019-06-04Merge pull request #29459 from hpvb/fix-move-renameRémi Verschelde
Fix moving and renaming files
2019-06-04Merge pull request #29464 from bruvzg/macos_fix_non_ime_unicode_inputRémi Verschelde
[macOS] Fixes unicode input with IME input mode inactive.
2019-06-04Merge pull request #29452 from YeldhamDev/remember_selected_subtileRémi Verschelde
Remember selected subtile when updating the TileMap editor
2019-06-04Merge pull request #29460 from YeldhamDev/tilemapeditor_atlas_copy_fixRémi Verschelde
Fix TileMap editor not correctly copying atlas tiles
2019-06-04Fix moving and renaming filesHein-Pieter van Braam-Stewart
This commit fixes several issues related to moving scenes and resources in an open project. * Don't try to reload scenes while not all scenes are updated yet. * Don't use the UndoRedo system to update non-user initiated editor state. * Resave scenes after moving files and updating resource path(s).
2019-06-04Mono: Fix SCons options added to the wrong environmentIgnacio Etcheverry