working on it - Githubissues

TheMowgliMan / Country-Clash

A 2D OGLES 3 game developed in Godot 3.x. Intends to emulate the mechanics of CCRPIV on Scratch: https://scratch.mit.edu/studios/31228758/

GNU General Public License v3.0

3 stars 1 forks source link

working on it #14

Closed TheMowgliMan closed 2 years ago

TheMowgliMan commented 2 years ago

Um, 3qc, your changes completely broke it on my system. I was pulling your new commits, and many things that were needed for it to run were missing, and some proper code was reverted. You need to revert it immediately.

3quarterscolon commented 2 years ago

I'M TRYING

3quarterscolon commented 2 years ago

I DON'T KNOW WHAT HAPPENED

3quarterscolon commented 2 years ago

I'm so sorry.

3quarterscolon commented 2 years ago

Those weren't the things I was trying to change. I tried to pull the code from main, and then there were merge conflicts, and when I was trying to fix them I must've accidentally pushed to main. I'm sorry.

3quarterscolon commented 2 years ago

Is this fixed?: https://github.com/3quarterscolon/Country-Clash/tree/fix-it

TheMowgliMan commented 2 years ago

Sorry, I wanted to make sure you saw it. Most likely these:

You added back Node2D as the root for the main menu. I suspect you didn't merge main back into your fork.
You added back the hack that I removed, probably for the same reason as above.
A signal from the buttons was broken. I suspect that is the biggest offender

I'm so sorry.

It's okay. You wouldn't BELIEVE the number of music projects and coding projects I've messed up like this

Those weren't the things I was trying to change. I tried to pull the code from main, and then there were merge conflicts, and when I was trying to fix them I must've accidentally pushed to main. I'm sorry.

That sounds like something I might do someday....

Is this fixed?: https://github.com/3quarterscolon/Country-Clash/tree/fix-it

I'll look.

3quarterscolon commented 2 years ago

Sorry, I wanted to make sure you saw it. Most likely these:

You added back Node2D as the root for the main menu. I suspect you didn't merge main back into your fork.

You added back the hack that I removed, probably for the same reason as above.

A signal from the buttons was broken. I suspect that is the biggest offender

I'm so sorry.

It's okay. You wouldn't BELIEVE the number of music projects and coding projects I've messed up like this

Those weren't the things I was trying to change. I tried to pull the code from main, and then there were merge conflicts, and when I was trying to fix them I must've accidentally pushed to main. I'm sorry.

That sounds like something I might do someday....

Is this fixed?: https://github.com/3quarterscolon/Country-Clash/tree/fix-it

I'll look.

And of course, my revert has merge conflicts or something, so who knows if it's actually fixed.

TheMowgliMan commented 2 years ago

FIXED!!!!!!!!! I'll merge it in.

TheMowgliMan commented 2 years ago

11 minutes of total panic. What a day.

3quarterscolon commented 2 years ago

Wait, are cities fixed?

TheMowgliMan commented 2 years ago

Cities were being added in. So there is some unfinished code, but it isn't doing anything. The main problems were in the main menu, there were cross-fork-merge shenanigans. It was a Frankenstein of a scene, with some of your stuff and some of mine both added in.

3quarterscolon commented 2 years ago

Okay

TheMowgliMan commented 2 years ago

Your merges deleted the city texture, which isn't taht surprising, and it did nothing wrong.