Commit Graph

21408 Commits

Author SHA1 Message Date
Rémi Verschelde
6d16f2f053 Fix error macro calls not ending with semicolon
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-11 14:49:34 +02:00
Rémi Verschelde
d8877d2df5
Merge pull request #29539 from qarmin/fix_crash_with_get_keywords_color
Fix crash with get_keywords_color
2019-06-11 14:19:18 +02:00
Rémi Verschelde
96028e3f48
Merge pull request #29526 from YeldhamDev/connections_dialog_improvements_reborn
Improve conections dialog
2019-06-11 14:17:49 +02:00
Rémi Verschelde
c499f1475f
Merge pull request #29418 from AndreaCatania/upbul
Updated Bullet version to the actual bullet master commit
2019-06-11 13:55:44 +02:00
Rémi Verschelde
f0bacf360d
Merge pull request #29467 from zaksnet/patch-1
replaced "divisor" with "delimiter" for methods split,rsplit and split_floats.
2019-06-11 13:31:41 +02:00
Rémi Verschelde
99acec63f1 bullet: Sync with current upstream master branch
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-11 13:19:42 +02:00
Zak
1a397f46e6 Improved documentation of rsplit Method for String class.
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-11 13:39:18 +03:00
Rémi Verschelde
7b883d7d50
Merge pull request #29558 from SamSindt/fix-lifetime-reversed-CPUParticles2D
Reversed operator in SortLifetime fixing #29440
2019-06-11 12:14:26 +02:00
Rémi Verschelde
227b5d20ee
Merge pull request #29519 from Ranoller/master
Make tilemap texture origin point top-left.
2019-06-11 12:05:13 +02:00
Rémi Verschelde
8d5bb06ae0
Merge pull request #29515 from Calinou/editor-inspector-checkbox-hseparation
Add a margin to "checkable" property checkboxes in the editor inspector
2019-06-11 11:56:53 +02:00
Rémi Verschelde
bc75ef5ad0
Merge pull request #29508 from Calinou/doc-hex-constant-uppercase
Use uppercase for all hexadecimal constants in the editor help
2019-06-11 11:51:59 +02:00
Rémi Verschelde
9ec33eaee2
Merge pull request #29498 from bruvzg/fix_line_edit_alt_keys
Fix third and fourth level (AltGr / ⌥ modifier) keys input in LineEdit.
2019-06-11 11:49:44 +02:00
Rémi Verschelde
0677383907
Merge pull request #29496 from clayjohn/dlopen-fix-gles2
Use def ANDROID_ENABLED so android features are not included in web builds
2019-06-11 11:48:38 +02:00
Rémi Verschelde
926f2f9d53
Merge pull request #29671 from bruvzg/x11_borderless_fullscreen_fix
Fix borderless state restoration after exiting fullscreen.
2019-06-11 11:23:19 +02:00
Rémi Verschelde
ec3617c8ac
Merge pull request #29669 from akien-mga/doc-url-format
makerst: Fix format of [url] links in reST
2019-06-11 11:18:40 +02:00
Rémi Verschelde
39643d045e
Merge pull request #29667 from Ertain/master
Corrected spelling error
2019-06-11 11:13:29 +02:00
bruvzg
2a950f3a7c
[X11] Add window borderless state detection, fix borderless state restoration after exiting fullscreen. 2019-06-11 12:07:48 +03:00
Rémi Verschelde
c7246d8e1e makerst: Fix format of [url] links in reST
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-11 10:51:10 +02:00
Ertain
7a397d6976
Corrected spelling error 2019-06-11 03:19:16 -05:00
bruvzg
63d8dc0920
Fix third and fourth level (AltGr / ⌥ modifier) keys input in LineEdit. 2019-06-11 08:10:07 +03:00
Rémi Verschelde
629bc10d80
Merge pull request #29546 from hpvb/fix-random-ssl-crash
Fix random ssl crash
2019-06-10 22:18:01 +02:00
Rémi Verschelde
ee86b18a5e
Merge pull request #29497 from qarmin/fix_memory_leak_in_files
Fix memory leak after closing files
2019-06-10 15:23:26 +02:00
Gilles Roudière
7f3c2e7b0c
Merge pull request #29651 from qarmin/fix_crash_animated_sprite
Fix crash when frames are empty
2019-06-10 09:59:19 +02:00
qarmin
37c2595526 Fix crash when frames are empty 2019-06-10 08:36:28 +02:00
Michael Alexsander Silva Dias
138a8f1a99
Merge pull request #29527 from YeldhamDev/orphan_dialog_dependencies_tooltip
Add tooltip for the dependencies buttons in the orphan explorer dialog
2019-06-09 18:37:48 -03:00
Gilles Roudière
91b3daa8d6
Merge pull request #29629 from volzhs/editor-file-dialog
Fix crash when selecting favorate directory on EditorFileDialog
2019-06-09 18:13:46 +02:00
volzhs
15d284b281 Fix crash when selecting favorate directory on EditorFileDialog
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-10 00:27:28 +09:00
Ignacio Roldán Etcheverry
abbbde87e2
Merge pull request #29606 from neikeq/remove-unneeded-mono-patches
Remove obsolete mono patch for pthread_mutexattr_setprotocol
2019-06-08 21:14:15 +02:00
Ignacio Etcheverry
26f9d907d4 Remove obsolete mono patch for pthread_mutexattr_setprotocol
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-08 17:00:02 +02:00
Gilles Roudière
693582f008
Merge pull request #29557 from qarmin/fix_2d_line_crash
Fix 2D Line crash
2019-06-07 22:52:59 +02:00
SamSindt
6a23eff748 Reversed operator in SortLifetime fixing #29440 2019-06-06 12:49:48 -07:00
qarmin
2621131549 Fix 2D Line crash 2019-06-06 21:09:37 +02:00
Hein-Pieter van Braam-Stewart
64626f682e Fix a random SSL crash I saw once.
I don't know why this happened, I was debugging another issue. This
should take care of it though.
2019-06-06 13:46:54 +00:00
qarmin
8d993f6357 Fix crash with get_keywords_color 2019-06-06 12:59:29 +02:00
Michael Alexsander Silva Dias
fc23c8f941 Add tooltip for the dependencies buttons in the orphan explorer dialog 2019-06-06 02:47:56 -03:00
Michael Alexsander Silva Dias
31218a07de Improve conections dialog 2019-06-06 02:40:20 -03:00
Ranoller
f26e9daab5 Make tilemap texture origin point top-left.
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-05 23:23:36 +02:00
Hugo Locurcio
ecda25b050
Add a margin to "checkable" property checkboxes in the editor inspector
This makes "checkable" property checkboxes look more consistent with
other checkboxes.
2019-06-05 22:18:46 +02:00
Hugo Locurcio
6516098d12
Use uppercase for all hexadecimal constants in the editor help 2019-06-05 16:44:20 +02:00
qarmin
53c0a29fb0 Fix memory leak after closing files 2019-06-05 09:34:16 +02:00
clayjohn
9af94d650f use def ANDROID_ENABLED so android features are not included in javascript builds 2019-06-04 23:12:20 -07:00
Rémi Verschelde
197b65f32a
Merge pull request #29411 from clayjohn/multimesh_instance_2d
Added MultiMeshInstance2D node for using MultiMesh in 2D
2019-06-04 22:40:13 +02:00
Rémi Verschelde
46c56cad0c
Merge pull request #29469 from bojidar-bg/29446-graphnode-seperation
Fix GraphNode not adding separation after the first node
2019-06-04 22:37:55 +02:00
Rémi Verschelde
1c950415b0
Merge pull request #29473 from neikeq/fix-envvars-mono
Mono: Fix SCons options added to the wrong environment
2019-06-04 22:31:58 +02:00
Rémi Verschelde
daca2a9a8e
Merge pull request #29459 from hpvb/fix-move-rename
Fix moving and renaming files
2019-06-04 22:30:43 +02:00
Rémi Verschelde
d0dc42f80c
Merge pull request #29464 from bruvzg/macos_fix_non_ime_unicode_input
[macOS] Fixes unicode input with IME input mode inactive.
2019-06-04 18:49:53 +02:00
Rémi Verschelde
e22dde1b18
Merge pull request #29452 from YeldhamDev/remember_selected_subtile
Remember selected subtile when updating the TileMap editor
2019-06-04 17:16:03 +02:00
Rémi Verschelde
33163c0040
Merge pull request #29460 from YeldhamDev/tilemapeditor_atlas_copy_fix
Fix TileMap editor not correctly copying atlas tiles
2019-06-04 16:56:59 +02:00
Hein-Pieter van Braam-Stewart
0ac7715a27 Fix moving and renaming files
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-04 16:24:32 +02:00
Ignacio Etcheverry
ff0c863cb1 Mono: Fix SCons options added to the wrong environment 2019-06-04 16:15:00 +02:00