Skip to content

Conversation

@smix8
Copy link
Contributor

@smix8 smix8 commented Jun 25, 2023

Updates navigation different actor types.

Godot 4.0 version of #7557.

PoolloverNathan and others added 30 commits March 17, 2023 21:32
…ting macros with a short list of supported macros
Since there is no "3.x " branch of the docs, I'm not sure which branch the link should point to instead. I went with the latest 3.x, but maybe 3.0 is better?
Updates NavigationObstacle doc for avoidance rework.
This also adds a tip about using a NoiseTexture3D as particle attractor
vector field texture.
Co-authored-by: Clay John <claynjohn@gmail.com>
Updates NavigationAgent doc for avoidance rework.
Fixes wrong navigation agent example code.
The code was originally using Physics2DServer which has been renamed to PhysicsServer2D in 4.x
…ry to work (#7379)

Co-authored-by: Max Hilbrunner <mhilbrunner@users.noreply.github.com>
atomikf and others added 17 commits June 14, 2023 10:41
Small typo correction.
There is a line "Set the base window width to 720 and window height to 1080." It seems the 1080 should be changed to 1280.
….rst

The code example at the end of the openXR passthrough tutorial refers to the `XR_ENV_BLEND_MODE_ALPHA_BLEND`  constant. That constant, however, is not accessible in the scope. Instead, it is a member of the `xr_interface` object.
Minor grammar correction in your_first_3d_shader.rst
Mark cutout_animation as outdated
Update multiple_resolutions.rst
Replace references to interpolate_baked with sample_baked.
Update physics material info on instancing page
Fix references to XR_ENV_BLEND_MODE_ALPHA_BLEND in openxr_passthrough
Change WORLD_NORMAL_MATRIX to MODEL_NORMAL_MATRIX
…method

changed collisionInfo.Normal to collisionInfo.GetNormal()
Updates to visual_shaders.rst to show new way to create visual shaders
Updates navigation different actor types.
@skyace65 skyace65 added bug enhancement area:manual Issues and PRs related to the Manual/Tutorials section of the documentation labels Jun 25, 2023
@Piralein
Copy link
Member

Is this supposed to target the master branch?

@smix8
Copy link
Contributor Author

smix8 commented Jun 30, 2023

Is this supposed to target the master branch?

This is the Godot 4.0 version.
The Godot 4.1 version is #7557.

I am not sure if master is already set for 4.1 or not.

@Piralein
Copy link
Member

#7557 is also targeting master.
The current master branch is the 4.1 (technically 4.2 at this point), a change only for 4.0 needs to target the 4.0 branch.

@skyace65
Copy link
Contributor

skyace65 commented Jul 4, 2023

Piralein is right. I've merged the 4.1 version into the master branch. This PR needs to be changed to target the 4.0 branch.

@smix8 smix8 changed the base branch from master to 4.0 July 5, 2023 08:59
@smix8
Copy link
Contributor Author

smix8 commented Jul 5, 2023

Na forget this pr, the amount of change git wants me to do to rebase this back is horrendous, I am making a new pr.

@smix8 smix8 closed this Jul 5, 2023
@smix8 smix8 deleted the diff_navagent_update_4.x branch July 5, 2023 09:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

archived area:manual Issues and PRs related to the Manual/Tutorials section of the documentation bug enhancement

Projects

None yet

Development

Successfully merging this pull request may close these issues.