Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Plug-in restructuring + COGITO Editor tab #311

Merged
merged 11 commits into from
Oct 15, 2024
Merged

Plug-in restructuring + COGITO Editor tab #311

merged 11 commits into from
Oct 15, 2024

Conversation

Phazorknight
Copy link
Owner

  • Moved all /COGITO/ files to addons/cogito/
  • Added plugin in script (so Cogito can be activated/deactivated in the plugin manager and it adds the autoload scripts as well.
  • Added Cogito editor tab to offer some global options.

This adds the Cogito plugin tab at the top and restructures some files.
Very early so bugs and errors are still expected.

If you pull this, you prob want to :
1. Make sure under plug-ins that Cogito is switched off.
2. Make sure all Cogito autoloads are removed.
3. Then reactivate the plug in (this should automaticall add the correct autoloads)
4. Maybe reload the project to be sure.
Still needs a bit more cleanup.
@Phazorknight Phazorknight added the enhancement New feature or request label Oct 11, 2024
@Phazorknight
Copy link
Owner Author

Little heads up: As this moves pretty much all cogito files to a different directory, some references might break (though I tried to update all of them). Might work better if dowloaded and tested in a blank project.

@niefia
Copy link
Collaborator

niefia commented Oct 11, 2024

Have only had a quick look at this so far, will review it properly tomorrow. But just a quick issues fix
Main menu points to incorrect scenes i.e start_game_scene = "res://addons/cogito_plugin/DemoScenes/COGITO_3_Lobby.tscn" instead of res://addons/cogito/DemoScenes/COGITO_3_Lobby.tscn same for Legacy demo

@OvercastInteractive
Copy link
Collaborator

Just a quick look from me as well.

Prior to resolving the issues that @niefia pointed out, I did come across an error where input action "pause" didn't exist, which must have been a custom legacy input action used prior to using the built-in "ui_cancel".

Cogito_Input_Action_Pause_Not_Found

I'll continue testing it out this weekend.

@OvercastInteractive
Copy link
Collaborator

Scene references that I needed to reconnect:
MainMenu.tscn -> MainMenu_SaveSlotManager -> start_game_scene = res://addons/cogito/DemoScenes/COGITO_1_LegacyDemo.tscn
MainMenu.tscn -> LegacyDemoSceneSwitcher -> start_game_scene = res://addons/cogito/DemoScenes/COGITO_1_LegacyDemo.tscn
PauseMenu.tscn -> MenuSceneSwitcher -> main_menu_scene = res://addons/cogito/DemoScenes/COGITO_0_MainMenu.tscn

@Phazorknight
Copy link
Owner Author

@niefia / @OvercastInteractive
Thanks for catching these! These should now be fixed.

@niefia
Copy link
Collaborator

niefia commented Oct 13, 2024

The only other error im seeing is this:
image
which should be fixed by replacing menu_template_manager.gd with menu_template_manager.tscn in autoload

@niefia
Copy link
Collaborator

niefia commented Oct 14, 2024

Can't seem to find any issues with it at this stage, so technically looks good to merge now.

However should probably also make sure all of the moved files match their latest versions on main to avoid losing any progress,
and put a temporary pause on any other PR merges at this stage so that nothing gets lost in the move.

@Phazorknight
Copy link
Owner Author

However should probably also make sure all of the moved files match their latest versions on main to avoid losing any progress,

Agreed, will do one more commit now that grabs the latest from main.

Copy link
Collaborator

@niefia niefia left a comment

Choose a reason for hiding this comment

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

Runs perfectly as expected, so looks good to merge now.
Haven't been able to manually verify every change obviously, but since it runs fine I'd say that's good enough.
If there are any problems introduced with this restructuring I haven't been able to find them.

@Phazorknight Phazorknight merged commit 8b524cd into main Oct 15, 2024
1 check passed
@Phazorknight Phazorknight deleted the developing branch October 15, 2024 16:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants