Commit Graph

21242 Commits

Author SHA1 Message Date
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
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
c6b96050d0 Merge pull request #29311 from AspenBlack/patch-1
More accurate description of valid Parents
2019-05-30 16:43:28 +02:00
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
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
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
7310c84367 Merge pull request #29310 from follower/patch-4
Improve AudioStreamSample documentation.
2019-05-30 15:04:51 +02:00
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
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
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
9dee6bce8d Merge pull request #27657 from m4gr3d/add_android_studio_support
Add Android Studio support
2019-05-30 14:37:51 +02:00
603bb98340 Merge pull request #29188 from Calinou/improve-ssao-performance-quality
Improve SSAO performance and quality
2019-05-30 14:27:25 +02:00
a3aa98cb88 Improve AudioStreamSample documentation.
"Squash" of #27928.

Wording based on suggestions by @LikeLakers2.
2019-05-31 00:20:33 +12:00
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
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
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
24dd8e29ea Merge pull request #29296 from jbuck3/cleanup
Remove some redundant lines
2019-05-30 12:52:23 +02:00
21078621dd added ability to undo conversion of Particles2D to CPUParticles2D 2019-05-30 06:51:36 -04:00
9d6294c78a Merge pull request #29304 from qarmin/fix_unlocking_mutex
Properly unlock mutex
2019-05-30 12:01:20 +02:00
a32f020b53 Properly unlock mutex 2019-05-30 10:28:03 +02:00
669db2a50a Add Android Studio support. 2019-05-29 16:57:52 -07:00
4f4513f99c Remove some redundant lines 2019-05-29 15:20:39 -05:00
8c923fc617 Merge pull request #29290 from ShyRed/godefquo
Escape quote char for non-Windows OS
2019-05-29 21:01:29 +02:00
5dc50327cf Escape quote char for non-Windows OS
Quote char appears to be ignored by ProcessStartInfo on non-Windows operating systems, so it needs to be escaped.
2019-05-29 19:13:16 +02:00
c11bf884e0 Merge pull request #25012 from avencherus/prevent-duplicate-keyframes
Do precision comparison to prevent the creation of keyframes with a time that already exists
2019-05-29 18:59:19 +02:00
bc816f93c6 Merge pull request #24365 from YeldhamDev/autoload_restrict_keywords
Restrict Autoloads from having keywords as their names
2019-05-29 18:57:51 +02:00
50f4f9d07b Merge pull request #29287 from akien-mga/invalid-encryption-key
FileAccessEncrypted: Be more explicit on decryption failure
2019-05-29 18:44:28 +02:00
fda0fd0878 Merge pull request #29285 from akien-mga/navpoly_vertices_vec2
Fix wrong property binding for NavigationPolygon::vertices
2019-05-29 18:10:47 +02:00
02bac239d9 FileAccessEncrypted: Be more explicit on decryption failure
Fixes #24505.
Supersedes #25278.
2019-05-29 17:57:37 +02:00
21ee1d2198 Merge pull request #25516 from bojidar-bg/25487-folding-remote-tree
Fix remote scene tree root folding
2019-05-29 17:51:12 +02:00
c51d2ed55c Merge pull request #25480 from WindyDarian/scene_import_root_type_script_global_class_support
Support script global class (class_name) as root_type when importing a scene
2019-05-29 17:31:15 +02:00
586539d867 Fix wrong property binding for NavigationPolygon::vertices 2019-05-29 17:28:22 +02:00
23a9ba68e6 Merge pull request #29284 from akien-mga/gles2-release-maybe-uninitialized
Fix -Werror=maybe-uninitialized in GLES2 on release builds
2019-05-29 17:19:22 +02:00
e9ca1a1299 Merge pull request #25520 from Zylann/expose_node_custom_aabb
Exposed custom AABB setter on GeometryInstance
2019-05-29 17:18:17 +02:00
62c9af4072 Merge pull request #25647 from QbieShay/fix_25440
Added a setting for files in which the editor should search (project specific)
2019-05-29 16:58:28 +02:00
c2e2bcbca9 Fix -Werror=maybe-uninitialized in GLES2 on release builds
Issue introduced in #28796.
2019-05-29 16:40:06 +02:00
b374a9ff69 Merge pull request #29255 from Calinou/doc-improve-primitivemeshes
Improve the PrimitiveMesh-derived class documentations
2019-05-29 13:17:15 +02:00
e832a3269c Merge pull request #29261 from volzhs/fix-basebutton
Fix BaseButton not emitting signal with virtual function
2019-05-29 13:16:02 +02:00
7a8dcb9a11 Merge pull request #29244 from akien-mga/main-print-version
Print engine version to stdout when starting Godot
2019-05-29 11:04:20 +02:00
c71f9b29ff Merge pull request #29259 from mhilbrunner/ignore-all-the-things
.gitignore improvements for Windows/macOS
2019-05-29 10:42:29 +02:00
3f11505f4f Merge pull request #29253 from IronicallySerious/remove-duplicate-plugin
Remove duplicate audio bus plugin registry
2019-05-29 10:42:09 +02:00
36591b1ae8 Merge pull request #28416 from JellyWX/binary-literals
Support for binary literals in GDScript
2019-05-29 08:41:05 +02:00
123edd04c0 Merge pull request #29270 from Chaosus/fix_vs_init_bug
Fix incorrect scroll when the user perform first action on visual shader
2019-05-29 07:58:15 +03:00
cd3d538f12 Fix incorrect scroll when the user perform first action on visual shader 2019-05-29 07:41:29 +03:00
5c01e066e1 Fix BaseButton not emitting signal with virtual function
Fix #29258
2019-05-29 06:28:34 +09:00
bbb1af91d8 Merge pull request #29251 from qarmin/some_uninitialised_values_fixes
Fix some unintialised variables
2019-05-28 22:29:02 +02:00
84331549db Merge pull request #28896 from Ranoller/master
Fix tilemap displaced textures and shapes
2019-05-28 22:25:18 +02:00
b0279192cb .gitignore improvements for Windows/macOS 2019-05-28 22:21:29 +02:00
80f7a19569 Merge pull request #28789 from mitchcurtis/quick-open
Add Quick Open dialog
2019-05-28 20:45:52 +02:00
35d4be1581 Merge pull request #28675 from wombatstampede/master
Android: Include Joysticks/Gamepads which are available on app start.
2019-05-28 20:38:13 +02:00