summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* clang-format: Sync config with LLVM 13Rémi Verschelde2021-10-222-20/+81
| | | | | | | Disable minimum amount of spaces in comment prefix for now, as it otherwise modifies the whole codebase. That's something we probably want to use as it matches our convention, but we should look into fully converting these comments to our style guide at the same time.
* Merge pull request #53992 from Calinou/hard-shadow-mapping-allow-ditheringRémi Verschelde2021-10-226-16/+41
|\
| * Add Soft Very Low shadow quality mode for 3DHugo Locurcio2021-10-216-16/+41
| | | | | | | | | | | | | | This can be used to improve 3D shadow rendering quality at little performance cost. Unlike the existing Hard setting which is limited to variable shadow blur only, it works with both fixed blur and variable blur.
* | Merge pull request #54081 from Rubonnek/add_bin_messages_masterRémi Verschelde2021-10-221-1/+1
|\ \
| * | Accept capital B in String::bin_to_int prefixWilson E. Alvarez2021-10-211-1/+1
| | |
* | | Merge pull request #53781 from m4gr3d/restrict_project_data_dir_config_masterRémi Verschelde2021-10-227-21/+32
|\ \ \
| * | | Restrict the project data directory configurationne0fhyk2021-10-187-21/+32
| | | |
* | | | Merge pull request #54126 from Chaosus/vs_fix_curve_textureRémi Verschelde2021-10-221-6/+15
|\ \ \ \
| * | | | Fix error spam at setting a CurveTexture in visual shadersYuri Roubinsky2021-10-221-6/+15
| | | | |
* | | | | Merge pull request #53812 from RandomShaper/expose_flush_inputRémi Verschelde2021-10-222-0/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Expose Input::flush_buffered_events()Pedro J. Estébanez2021-10-222-0/+8
| | | | |
* | | | | Merge pull request #54088 from madmiraal/remove-unimplemented-methodsRémi Verschelde2021-10-2266-171/+2
|\ \ \ \ \
| * | | | | Remove unimplemented methodsMarcel Admiraal2021-10-2166-171/+2
| | | | | |
* | | | | | Merge pull request #54090 from Scony/fix-exit-code-on-check-onlyRémi Verschelde2021-10-221-0/+2
|\ \ \ \ \ \
| * | | | | | Fix exit code for --script --check-only, fixes #54087Pawel Lampe2021-10-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this commit makes godot executable to return zero exit code once a valid script is passed via --script during --check-only
* | | | | | | Merge pull request #54113 from ↵Rémi Verschelde2021-10-221-2/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | skimmedsquare/canvas-layer-notification-crash-54098
| * | | | | | | Fix potential nullptr dereference in CanvasLayerSean Kim2021-10-211-2/+6
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Changed another instance of ERR_FAIL_COND in the same file to ERR_FAIL_NULL_MSG instead. * Checked for potential access of the viewport pointer elsewhere in same file. Fixes #54098
* | | | | | | Merge pull request #54109 from raulsntos/patch-1Rémi Verschelde2021-10-221-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix `bin_to_int` documentation examplesRaul Santos2021-10-221-2/+2
| |/ / / / / / | | | | | | | | | | | | | | The `bin_to_int` method uses the `0b` prefix.
* | | | | | | Merge pull request #54110 from nekomatata/fix-rigid-body-update-collision-layerRémi Verschelde2021-10-223-2/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix RigidDynamicBody collision update after changing collision layer/maskPouleyKetchoupp2021-10-213-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing the collision layer of a sleeping body was not triggering area updates correctly. Bodies need to be active for collision to be checked against already overlapping bodies and areas. Neighbors need to be activated too in order to handle the case where a static body is modified (it can't be activated directly but paired bodies need to check their collision again). In 3D, moved the call to wakeup() from the physics server to GodotBody3D::_shapes_changed to make it consistent with 2D and also handle the case where shapes are modified (_shapes_changed is called in both this case and collision layer changes).
* | | | | | | Merge pull request #54082 from Chaosus/fix_shader_crashYuri Roubinsky2021-10-211-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Prevent shader crash when passing constant expression to `textureGather`Yuri Roubinsky2021-10-211-0/+1
| | | | | | |
* | | | | | | Merge pull request #54078 from Rubonnek/add_hex_messages_masterRémi Verschelde2021-10-211-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add error messages to `String::hex_to_int`, and accept capital X in prefix
| * | | | | | | Add error messages to String::hex_to_int, and accept capital X in prefixWilson E. Alvarez2021-10-211-2/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #52367 from Duroxxigar/improve-nav-error-messagesRémi Verschelde2021-10-214-6/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Improve readability for failing errors in nav area
| * | | | | | | Improved readability for failing error conditionsDuroxxigar2021-10-084-6/+6
| | | | | | | |
* | | | | | | | Merge pull request #54077 from Duroxxigar/scenetreetimer-exampleRémi Verschelde2021-10-211-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Update example code for SceneTreeTimer to reflect new await keyword
| * | | | | | | | Update example code for SceneTreeTimer to reflect new await keywordDuroxxigar2021-10-211-1/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #54053 from nekomatata/fix-soft-body-disable-modeRémi Verschelde2021-10-213-7/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix SoftDynamicBody3D crash when setting disable mode
| * | | | | | | | | Fix SoftDynamicBody3D crash when setting disable modePouleyKetchoupp2021-10-213-7/+3
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Proper logic for changing physics state when disabled and disabled mode is changed (it was unnecessarily making calls to re-initialize physics). Extra error handling in soft body implementations to avoid crashes with invalid mesh.
* | | | | | | | | Merge pull request #54035 from Calinou/ctl-context-dialog-use-title-caseRémi Verschelde2021-10-212-48/+48
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Use TitleCase for CTL dialog menu options
| * | | | | | | | | Use TitleCase for CTL dialog menu optionsHugo Locurcio2021-10-212-48/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is more consistent with other actions exposed in the dialog.
* | | | | | | | | | Merge pull request #53990 from Kemikal1/masterRémi Verschelde2021-10-212-4/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Change the unreacheable return value of shape_find_owner()
| * | | | | | | | | | Change the unreacheable return value of shape_find_owner()Kemikal12021-10-212-4/+4
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update collision_object_3d.cpp 2d modified and UINT32 usage Proper uINT32max usage Change the unreacheable return value of shape_find_owner() This reverts commit 5be98b81428169ba2dd5baecd00f1adfd9260e5c, reversing changes made to efa3ff6b9587d674cd448aca32abfd31b2c7f4d3. Change the unreacheable return value of shape_find_owner() changed from 0 to uint32_max" This reverts commit c143bb099af2666454f82428a57f2721af60a84d. Revert "changed from 0 to uint32_max"" This reverts commit 59e94edb9a32edff15f3cb881e6fc394d2aa7f65. Revert "changed from 0 to uint32_max" This reverts commit c143bb099af2666454f82428a57f2721af60a84d. Revert "Revert "changed from 0 to uint32_max""" This reverts commit c81d1073ec21b4cde4684a6dbd595f3359283bad. Revert "changed from 0 to uint32_max" This reverts commit c143bb099af2666454f82428a57f2721af60a84d. Revert "changed from 0 to uint32_max"" This reverts commit 59e94edb9a32edff15f3cb881e6fc394d2aa7f65. Revert "Revert "changed from 0 to uint32_max""" This reverts commit 6dbd972aa5c4580d4f6270ead6c66eea18617f29. Revert "changed from 0 to uint32_max"" This reverts commit 59e94edb9a32edff15f3cb881e6fc394d2aa7f65. Revert "Revert "changed from 0 to uint32_max""" This reverts commit b769ac2d11ad12f02a388d9dad17519f81d9c3b6. Revert "Revert "Revert "changed from 0 to uint32_max"""" This reverts commit 1e8d84f7ec12da01c3153e08bb8609cf2c6fd58a. Revert "Revert "Revert "Revert "changed from 0 to uint32_max""""" This reverts commit 0dc17abefad6d540c18bba7b4df9d8c04e090d0c. Change the unreacheable return value of shape_find_owner()
* | | | | | | | | | Merge pull request #54063 from Chaosus/shader_fix_spatial_samplersYuri Roubinsky2021-10-211-0/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix built-in texture samplers passing for spatial shader modeYuri Roubinsky2021-10-211-0/+4
| | | | | | | | | |
* | | | | | | | | | Merge pull request #54070 from KoBeWi/meh_instance_2dRémi Verschelde2021-10-212-0/+5
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix MeshInstance2D rectkobewi2021-10-212-0/+5
|/ / / / / / / / /
* | | | | | | | | Merge pull request #54015 from BastiaanOlij/godot-cpp-ciRémi Verschelde2021-10-212-0/+52
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Add CI step for compiling and testing godot-cppBastiaan Olij2021-10-212-0/+52
| | | | | | | | |
* | | | | | | | | Merge pull request #54036 from nekomatata/fix-soft-body-memory-corruptionRémi Verschelde2021-10-212-47/+50
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix SoftDynamicBody3D memory corruption when switching mesh at runtimePouleyKetchoupp2021-10-202-47/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When switching the mesh at runtime, the physics server wasn't properly updated with the new mesh. Now we keep track of the soft body mesh to make sure everything is properly initialized on pre-draw. Also cleaned a few things around private methods.
* | | | | | | | | | Merge pull request #54032 from nekomatata/fix-collision-mouse-exit-errorRémi Verschelde2021-10-211-3/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix errors in mouse detection when removing collision object from treePouleyKetchoupp2021-10-201-3/+6
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now behaves the same way as ui elements, mouse exit is skipped when the object is removed from the tree.
* | | | | | | | | | Merge pull request #54011 from nekomatata/center-of-mass-2d-transformRémi Verschelde2021-10-214-12/+26
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix 2D center of mass not updated from transformPouleyKetchoupp2021-10-194-12/+26
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Same logic as what was done in 3D, applied to 2D center of mass. Also did some minor cleanup in 3D and fixed center of mass transform during the first frame after teleporting a dynamic body.
* | | | | | | | | | Merge pull request #53161 from Duroxxigar/copy-group-nameRémi Verschelde2021-10-212-45/+69
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Added ability to copy group nameDuroxxigar2021-10-212-45/+69
| | | | | | | | | |
* | | | | | | | | | Main: Fixup --dump-extension-api after #54017Rémi Verschelde2021-10-212-0/+7
| |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That removal was correct, but triggered a bug in our messy-as-heck main.cpp detection logic for editor/project manager/project/command line tool... Fixing this is for another day.