Commit graph

18342 commits

Author SHA1 Message Date
Windy Darian
d9d6119b6e Partial fix for blend shape with gltf
This fixes https://github.com/godotengine/godot/issues/20377 , where blend shape scales the mesh if the mesh is also skinned.
The issue was that the blend shape was trying to blend using BLEND_SHAPE_MODE_RELATIVE (directly adding everything in morph shape as displacement), while bone weights were copied in the morph shape, which resulted in 2x bone weights causing mesh to become bigger when blended.
Setting the blend mode to BLEND_SHAPE_MODE_NORMALIZED while guaranteeing the data is correct fixes the issue (previously treating gltf2's morph displacement data as blend target data).  Ideally we still want to use BLEND_SHAPE_MODE_RELATIVE since it may need much less data, but that seems to require a larger refactor?
2018-12-29 01:13:35 -05:00
Rémi Verschelde
ee6f1fa3f8 doc: Fix references to setters and misc formatting 2018-12-29 00:17:09 +01:00
Rémi Verschelde
04c8a43741
Merge pull request #24629 from hedin-hiervard/master
fixes crash when Body2DSW doesn't have space
2018-12-28 07:47:35 +01:00
Juan Linietsky
a366d45856 -Implented 2D Mesh support for GLES2
-Implemented 2D Skeleton deform for GLES2
-Implement Multimesh support for GLES2, closes #20524, closes #21839
2018-12-27 20:41:04 -03:00
hedin
1dfdd6834e fixes crash when Body2DSW doesn't have space 2018-12-27 19:29:47 +02:00
Rémi Verschelde
9c135ad263
Merge pull request #24625 from akien-mga/ios-sim-x86_64
SCons: Drop ios_sim option forcing x86, simulator needs x86_64
2018-12-27 17:26:51 +01:00
Rémi Verschelde
95e96947f6 SCons: Drop ios_sim option forcing x86, simulator needs x86_64 2018-12-27 14:11:13 +01:00
Rémi Verschelde
daa50b28f2
Merge pull request #24607 from PJB3005/18-12-26-makerst-cleanup
Clean up & improve makerst.py
2018-12-27 14:08:16 +01:00
Pieter-Jan Briers
15a3d16d08 Clean up & improve makerst.py
Man this file even had some semicolons in it.

I cleaned up the entire file, while it's still pretty ugly it's much better now.
I also added type checks so it passes mypy --strict.
make_type now throws a warning on unresolved type references, which there are a bunch of. I'm not responsible for fixing those though.
Also some more hardening against crashes. For example XML tags without content won't cause crashes now.
Functionality has not been modified as far as I can tell.

Update Makefile for Python 3

Fix ordering issues related to enums & constants
2018-12-27 13:57:08 +01:00
Rémi Verschelde
e3e36c963f
Merge pull request #24588 from volzhs/tree-relationship-line
Draw relationship lines when its value is higher than 0
2018-12-27 11:19:20 +01:00
Rémi Verschelde
2e39e38c10 doc: Sync classref with current source
Fix various code formatting issues and argument names.
2018-12-27 11:10:18 +01:00
Rémi Verschelde
be4b7da518
Merge pull request #24623 from akien-mga/obj-mtl-not-found
Make error more explicit when OBJ/MTL files are missing
2018-12-27 11:06:51 +01:00
Rémi Verschelde
9c7ca687b2 Make error more explicit when OBJ/MTL files are missing
Fixes #24595.
2018-12-27 10:39:43 +01:00
Rémi Verschelde
de4d7a785e Fix size in HeightMapShapeBullet::set_data 2018-12-27 10:29:25 +01:00
Ignacio Etcheverry
ac118434ee
Merge pull request #24622 from Supatier/fix-vscode-w-uncommon-exec-name
Fix: Cannot find code editor: VSCode; although installed on linux
2018-12-27 10:13:04 +01:00
Rémi Verschelde
4caa4e1af5
Merge pull request #24616 from Anutrix/master
Added description to move_axis_lock members in Kinematic.xml
2018-12-27 10:04:24 +01:00
Rémi Verschelde
32a7c05eb4
Merge pull request #24610 from Faless/emws_buf_size_fixes
Fix HTML5 WebSocket client buffers size.
2018-12-27 09:45:25 +01:00
Supatier
b173eed8aa
Fix Godot unable to find VSCode binary
VSCode's executable name is not uniform and godot only search for "code".
2018-12-27 15:16:29 +07:00
Rémi Verschelde
22f8ae67a2
Merge pull request #24583 from YeldhamDev/tileset_editor_fixes
General fixes for the TileSet editor
2018-12-27 09:15:08 +01:00
Rémi Verschelde
e2d9035806
Merge pull request #24586 from Xrayez/valid-hex-number-bind
Bind `is_valid_hex_number` string method to GDScript
2018-12-27 09:08:07 +01:00
Rémi Verschelde
e86418f7a9
Merge pull request #24566 from thomasruiz/fix/completion-box-center-text-vertically
Center lines vertically in completion box
2018-12-27 08:55:17 +01:00
Rémi Verschelde
a1fa614e78
Merge pull request #24561 from KellyThomas/fix-antiquewhite
fix capitalization for antiquewhite
2018-12-27 08:52:10 +01:00
Rémi Verschelde
d13c292c1a
Merge pull request #24565 from daniel-abbott/bullet_rest_info_return_normals_fix
`GodotRestInfoContactResultCallback::addSingleResult` now returns normal
2018-12-27 08:46:54 +01:00
Rémi Verschelde
73847cc0bb
Merge pull request #24553 from thomasruiz/fix/caret-size-with-big-line-height
Fix caret size with font smaller than row height
2018-12-27 08:39:49 +01:00
unknown
9f4689f844 Added description to move_axis_lock members in Kinematic.xml 2018-12-27 07:58:03 +05:30
Fabio Alessandrelli
77466285f2 Fix HTML5 WebSocket client buffers size. 2018-12-26 17:51:12 +01:00
volzhs
6a43f0a901 Draw relationship lines when its value is higher than 0 2018-12-25 09:18:18 +09:00
Michael Alexsander Silva Dias
8aad7ef016 General fixes for the TileSet editor 2018-12-24 18:27:43 -02:00
Andrii Doroshenko (Xrayez)
b8f1fe9ed8 Bind is_valid_hex_number string method to GDScript 2018-12-24 20:54:36 +02:00
Thomas Ruiz
d2fa0658a2
Fix caret size with font smaller than row height 2018-12-23 14:29:33 +01:00
Thomas Ruiz
7fb0853c68
Center lines vertically in completion box 2018-12-23 12:19:27 +01:00
Daniel Abbott
572367552c GodotRestInfoContactResultCallback::addSingleResult now returns normal
`PhysicsDirectSpaceState.get_rest_info()` now provides normals in result
Addresses issue 24558
2018-12-22 19:26:18 -07:00
Kelly Thomas
a5e38586ce fix capitalization for antiquewhite 2018-12-23 08:00:35 +08:00
Rémi Verschelde
10e9221c49
Merge pull request #24546 from guilhermefelipecgs/fix_blend_tree
Fix blend tree generating wrong node names
2018-12-22 17:25:11 +01:00
Guilherme Felipe
8a202bc223 Fix blend tree generating wrong node names
Now it's possible to connect nodes again.
2018-12-22 12:18:04 -02:00
Rémi Verschelde
404f394226
Merge pull request #24536 from nekomatata/android-gles3
GLES3 Fragment shader error fix for Android
2018-12-21 22:25:03 +01:00
PouleyKetchoupp
ab7759dbd1 Fixed fragment shader compilation error on android (S0001: Cannot compare 'float' with 'int') 2018-12-21 20:31:10 +01:00
Rémi Verschelde
a0d8bfb0d2
Merge pull request #24529 from akien-mga/opengl-2.1-lowp
GLES2: Define 'lowp' for OpenGL 2.1
2018-12-21 15:56:05 +01:00
Rémi Verschelde
0d3c6fae35
Merge pull request #22775 from KellyThomas/named-colors
[Mono] Color - add ColorN() and named color properties
2018-12-21 15:51:46 +01:00
Rémi Verschelde
57416bfbce GLES2: Define 'lowp' for OpenGL 2.1
Precision qualifiers are only used on OpenGL ES 2.0 and 3.0,
and while OpenGL 3.3 defines them for compatibility (but without
practical effect), they're missing from OpenGL 2.1, so we define
them to prevent compilation errors.

Fixes #24521.
2018-12-21 15:14:58 +01:00
Rémi Verschelde
762b9b6bdb
Merge pull request #24527 from akien-mga/pm-warn-config-version
ProjectManager: Warn when projects have different config_version
2018-12-21 14:43:51 +01:00
Juan Linietsky
7b1cbe9874 Reverse RGBA shadow test on GLES2 2018-12-21 10:02:43 -03:00
Juan Linietsky
7535c5a56a Further GLES2 fixes 2018-12-21 10:01:16 -03:00
Juan Linietsky
9ea27ec032 Fixes to framebuffer formats for GLES2, closes #24518 2018-12-21 09:50:57 -03:00
Rémi Verschelde
616beb1041 ProjectManager: Warn when projects have different config_version
When opening projects for edition through the project manager, the
following checks are now done:

1. If the config_version is lower than the one used by the current
   engine version, users are asked if they want to convert to the new
   format or abort editing. Fixes #20626.
2. If the config_version is higher than the expected one (project
   from a more recent and incompatible engine version), projects are
   grayed out and can't be edited. Fixes #18758.

When editing from the command line, the behaviour is unchanged:
projects in situation (1) are automatically converted, while projects
in situation (2) show an error message (made more explicit).

The "Run" option from the project manager was not changed, so it will
still run (1) projects without converting them, and fail running (2)
projects.

Co-authored-by: groud <gilles.roudiere@gmail.com>
2018-12-21 12:45:27 +01:00
Rémi Verschelde
be8c0d57c5
Merge pull request #24519 from Chaosus/error_label_fix
Change LinkLabel back to Label in error status bar
2018-12-21 10:14:04 +01:00
Rémi Verschelde
beccbe1efb
Merge pull request #24516 from YeldhamDev/scons_gui_3d
Fix possible error in "disable_advanced_gui" flag's description
2018-12-21 10:10:46 +01:00
Rémi Verschelde
f09956c86c
Merge pull request #24513 from YeldhamDev/fix_tileset_editor_draw
Fix small drawing error in TileSet editor
2018-12-21 10:09:00 +01:00
Rémi Verschelde
0b774d47e6
Merge pull request #24509 from guilhermefelipecgs/fix_24273
Add bind for TileMap::get_cell_autotile_coord
2018-12-21 10:08:03 +01:00
Rémi Verschelde
83c3cba640
Merge pull request #24508 from guilhermefelipecgs/fix_22756
Fixes for TileSetEditor and TileMapEditor
2018-12-21 10:05:53 +01:00