Commit Graph

16284 Commits

Author SHA1 Message Date
Andrea Catania 9b446f1cc3 Optimized in case is used just 1 shape with no transform 2018-09-06 18:19:05 +02:00
Juan Linietsky 5307043751 Fixes to multimesh, added custom data and checks to avoid reconfiguring if instance count > 0. Fixes #12595 2018-09-05 19:15:59 -03:00
Rémi Verschelde fc207ba18a
Merge pull request #21782 from eska014/gles3-get-texture-err
Fix missing texture-download error with OpenGL ES
2018-09-05 22:12:28 +02:00
Leon Krause 57eaea571a Fix missing texture-download error with OpenGL ES 2018-09-05 21:22:13 +02:00
Rémi Verschelde 3a8f8381f2
Merge pull request #21771 from WiggleWizard/get-stack-fix
Fixed return type for get_stack() function call
2018-09-05 19:46:12 +02:00
Rémi Verschelde 8804eb8c06
Merge pull request #21707 from JFonS/fix_instanced_selection
Fix selection of instanced scenes in 3D
2018-09-05 18:11:56 +02:00
Rémi Verschelde 2f4912ec69
Merge pull request #21767 from volzhs/expand-collapse-all
Make expand/collapse all properties menu working
2018-09-05 18:04:44 +02:00
Rémi Verschelde 021159330c
Merge pull request #21766 from volzhs/bitmask-color
Make better look for bitmask
2018-09-05 18:03:40 +02:00
Rémi Verschelde 49495eab8d
Merge pull request #21774 from AndreaCatania/areaTri
Fixed bullet area vs Trimesh shape overlap
2018-09-05 14:40:54 +02:00
Andrea Catania ce138d3449 Fixed bullet area vs Trimesh shape overlap 2018-09-05 13:43:02 +02:00
WiggleWizard d227a9ae12 Fixed return type for get_stack() function call 2018-09-05 11:29:06 +01:00
volzhs ce4067e38b Make expand/collapse all properties menu working 2018-09-05 11:03:10 +09:00
volzhs 192beed068 Make better look for bitmask 2018-09-05 10:49:48 +09:00
Thomas Herzog 93a888e81e
Merge pull request #21754 from willnationsdev/fix-script-class-ns
Fix invalid deref in NativeScript script classes
2018-09-04 17:26:10 +02:00
Will Nations fadf2d2afd Fix invalid deref in NativeScript script classes 2018-09-04 08:35:28 -05:00
Rémi Verschelde e8a6c5844a
Merge pull request #21747 from akien-mga/split-particlesmaterial
Move ParticlesMaterial code to its own resource file
2018-09-04 15:27:19 +02:00
Rémi Verschelde ab0d4fd762 Style: Format generated shader code in ParticlesMaterial 2018-09-04 13:21:53 +02:00
Rémi Verschelde 5fe01d4cfc Move ParticlesMaterial code to its own resource file
It's shared by both 2D and 3D particles (+ CPU ones), so it makes sense
to have as a common resource. It also allowed to disable compilation of
Particles (3D) when using 'disable_3d'.

Also cleaned up includes in SpatialEditorGizmos and some other places,
as well as dropped dead code in material_editor_plugin.cpp.
2018-09-04 11:32:56 +02:00
Rémi Verschelde a1b578562a
Merge pull request #21741 from capnm/fix-custom-cursor-hotspot
Really fix the custom cursor hotspot
2018-09-04 08:41:18 +02:00
Martin Capitanio bcee65284e Really fix the custom cursor hotspot
Add check for negative values.

