As you may see, this merge request contains all previous commits. This is because a surface_map.dx file was committed when I tried to merge. GitHub doesn't allow files larger than 100 MB to be stored remotely so I couldn't push my changes before removing the file.
Because of the issues with the last merge, I has to change this pull request, so that is essentially changes the master branch to my development branch. However, it compiles correctly on my machine.
As you may see, this merge request contains all previous commits. This is because a surface_map.dx file was committed when I tried to merge. GitHub doesn't allow files larger than 100 MB to be stored remotely so I couldn't push my changes before removing the file.
Because of the issues with the last merge, I has to change this pull request, so that is essentially changes the master branch to my development branch. However, it compiles correctly on my machine.