21273 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Rémi Verschelde	a69436aa4e	Merge pull request #27309 from KoBeWi/main_scene_on_android ... Ensure main scene is set when running on device	2019-05-31 16:55:46 +02:00
Max Hilbrunner	95f2567a8b	Merge pull request #29347 from akien-mga/string-strip-escapes ... Fix and expose String::strip_escapes(), use it in LineEdit paste	2019-05-31 16:47:55 +02:00
Tomasz Chabora	9e18e94dc1	Ensure main scene is set when running on device	2019-05-31 16:02:57 +02:00
Rémi Verschelde	af2c742f53	Fix and expose String::strip_escapes(), use it in LineEdit paste ... Supersedes #27736.	2019-05-31 15:49:14 +02:00
Rémi Verschelde	29645c8147	Merge pull request #27334 from qarmin/add_50_percent_editor_scale ... Add support for 50% editor scale	2019-05-31 15:28:14 +02:00
Rémi Verschelde	5098d2c46b	Merge pull request #28144 from Calinou/animation-track-editor-align-bool ... Align boolean track icons to other keys in the animation editor	2019-05-31 14:17:26 +02:00
Rémi Verschelde	1f91de4783	Merge pull request #29318 from bojidar-bg/29313-control-constant-update ... Fix constant redrawing of the editor when selecting a Control in a Container	2019-05-31 10:17:56 +02:00
Rémi Verschelde	710827c5db	Merge pull request #29324 from qarmin/fix_memory_leak_text_editor ... Fix memory leak in Text Editor and FileSystem dock	2019-05-31 10:17:19 +02:00
Rémi Verschelde	0fc6b86797	Merge pull request #29329 from volzhs/fix-animation-player ... Fix animation player	2019-05-31 10:13:30 +02:00
Rémi Verschelde	7770f8cb7e	Merge pull request #29331 from KoBeWi/animation_time_machine ... Add track_set_key_time() to Animation	2019-05-31 10:12:37 +02:00
Rémi Verschelde	b9802149bb	Merge pull request #29334 from KoBeWi/not_crash_is_true ... Fix crash when inherit in rootless unsaved scene	2019-05-31 10:08:51 +02:00
Rémi Verschelde	ca6a2669df	Merge pull request #29328 from KoBeWi/undo_cpuparticles_too ... Allow undo of conversion to CPUParticles	2019-05-31 10:05:09 +02:00
Rémi Verschelde	6b27b7d113	Merge pull request #29301 from creikey/fix-remotescenetree ... Hide remote scene tree when adding new scene	2019-05-31 09:52:04 +02:00
Rémi Verschelde	77880d1b4d	Merge pull request #29299 from creikey/master ... Check if parent is null before updating transform	2019-05-31 09:51:05 +02:00
Cameron Reikes	63c2d1bce1	Hide remote scene tree when adding new scene ... - Don't show create_root_dialog if remote scenetree visible - Hide create_root_dialog on showing of remote scenetree Fixes #29288	2019-05-30 23:56:08 -07:00
Rémi Verschelde	4bcefb2268	Merge pull request #29336 from Cheeseness/rigidbody_axis_lock_typos ... Correct typos in RigidBody axis lock documentation	2019-05-31 06:58:31 +02:00
Cheeseness	b06dc6ba8c	Correct typos in RigidBody axis lock documentation	2019-05-31 13:28:30 +10:00
Tomasz Chabora	847a74d588	Fix crash when inherit in rootless unsaved scene	2019-05-31 02:08:37 +02:00
Tomasz Chabora	adcbcf87dd	Add track_set_key_time() to Animation	2019-05-31 00:40:29 +02:00
volzhs	fe98a31743	Sync Animation editor with Inspector	2019-05-31 06:50:14 +09:00
Tomasz Chabora	1141ab8b25	Allow undo conversion to CPUParticles	2019-05-30 23:08:57 +02:00
volzhs	e16e5012ca	Revert "Fix AnimationPlayer editor length and step synchronization" ... This reverts commit ca80ebe9f6.	2019-05-31 04:43:46 +09:00
qarmin	392f6f89cd	Fix memory leak in Text Editor and FileSystem Dock	2019-05-30 21:31:05 +02:00
Rémi Verschelde	a2cf1c3d04	Merge pull request #29319 from fire/preview_Crash ... Check error code before using FileAccess to create a preview and cras…	2019-05-30 18:35:06 +02:00
Rémi Verschelde	62b868fd37	Merge pull request #26942 from RandomShaper/fix-vp-issues ... Fix Viewport and Camera issues	2019-05-30 18:31:15 +02:00
K. S. Ernest (iFIre) Lee	b42df97edd	Check error code before using FileAccess to create a preview and crashing.	2019-05-30 09:08:52 -07:00
Bojidar Marinov	647fb155c3	Fix constant redrawing of the editor when selecting a Control in a Container ... Fixes #29313	2019-05-30 18:25:22 +03:00
Rémi Verschelde	6895ad303b	Merge pull request #29297 from Calinou/decrease-editor-fps-unfocused ... Decrease the editor FPS cap when the window is unfocused	2019-05-30 16:47:40 +02:00
Rémi Verschelde	fcb60fa2cd	Merge pull request #29315 from akien-mga/fix-paths-localization ... Don't localize paths that contain but are not in the resource path	2019-05-30 16:43:43 +02:00
Rémi Verschelde	c6b96050d0	Merge pull request #29311 from AspenBlack/patch-1 ... More accurate description of valid Parents	2019-05-30 16:43:28 +02:00
Rémi Verschelde	c957e56741	Merge pull request #24286 from glaforte/bugfix/20878 ... Fixes the support of the 'keep on reimport' flag - Issue #20878.	2019-05-30 16:42:50 +02:00
Rémi Verschelde	9ad9d1f3b3	Don't localize paths that contain but are not in the resource path ... This issue could be triggered if you try to access a path which contains the resource path string in its absolute path, while pointing to a directory which is *not* in the resource path. It's clearer with an example: with `/my/project` as resource path, the previous logic would also localize `/my/project_data` to `res://data`, which is incorrect and would lead to a cryptic error. Fixes #24761. Co-authored-by: volzhs <volzhs@gmail.com>	2019-05-30 16:03:12 +02:00
Hugo Locurcio	ac14efcdfb	Decrease the editor FPS cap when the window is unfocused ... This decreases CPU/GPU usage when the window is unfocused, which can be beneficial to laptop users. This also makes the low-processor mode sleep project setting no longer affect the editor. Instead, two new editor settings now define the duration of sleeping when the editor is focused and unfocused. This closes #24209 and partially addresses #29257.	2019-05-30 15:42:57 +02:00
Rémi Verschelde	7310c84367	Merge pull request #29310 from follower/patch-4 ... Improve AudioStreamSample documentation.	2019-05-30 15:04:51 +02:00
Rémi Verschelde	bac7e22cb1	Merge pull request #29236 from clayjohn/gles2-mirror ... Separate culling state management from material state in GLES2	2019-05-30 15:01:50 +02:00
Rémi Verschelde	0411ab56f5	Merge pull request #25148 from capnm/capnm-print-corrupt-image-path ... Print the path of a corrupt image	2019-05-30 14:52:55 +02:00
Aspin	a9ddf2a449	More accurate description of valid Parents ... I hope this is the right place to edit now.	2019-05-30 20:41:55 +08:00
Rémi Verschelde	9dee6bce8d	Merge pull request #27657 from m4gr3d/add_android_studio_support ... Add Android Studio support	2019-05-30 14:37:51 +02:00
Rémi Verschelde	603bb98340	Merge pull request #29188 from Calinou/improve-ssao-performance-quality ... Improve SSAO performance and quality	2019-05-30 14:27:25 +02:00
follower	a3aa98cb88	Improve AudioStreamSample documentation. ... "Squash" of #27928. Wording based on suggestions by @LikeLakers2.	2019-05-31 00:20:33 +12:00
Rémi Verschelde	0c74aae576	Merge pull request #29308 from hbina/fixing_undo_2d_particles ... added ability to undo conversion of Particles2D to CPUParticles2D	2019-05-30 14:14:21 +02:00
Rémi Verschelde	19e5d21e11	Merge pull request #29309 from Ybalrid/patch-1 ... audio_server.h : fix typo in comment (minor)	2019-05-30 14:12:27 +02:00
Arthur Brainville	147b2403e4	audio_server.h : fix typo in comment (minor) ... Line 152 : `//re-expose this her,` should be `//re-expose this here`	2019-05-30 13:47:18 +02:00
Rémi Verschelde	24dd8e29ea	Merge pull request #29296 from jbuck3/cleanup ... Remove some redundant lines	2019-05-30 12:52:23 +02:00
hbina085	21078621dd	added ability to undo conversion of Particles2D to CPUParticles2D	2019-05-30 06:51:36 -04:00
Rémi Verschelde	9d6294c78a	Merge pull request #29304 from qarmin/fix_unlocking_mutex ... Properly unlock mutex	2019-05-30 12:01:20 +02:00
qarmin	a32f020b53	Properly unlock mutex	2019-05-30 10:28:03 +02:00
fhuya	669db2a50a	Add Android Studio support.	2019-05-29 16:57:52 -07:00
Cameron Reikes	9f29c28918	Check if parent is null before updating trasnform ... - parent being null means it's not a CollisionObject	2019-05-29 16:09:52 -07:00
James Buck	4f4513f99c	Remove some redundant lines	2019-05-29 15:20:39 -05:00