comp380team3 / PuzzlePathDimension

Class project for COMP 380 at California State University, Northridge
0 stars 0 forks source link

Physics/collision + game mechanics + sound #32

Closed Jjp137 closed 11 years ago

Jjp137 commented 11 years ago

Okay, this is a lot. Maybe a bit too much to take in for one pull request :\ Just make sure you read all of this :)

First of all, everything that's in Brian_Collision is in this pull request, so you don't need to merge that branch.

And I don't even know where to start, so here's a list of bullet points:

...and other things that I usually end up forgetting.

And a few caveats:

I wouldn't be surprised if there are merge conflicts... Phew!

But yea, this is a lot of code. Take your time reviewing this, because this is an important part of the game. 90% of the code is from the physics engine, though, so skip that part :p

Before I forget, I got the sounds from here:

And the sound part was easy to do :)

Twisol commented 11 years ago

Wow! I'll take a look at this soon.

Jjp137 commented 11 years ago

Okay. I'm actually going to make another commit in the next hour or so to fix a subtle (but potentially really annoying) bug. Gah, the physics engine...

Jjp137 commented 11 years ago

Alright. I hope I didn't break anything else in a subtle way...

Twisol commented 11 years ago

Everything looks pretty good. There are a number of architectural things I'd like to change, but it isn't spaghetti and all the functionality is there. Great work!

Unfortunately, I'm having a lot of trouble with my local Windows installation. I try to checkout a branch, or merge this one, and it tells me that certain files can't be unlinked. I'm going to merge this in via GitHub, but I won't be able to do anything with it locally for a little while longer.

Jjp137 commented 11 years ago

Thanks! Feel free to iron out all the kinks in the architecture :) and that's a bizarre error... :\