search

Makman2 / CE3D

A terminal 3D engine
GNU General Public License v3.0
4 stars 0 forks source link

Migration #155

Closed Makman2 closed 10 years ago

Makman2 commented 10 years ago

I know you love big pull requests, so here: extra for you <3 <3 I stumbled upon some codestyle things and fixed them in extra commits. But: The commits are easy to understand, only code migration and some simple things :)

Makman2 commented 10 years ago

In fact to-do:

sils commented 10 years ago

seems well

2014-10-22 10:35 GMT+02:00 Makman2 notifications@github.com:

In fact to-do:

  • Rename t_Material to MaterialType: do it in all files + squash commits that do this.
  • Change commit messages from "Migrate code"-commits.
  • Improve the weird "transformation/orthogonal_p....." commit message
  • Remove some new lines

Reply to this email directly or view it on GitHub https://github.com/Makman2/CE3D/pull/155#issuecomment-60052519.

Makman2 commented 10 years ago

Rebase done, everything should be allright. Forgot to place the blocked label.

sils commented 10 years ago

merge after you corrected all those issues. Please look over all commits for the spacing thing or let me rereview them!

sils commented 10 years ago

merged manually after correcting spacing issues

Makman2 commented 10 years ago

why manually? oO and why closed?

sils commented 10 years ago

because I was too lazy to reupload the things and merge via github.

sils commented 10 years ago

you will find every commit of these on master but it will have another sha1 checksum and I corrected these spaciing issues so github doesnt recognize they're almost the same and shows unmerged commits here.

Makman2 commented 10 years ago

Ah okay because of your local rebase of the last 9 commits it doesn't recognize... Thanks for fixing the whitespace thing, I'll pay more attention next time. I recently downloaded VS 2013, maybe that's the point. PS: Don't be lazy... :P