Hello I asked fredb219 a while ago why he has stopped working on the bullet branch and he replied to me that he had problems merging it with trunk. I asked him if he would resume his work on bullet, if I help him merging and he replied something like this "yes, but I might do not have so much time for it".
The reason why I am writing this is that I have now ported the bullet branch to trunk(not checked in). At my PC it compiles with autogen and cmake. You can actually start a game, but the game will not continue, as the IsMoving() method of the current character returns true the whole time. I have more details about this bug, just ask me if you are interested. The port took me a good day as due to the following reasons: 1.) At some point back in time the bullet branch get split up from the trunk branch. The trunk branch contained at that point already physic related changes which got later reversed in trunk but not in bullet. If you try to merge now trunk and bullet you would get a LOT of conflicts as the version control system can't know if the old physic changes should be undone or not. 2.) There were a lot of changes on trunk which would cause conflicts too. Each formatting change can cause a conflict. So how can we avoid this situation in future and keep bullet up to date with trunk? We should avoid the situation were we want to revert physic changes again in order to make a release. Thus I suggest we do the following at least until we have released 0.8.6: I create a branch from current trunk called "bullet1" and commit to it my patches. Fredb219 and who ever wants can then resume working on bullet. To keep the bullet work up to date with trunk I suggest that we rebase the patches from time to time on top of trunk and commit it as a new branch bulletN (e.g. bullet2). Best regards, Florian (IFlo) _______________________________________________ Wormux-dev mailing list Wormux-dev@gna.org https://mail.gna.org/listinfo/wormux-dev
