paul424 {l Wrote}:NAAH I just recalled -- I was implementing that to debug my culling , but than you started to rise the difficulties and moved to github, so I never finished it ... ;( ....
Well, from what I've seen, there were much more pros than cons when moving to github. Not only because the system is better (having issues and pull requests/commits in the same tool is just great!) but also because it makes easy for someone to review someone else's work. That avoids uploading half finished stuff like there was plenty.
But concerning your problems with github, to be honest, I don't understand what the problem is. If I've understood correctly, you have problems with CEGUI ? But if it is the case, I don't see the difference between now and before (or maybe something related to the makefiles ?)
But if you take a little bit of time to get used to github (it's not difficult and Akien did a nice job here to explain how to use it)
https://github.com/OpenDungeons/OpenDungeons/pull/370To summarize(that would be nice to add it in the wiki I guess) - I assume you already have the git tools:
- Create a github account if you don't have any
- Go to
https://github.com/OpenDungeons/OpenDungeons and clic on the "Fork" button (After a few seconds, you will have a copy of OD repository in your account)
- In your computer, clone your own fork. If your login is tom, you shoud use: "git clone
https://github.com/tom/OpenDungeons.git od-src" (that will download all the OD sources in a "od-src" folder)
After the sources are downloaded, you can compile the game and play with the sources. If you do something you want to share, just create a commit (I usually use git gui for that as it shows the changes as the files are added in the commit).
Once you are happy with your commit, you should always update your repo with the main one by doing:
- "git pull --rebase
git://github.com/OpenDungeons/OpenDungeons.git development"
If there are conflicts, you can fix them by using a merge tool:
- "git mergetool" and, once the conflicts are resolved "git rebase --continue"
Check that your patch is still working by re-building the sources and testing (because a commit from someone else might have broken something you have done)
If your patch works, you can upload everything to your own repo:
- "git push -f origin development"
If you look at your github account, on your fork of OD, you should see "This branch is X commits ahead of OpenDungeons:development" (X behing the number of commits you have done).
But make sure you are not X commits behind OpenDungeons:development (that would mean that you have not rebased or that another PR has been merged since you rebased).
Then, you can click on the green button with 2 arrows to create a pull request. After it is created, someone will have a look at what you've done, test it, discuss it and if it is ok, merge it into the main branch
From time to time, if your PR takes time, you can update your repo with the main one (to avoid too many conflicts when you will be done). To do that, just commit the changes you want to keep and rebase:
- "git pull --rebase
git://github.com/OpenDungeons/OpenDungeons.git development"
If there are conflicts, you can fix them by using a merge tool:
- "git mergetool" and, once the conflicts are resolved "git rebase --continue"
Then, edit your last commit (if you are still working on it) or create another one.
If someone sees a problem in your PR and you want to change something, you just have to create a new commit and update your own repo:
- "git push -f origin development"
Your PR will be automatically updated with the commit.
Note that once you have added a commit in a PR, you should never edit it. If you want to fix something, just create another commit.