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

fix: change object location and iteraction #134

Merged
merged 2 commits into from
Oct 11, 2024

Conversation

poschuler
Copy link
Member

  • Fix the computer location and interaction in house_1, after last commit for some reason computer disappeared and interaction stop working. I had to change the object pos and k.query by map.query

Copy link

⚠️ MERGE CONFLICT DETECTED!

@poschuler A possible conflict has been detected, you will need to resolve this before your pull request can be merged. The most common reason conflicts occur, is when the contributor does not run git pull origin master before pushing their new changes.

Before we can merge the code, you will need to resolve the conflict, check out these videos by Aldo: How To Get Started With Open Source and How To Resolve Git Merge Conflicts. If you get stuck ask over on Discord.

Copy link

⚠️ MERGE CONFLICT DETECTED!

@poschuler A possible conflict has been detected, you will need to resolve this before your pull request can be merged. The most common reason conflicts occur, is when the contributor does not run git pull origin master before pushing their new changes.

Before we can merge the code, you will need to resolve the conflict, check out these videos by Aldo: How To Get Started With Open Source and How To Resolve Git Merge Conflicts. If you get stuck ask over on Discord.

1 similar comment
Copy link

⚠️ MERGE CONFLICT DETECTED!

@poschuler A possible conflict has been detected, you will need to resolve this before your pull request can be merged. The most common reason conflicts occur, is when the contributor does not run git pull origin master before pushing their new changes.

Before we can merge the code, you will need to resolve the conflict, check out these videos by Aldo: How To Get Started With Open Source and How To Resolve Git Merge Conflicts. If you get stuck ask over on Discord.

Copy link

🙏 Thanks for your pull request @poschuler, The team will now review and merge this request. In the mean time why not check out some of the other opensource projects available, contributions are greatly appreciated!

Some of the most popular are


PR Statistics

#️⃣ PR Number: Line Additions: 🗑️ Line Deletions:
134 7 6
📑 Files Changed: Repo Stars: 🔱 Total Forks:
2 27 70

1 similar comment
Copy link

🙏 Thanks for your pull request @poschuler, The team will now review and merge this request. In the mean time why not check out some of the other opensource projects available, contributions are greatly appreciated!

Some of the most popular are


PR Statistics

#️⃣ PR Number: Line Additions: 🗑️ Line Deletions:
134 7 6
📑 Files Changed: Repo Stars: 🔱 Total Forks:
2 27 70

Copy link
Collaborator

@r4pt0s r4pt0s left a comment

Choose a reason for hiding this comment

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

🔥🔥🔥
Yeah sorry for that one. I had to refractor the base of the game.
Thanks for fixing it 🙏🏻

@r4pt0s r4pt0s merged commit 148b2f7 into zero-to-mastery:main Oct 11, 2024
1 check passed
@poschuler poschuler deleted the bug/fix-computer-house-1 branch October 11, 2024 10:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants