search

MinecraftU / 2021-computer-adventures

Repository for our 2021 Computer Adventures Ruby project!
0 stars 0 forks source link

Allow tetromino to fall after collision save #48

Closed jamespeilunli closed 3 years ago

jamespeilunli commented 3 years ago

closes #46 Read #46 to see details.

Currently it works-ish, but you can run into a square with no consequence until hard_dead is set to true.

jamespeilunli commented 3 years ago

I think I fixed it.

dealingwith commented 3 years ago

You ended up reverting some of the updates from #38 was that on purpose?

jamespeilunli commented 3 years ago

No, I think I started working on this before you pushed the changes for #38. Lets try to incorporate it back.

dealingwith commented 3 years ago

Did you merge main into this branch? I looks like it but I don't see the merge commit. 🤔

jamespeilunli commented 3 years ago

I don't think so..

jamespeilunli commented 3 years ago

I just made a very minor change, when acellerating fall_rate was being multiplied by 4, while when unacellerating it was being divided by 3. I've changed both to 5.

jamespeilunli commented 3 years ago

ok, I resolved the conflicts. @dealingwith, on our next Sunday session, can you help me with the "correct" way to resolve conflicts and merge?

Everything is ready for review.