Irrlicht + SDL2 + Android

[ent1ty]

Maybe you can use git to merge the branches and then go back to svn? The whole repo has already been converted to git here: https://github.com/osense/irrlicht-git (it takes some time to do it for the first time) and generally I try to keep it up-to-date. Not sure about the git -> svn conversion, but it should be possible.

[CuteAlien]

Can't merge yet - we need at least 1 more change in the device code first. All the stuff in IrrlichtDevice like activateJoysticks, accelerometer, gyroscope will get it's own interface. Hybrid already has written a proposal for that (but as we're not using github you can't find it online...). There's been some discussions about it (and some misunderstandings), but basically there will be some IOController interface soon instead. Once we have that in the ogl-es branch we can work on the merge back to trunk.

[FloatyBoaty]

Yes, imho GIT is much better in this case.

I like mercurial.

[FloatyBoaty]

Please don't do that yet Nadro. If we merge that before merging the ogl-es branch into trunk that means merging will get even harder than it already is. And unfortunately it is already hell to merge the branches and getting ogl-es back into trunk is scarying me already as it is now (I already needed a full day just to get the simple patches of the last 2-3 months merged - and that was in the easy direction of trunk to ogles). For now let's keep that branch as close to trunk as still possible until we figure out how to merge it back. After that we can add new drivers and kick drivers out and so on.

There are a few things that I modified, but I attempted to write it in a way that any current functionality would work the same way - even SDL1. Think of it like a new feature.

[CuteAlien]

FLoatyBoaty: The problem is not your code. But right now we should work on getting the ogl-es branch in a state so it can finally be merged back to trunk. After that we can add features again. And the main (or only) thing missing there is a rewrite of the device interface, so I don't want to add more devices before doing that.