Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Several small code improvements #161

Merged
merged 4 commits into from
Dec 14, 2014
Merged

Conversation

verhagen
Copy link
Contributor

No description provided.

@paddatrapper paddatrapper merged commit 44c0b96 into Progether:master Dec 14, 2014
@projectdelphai
Copy link
Member

Why was the classChanges, getCurrentClass, setCurrentClass, checkCurrentClass methods removed? Those methods were a work in progress of mine to properly implement #77, class changes via player movements and actions. In the future, please check where major parts of code come from through the History tab on documents. The commit 1e3d51e shows that I added it there as a start to #77. And I realize that I haven't been able to get to it due to some personal stuff but because it doesn't get called or affect any gameplay, I though it would be to leave it there so that my class change branch didn't get too far behind master.

@verhagen
Copy link
Contributor Author

I did not understand it. Work in progress, should be in your own git, in your own branch. And only when ready, be merged (I think) I did not understand the work, very strange names, unclear names where used. And the code was not used. So code which is not used, can be removed (I was not aware of that it has recently ben added)

@projectdelphai
Copy link
Member

While normally I would agree that code that isn't completed should not be merged, we have usually held that if a person has claim over a certain aspect of a game without collaborators, sections of code can be merged with master if:

  1. it doesn't not affect gameplay negatively
  2. It doesn't affect the player
  3. It doesn't get called.

In this way, one person or multiple people can push sections of code to master so that it can be collaboratively worked on without having a branch fall behind. This is, I believe, similarly what happened to the creation of monsters and attacking. A contributor managed to finish half of the monster spawning and creation but then had to leave and couldn't finish the code. He could have left it on his own branch and let it stagnate falling behind master so far that it couldn't be merged. Instead he pushed it to master and because it wasn't affecting gameplay in any way, the end-user didn't realize that the code even existed. A couple weeks later, we got a new contributor (can't remember if it was paddatrapper, blackwolf, or cagehn) who then used that existing code to finish the project to where we currently are. So there is a reason that we push partially finished yet separated code to master especially when we have a project that involves a lot of contributors joining and then having to leave for various reasons.

I will keep the class change code on my own git from now on though.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants