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

Add a computer sprite to map_start in room 1 (issue #35) #45

Merged
merged 7 commits into from
Oct 1, 2024

Conversation

Karine91
Copy link
Contributor

@Karine91 Karine91 commented Oct 1, 2024

The laptop sprite source is already mentioned in assets credits -> https://opengameart.org/content/lpc-revised-the-office
Added game object to the map and tested for interaction access

Copy link

🙏 Thanks for your pull request @Karine91, 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:
45 33 0
📑 Files Changed: Repo Stars: 🔱 Total Forks:
5 8 21

Copy link

🥳 Congratulations 🎉

Congrats on making your first Pull Request in the Zero To Mastery Organization!
You have been sent an invitation to join the ZTM github organization, please check your emails for further details!

ZTM Profile Badge

If you'd like the ZTM Badge to show up on your profile, you will need to follow this guide!

Copy link

🙏 Thanks for your pull request @Karine91, 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:
45 39 0
📑 Files Changed: Repo Stars: 🔱 Total Forks:
5 8 22

Copy link

⚠️ MERGE CONFLICT DETECTED!

@Karine91 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!

@Karine91 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 @Karine91, 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:
45 40 2
📑 Files Changed: Repo Stars: 🔱 Total Forks:
5 8 22

1 similar comment
Copy link

🙏 Thanks for your pull request @Karine91, 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:
45 40 2
📑 Files Changed: Repo Stars: 🔱 Total Forks:
5 8 22

Copy link

🙏 Thanks for your pull request @Karine91, 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:
45 39 1
📑 Files Changed: Repo Stars: 🔱 Total Forks:
5 8 22

@Karine91
Copy link
Contributor Author

Karine91 commented Oct 1, 2024

Just merged the latest updates and cake bigger than laptop right on it)
image

@Karine91
Copy link
Contributor Author

Karine91 commented Oct 1, 2024

@r4pt0s should I make the laptop bigger and move left?

@r4pt0s
Copy link
Collaborator

r4pt0s commented Oct 1, 2024

@Karine91 do you want to fix it or should I create another issue for it?
I leave it up to you.

@Karine91
Copy link
Contributor Author

Karine91 commented Oct 1, 2024

Ok I will fix that

@r4pt0s
Copy link
Collaborator

r4pt0s commented Oct 1, 2024

@Karine91 you could try to change the stack order by using k.z()

Or move the laptop a bit to the left. It has just to be reachable by the player for interactions.

@Karine91
Copy link
Contributor Author

Karine91 commented Oct 1, 2024

@r4pt0s should cake be interactable?

@r4pt0s
Copy link
Collaborator

r4pt0s commented Oct 1, 2024

@Karine91 that would be great, yes.

@Karine91
Copy link
Contributor Author

Karine91 commented Oct 1, 2024

@r4pt0s I'm not sure what those spawnpoints are, and why we need them for cake position

@r4pt0s
Copy link
Collaborator

r4pt0s commented Oct 1, 2024

@Karine91 no problem. It's just another way of placing objects where you define points in tiled (the software which I mentioned in the Readme).
You can just leave it where it is. I can create another issue to place the cake on the other side 🙌🏻
It should not prevent your PR for getting merged

Copy link

🙏 Thanks for your pull request @Karine91, 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:
45 39 1
📑 Files Changed: Repo Stars: 🔱 Total Forks:
5 9 23

@Karine91
Copy link
Contributor Author

Karine91 commented Oct 1, 2024

@r4pt0s Ok I just moved computer like this
image

@r4pt0s
Copy link
Collaborator

r4pt0s commented Oct 1, 2024

@Karine91 that totally works. Would be so kind and merge the latest changes into your PR?
Then we are ready to merge 🚀

Copy link

🙏 Thanks for your pull request @Karine91, 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:
45 39 1
📑 Files Changed: Repo Stars: 🔱 Total Forks:
5 9 23

@Karine91
Copy link
Contributor Author

Karine91 commented Oct 1, 2024

done

@r4pt0s
Copy link
Collaborator

r4pt0s commented Oct 1, 2024

Thank you @Karine91.
BTW, I love that you used query to get the position of the table. That's the reason why we set up everything we did + provided the additional map information.

@r4pt0s r4pt0s merged commit 93b9370 into zero-to-mastery:main Oct 1, 2024
1 check passed
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