Transparent Boxes With proper merge #23
Conversation
Renders Exits/Portals through blocks. Renders Snakes through blocks. (the no-collision cheat) Renders other block's connectors through blocks. Doesn't render its own connector inside the block.
I like these colors the best
It looks like you re-formatted my code (replacing 1%2 with 1 % 2, replacing tabs with spaces, etc)Probably was like an automatic formatter for whatever editor you use. It thought that we were both modifying the same lines beacause of this. This update should fix the conflicts
|
Also, it looks like this includes your issue #9 work too, so you might want to switch that work back to master. |
|
The issue #9 work is incomplete. I doesn't belong in master yet. It literally has a button that throws an exception. I think you should take out the issue #9 work from this pull request so that it can be merged into my master. Also, you don't have to make pull requests from your master branch. I usually like to make a branch for each pull request I make (the branch is named "pull1" or something.). That way I can keep working on master in my fork without changing what the pull request refers to. You can also use this strategy to make multiple pull requests at once, although it's a bit tricky to keep them independent of each other. |
|
I don't think you need to make a new pull request each time you change what commits are included in it. I think the pull request will follow whatever is in your branch that you designated as the branch for this pull request, which is your master branch. If you just change your master branch, it should update what the pull request entails. |
|
I had the transparent stuff done when you pulled the colored box one, and those were both on master... I don't think it auto-updates. edit: nevermind. |
|
Ok I undid the merge manually. this should be OK now |
|
You don't have to undo the changes manually. Looking at the history, it looks like commit then it will forget that the merge ever happened, erasing it from your local history. Then in order to tell github about going back in time, you need to do a special kind of push: (I seem to remember github having a setting to completely disallow this kind of push, so you might need to enable that as well. I'm not sure.) You have to use I suggest doing all this to clean up the history. I think, as it is now, your changes will cause conflicts when I try to merge my |
|
ok right now I don't have access to the git client, but I will do that when i get home. (about 3 hours from now) |
|
ugghh you can't copy+paste into git's shell |
|
Ok its gone |
|
Again, All the features in this request. The transparent box version's features: |
Are you waiting for me to merge this pull request first? |
|
I thought I already pushed that? Can't seem to find the color update. I guess I haven't done that yet... The colors should be pretty easy to change later if you want to merge it now. |
|
Also, what software do you use to code? I am using notepad++. |
Vim in Linux, although I can't say I necessarily recommend it. I recently got my friend set up using Eclipse for JavaScript development, ... and I don't really recommend that either. Actually, Notepad++ is pretty solid. There are a few configuration defaults I don't like, like I always turn hard tabs off, and indentation width to 2 instead of 4. That's my preference, but it's also standard in this codebase, so it might help relieve some frustration if you find yourself fighting with the indention every time you hit Enter or Tab. I've heard Jonathan Blow is planning to make a text editor sometime in the next couple years. I'm pretty excited to see how that goes. His plans are a big reason why I'm not trying to make a text editor of my own anytime soon. I pretty much hate all existing text editors and IDEs :/ |
Oh, oops. I may have instructed you to erase it from history. If you did it before the Also, I meant to mention that you can paste into git's shell (really the Windows terminal emulator) with Alt+Space, E, P (took me years to find that out.). You can't use the standard clipboard hotkeys (Ctrl+C, Ctrl+V, etc.) in any terminal emulator I'm aware of, including Console2, Putty, Mintty, or anything on Linux either. Sometimes there are alternative hotkeys, like Shift+Insert or Ctrl+Shift+V, but there's almost always a menubar way to do it as well that should tell you the hotkeys. |
|
Is this good to merge, thejoshwolfe? Transparent blocks are necessary to be able to see the tile behind a block, which is important once we get multiple types of non-air terrain that you can stand in. |
|
unfortunately, this pull request has suffered from bitrot, and is not easily mergeable into the current codebase. I've reimplemented this feature on top of the current codebase using a slightly different approach: using the
We can still do more with the aesthetics, like making the outlines thicker, changing the colors, or adding more colors. |
I believe this should work properly. The boxes are coded correctly. The connector code has been changed so it doesn't render connectors behind the box. I added a color scheme of green to yellow.