Merging the submodules in the main branch

[werdanith]

Another note is that when you checkout back and forth with branches that have this change you have to do some manual labor, namely to either delete the mangle and openengine folders or to do a submodule update --init, depending on which direction you are going. Of course this will only bother us until all the new branches are branched from the new master branch.

[werdanith]

The way to avoid having to delete the folders manually when you checkout back and forth between this change is to make a commit preceding the merge that is the deletion of the OpenEngine and Mangle folders. After that, checking out forwards has no issues, on the other hand checking out backwards will require a submodule update --init, like when you clone the project for the first time.

So to conclude, if we are going to use corristo's branch the algorithm is this:
Delete OpenEngine and Mangle folders.
Commit
Pull corristo's branch.
Push.

[werdanith]

Zini, I've got a fix for the broken 3d sound issue that needs to go into mangle, are you considering doing this merge or is it a lost cause and I should push the usual way?

[Zini]

Will look into it as soon as possible. Unless there are additional complications the submodules will be gone before the week is over.

[Zini]

submodules are gone. Well done!

[werdanith]

submodules are gone. Well done!

Excellent.

Ok, enough goofing around, time to get back to work.

[werdanith]

Note to whoever is merging Zini's master now, you have to manually remove the mangle and open engine folders in the libs folder for the merge to be successfull.