Christian: Merging is always a headache

This week was a little more low key, thanks to me being busy with other things during the week. However, There was still some good progress this week. I got building transitions into a decent state. Walking through a building door trigger will cause the specified layer to fade to transparent if the layer is solid, and fade to solid if the layer is clear. Also new this week are auto jumps when the player walks off of the edge. This took a surprising amount of work to get done, but I’m quite pleased with the results. Of course, the week was not without challenges. I spent several hours trying to merge the fighting into the main branch, to no success. Hopefully it will go smoother the next time I attempt it.