mcgillcomp361/COMP361Project — comment on commit 25986fde0842162d857fd81c6991f8316f6615b3
File:  line 0
By num3ric:

Hey, it turns out there was no conflict at all when I merged master in my branch, lovely! I will continue to work on this tomorrow, gotta leave right now. Test it if you want: select a planet and press 'u' to add units. I'm just drawing them as collision boxes so it's normal that the rendering is crappy.