Skip to content

Conversation

nathanfranke
Copy link
Contributor

@nathanfranke nathanfranke commented Sep 8, 2022

@nathanfranke nathanfranke changed the title add file path to change type dialog Add .gitignore, fix build on master Sep 8, 2022
@nathanfranke nathanfranke marked this pull request as ready for review September 8, 2022 08:09
Comment on lines +1 to +21
# C/C++ generated
*.a
*.ax
*.d
*.dll
*.lib
*.lo
*.o
*.os
*.ox
*.Plo
*.so
# Binutils tmp linker output of the form "stXXXXXX" where "X" is alphanumeric
st[A-Za-z0-9][A-Za-z0-9][A-Za-z0-9][A-Za-z0-9][A-Za-z0-9][A-Za-z0-9]

# Python generated
__pycache__/
*.pyc

# Temporary files.
*.tmp
Copy link
Contributor Author

@nathanfranke nathanfranke Sep 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tentative change, copied a few sections from godotengine/godot, and added .tmp on the bottom, since that was the only other file being generated on my end.

(This review shows the whole file, FYI)

@fire
Copy link
Member

fire commented Sep 8, 2022

Do you want to merge this in now or after restoring cicd?

@nathanfranke
Copy link
Contributor Author

Before cicd would be better, that way the checks will pass as long as configuration is correct (and no additional incompatibilities)

@fire
Copy link
Member

fire commented Sep 8, 2022

Can you write up how you generated this? It's not only useful for me to test the change but also as an introduction guide.

Also a how to test guide. I assume it's something like use scons custom_modules=modules

@nathanfranke
Copy link
Contributor Author

Didn't generate anything, all these changes are manual (gitignore is copied though)

@fire
Copy link
Member

fire commented Sep 8, 2022

I checked the latest master.

It's broken

[ 73%] /home/elee/Documents/chibifire/groups-engine-workspace/godot-modules-groups/visual_script/editor/visual_script_editor.cpp:4922:93: error: no member named 'CMD_OR_CTRL' in 'KeyModifierMask'
        ED_SHORTCUT("visual_script_editor/find_node_type", TTR("Find Node Type"), KeyModifierMask::CMD_OR_CTRL + Key::F);
                                                                                  ~~~~~~~~~~~~~~~~~^
/home/elee/Documents/chibifire/groups-engine-workspace/godot-modules-groups/visual_script/editor/visual_script_editor.cpp:4923:93: error: no member named 'CMD_OR_CTRL' in 'KeyModifierMask'
        ED_SHORTCUT("visual_script_editor/create_function", TTR("Make Function"), KeyModifierMask::CMD_OR_CTRL + Key::G);
                                                                                  ~~~~~~~~~~~~~~~~~^
/home/elee/Documents/chibifire/groups-engine-workspace/godot-modules-groups/visual_script/editor/visual_script_editor.cpp:4924:91: error: no member named 'CMD_OR_CTRL' in 'KeyModifierMask'
        ED_SHORTCUT("visual_script_editor/refresh_nodes", TTR("Refresh Graph"), KeyModifierMask::CMD_OR_CTRL + Key::R);
                                                                                ~~~~~~~~~~~~~~~~~^
/home/elee/Documents/chibifire/groups-engine-workspace/godot-modules-groups/visual_script/editor/visual_script_editor.cpp:4925:87: error: no member named 'CMD_OR_CTRL' in 'KeyModifierMask'
        ED_SHORTCUT("visual_script_editor/edit_member", TTR("Edit Member"), KeyModifierMask::CMD_OR_CTRL + Key::E);
                                                                            ~~~~~~~~~~~~~~~~~^
4 errors generated.```

@nathanfranke
Copy link
Contributor Author

Pull godotengine/godot, CMD_OR_CTRL was implemented in godotengine/godot#65241 14 hours ago

@fire
Copy link
Member

fire commented Sep 9, 2022

Looks good to me.

@fire fire merged commit 4261791 into godotengine:main Sep 10, 2022
@nathanfranke nathanfranke deleted the fix branch September 10, 2022 18:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants