search

comp380team3 / PuzzlePathDimension

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

Level editor fixes and refactorings #94

Closed bmarroquin closed 11 years ago

bmarroquin commented 11 years ago

Launched Collision problem fixed, Level Editor restart bug fixed, split simulation into two classes.

Jjp137 commented 11 years ago

Despite those minor nitpicks, everything here seems to be functional, so I'm okay with merging this into master. I do want to refactor this a bit further afterwards, though.

Then again, if Brian is going to add some stuff for the toolbox, maybe I should hold off on that for now. I'm not sure...

Jjp137 commented 11 years ago

Just so you know, there's a merge conflict somewhere now. Can you try to resolve it?

Also, since Jonathan fixed the bug that you reported (thank you for finding it! that would be horrible if I accidentally did that during the demo), after you resolve the merge conflicts, can you remove the null check in OnButtonPressed and see if the game doesn't crash now?

Twisol commented 11 years ago

Thanks for the patch! I went ahead and removed the ModelingProject items before merging; if you feel that should be in the repository, please make another pull request with just the extra stuff. I also have no idea what it's for, so please tell us that too!