Fixes #21721
2018-09-04 04:42:23 +02:00
Rémi Verschelde f50dd682f6
Merge pull request #21727 from guilhermefelipecgs/fix_cursor_hotspot
Fix custom cursor hotspot
2018-09-03 16:04:38 +02:00
Guilherme Felipe e5470cfa70 Fix custom cursor hotspot
Cursor hotspot must be inside image on Linux. Adding validation for all
platforms for consistency.
2018-09-03 09:57:07 -03:00
Rémi Verschelde 1ebfd918d4
Merge pull request #21723 from volzhs/gles2-splash-fullsize
Respect splash fullsize option on GLES2
2018-09-03 14:07:36 +02:00
volzhs d5354e2e8f Respect splash fullsize option on GLES2 2018-09-03 19:48:12 +09:00
Rémi Verschelde 6ead00733a
Merge pull request #21714 from avencherus/multi-screen-center
Added multi-monitor support for center_window()
2018-09-03 08:26:17 +02:00
Jared 4ccf25a577 Added multi-monitor support for center_window() 2018-09-03 07:41:04 +03:00
JFonS 4a412943d4 Fix selection of instanced scenes in 3D 2018-09-02 22:31:03 +02:00
Juan Linietsky 19d57894d8 Change ResourceLoader::load to make it more thread safe. 2018-09-02 14:00:16 -03:00
Rémi Verschelde 8af9d1fc03
Merge pull request #21693 from akien-mga/phymat-no-override-if-unneeded
PhysicsBody: Don't create PhysicsMaterial override for default friction/bounce
2018-09-02 17:58:15 +02:00
Rémi Verschelde cdbc172a55
Merge pull request #21694 from guilhermefelipecgs/fix_invert_color
[Texture Import] Fix invert color
2018-09-02 17:48:25 +02:00
Guilherme Felipe 4356af2a68 [Texture Import] Fix invert color 2018-09-02 11:35:48 -03:00
Rémi Verschelde 60570a5e60 PhysicsBody: Don't create PhysicsMaterial override for default friction/bounce
And don't save physics_material_override if null.
2018-09-02 15:08:43 +02:00
Rémi Verschelde 457108924f
Merge pull request #21687 from Calinou/fix-osx-project-manager-size
Fix the project manager window size on hiDPI displays on macOS
2018-09-02 12:24:13 +02:00
Hugo Locurcio 9c5ce5cf58
Fix the project manager window size on hiDPI displays on macOS
This closes #21525.
2018-09-02 11:52:26 +02:00
Rémi Verschelde 737c90963f
Merge pull request #21636 from akien-mga/docdata-variant
DocData: Fix return type listed as "var" instead of "Variant"
2018-09-01 23:40:11 +02:00
Rémi Verschelde e60408b0e9
Merge pull request #21670 from cbscribe/kcc_class_edits
[DOCS] Classref additions and corrections
2018-09-01 22:55:12 +02:00
Rémi Verschelde 4e6c89dbce
Merge pull request #21672 from YeldhamDev/gui_input_ev_rename
Change some instances of args named "ev" to "event"
2018-09-01 22:46:43 +02:00
Michael Alexsander Silva Dias cf183efbcf Change some instances of args named "ev" to "event" 2018-09-01 17:03:41 -03:00
Rémi Verschelde ab60283798
Merge pull request #21663 from Calinou/fix-editor-shortcut-defaults
Fix some editor shortcuts' default values not being set properly
2018-09-01 20:40:29 +02:00
Chris Bradfield c049c8fbb9 [DOCS] Classref additions and corrections 2018-09-01 11:07:51 -07:00
Rémi Verschelde 88b56634f3
Merge pull request #21657 from DualMatrix/array_dup
Fixed duplicating AnimationPlayers leaving empty tracks.
2018-09-01 17:37:43 +02:00
Rémi Verschelde 8cff3074b2
Merge pull request #21652 from KellyThomas/classdb-signals
Improve ClassDB information for some some signal parameters
2018-09-01 16:27:58 +02:00
Rémi Verschelde 8c8cb1f16d
Merge pull request #21658 from ibrahn/remove-unused-editor-genheaders
Removed some unneeded generated headers from the editor directory SCsub.
2018-09-01 16:24:45 +02:00
Rémi Verschelde 42f1ac2908
Merge pull request #21632 from JFonS/fix_15166
Fix handling of shader constants that caused crash, closes #15166
2018-09-01 16:24:04 +02:00
Hugo Locurcio af139af69e
Fix some editor shortcuts' default values not being set properly
This also changes the uppercase/lowercase/capitalize shortcuts
to Shift+F4, Shift+F5 and Shift+F6 respectively to avoid conflicts
with the new Find Next shortcut.

This closes #21612.
2018-09-01 16:20:47 +02:00
Rémi Verschelde cd438d5662
Merge pull request #21656 from ibrahn/fixup-license-shortnames
Fixed up a couple of license names in COPYRIGHT.txt
2018-09-01 14:08:13 +02:00
Ibrahn Sahir 02693b9af6 Removed some unneeded generated headers from the editor directory SCsub.
These headers are currently built in (and included from) the core directory.
Removing the editor directory versions to avoid confusion.
2018-09-01 13:00:04 +01:00
DualMatrix a35286e24b Fixed duplicating AnimationPlayers leaving empty tracks.
Fixed duplicating AnimationPlayers leaving empty tracks.
I don't think duplicating arrays worked before. There was even this weird
//does not make a long of sense but should work
comment at the changed line. Fixes #21616
2018-09-01 13:56:17 +02:00
Ibrahn Sahir 6f2977f9c3 Fixed up a couple of license names in COPYRIGHT.txt
A couple of entries were using SPDX name over the Debian standard ones.
Switched these over and noted this policy at the top of the file to avoid
confusion.
2018-09-01 12:49:09 +01:00
Kelly Thomas 1dc8e7c05f Improve ClassDB information for some some signal parameters 2018-09-01 18:05:51 +08:00