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

Office #23

Open
wants to merge 22 commits into
base: main
Choose a base branch
from
Open

Office #23

wants to merge 22 commits into from

Conversation

rafaela-eacf
Copy link
Contributor

Hey guys! This is a combined pr between Dev and I. Here are a few things that we added, so that you can test them:

  • office scene, with clickable character, computer, and phone
    • computer displays unlocked sensors data
    • phone displays unlocked characters
    • added tutorial to lab
  • lab scene with clickable character
    • cleaned up more information from shop and lab tutorial
      Let us know if you guys can find any bugs or UI issues we might have missed!

@devp4
Copy link
Contributor

devp4 commented Dec 12, 2024

Thanks for merging my branch in!

The only issue im facing is I cant buy sensors from the shop anymore.

Nice job!

@rafaela-eacf
Copy link
Contributor Author

Hey Dev, would you mind explaining or screenshotting your issue please? I can't replicate it. I can still buy and place sensors from the shop :(

Copy link
Contributor

@devp4 devp4 left a comment

Choose a reason for hiding this comment

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

Nevermind, restarting godot solved it!

Copy link
Contributor

@emenello emenello left a comment

Choose a reason for hiding this comment

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

Hi Rafaela, just wanted to put in my review that I mentioned in the meeting. The bug happens on New Game. I ran through the tutorial then exit the Office scene. Then if you try to re-enter the office scene, the error happens. I think it has to do with not having a dialogue object for that instance, but still calling it because the office scene was clicked. I'd have to look into it but just having a default dialogue object per character might fix it for now?

@rafaela-eacf
Copy link
Contributor Author

Thank you Eddie. It was exactly what you said. Should be fixed now :)

Copy link
Contributor

@carlsuarez carlsuarez left a comment

Choose a reason for hiding this comment

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

Looks good! Glad to see you figured out adding a tutorial segment.

Copy link
Contributor

@emenello emenello left a comment

Choose a reason for hiding this comment

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

Looks good! Good job on the fix!

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.

4 participants