search

cypai / wf

My former game project, the Wishing Project. Written in Java.
Apache License 2.0
2 stars 0 forks source link

Cooldown #1

Closed theazuresoul closed 9 years ago

theazuresoul commented 9 years ago

Added cooldown functionality for abilities.

cypai commented 9 years ago

Let's first get rid of that Merge branch 'cooldown' commit with a rebase to master. Run the following:

git checkout master git pull origin master git checkout cooldown git reset HEAD~1 git reset --hard git rebase master // There may be a conflict here in BattleGui.java. Make sure you fix it correctly! git push origin cooldown -f

Lastly, I made a few comments.

theazuresoul commented 9 years ago

Changes made.

cypai commented 9 years ago

Conflict resolution commits really shouldn't be in the commit history (except by accident). Let's squash the last three commits together and amend the last one not to have FogOfWarShader.java.

See my pushed version of the branch as an example: https://github.com/applepi07/wf/commit/8b5fa4bf8f6c77e772c02272087607f72e84d2fe

That's what I want to see (except with the curly braces fixed as well)

cypai commented 9 years ago

By the way, make sure you don't blindly perform a git add. That's probably how the FogOfWarShader.java file creeped into your commit history. Always perform a git diff to make sure you're not making a different commit from what you expect!

theazuresoul commented 9 years ago

Ready to pull, I think?