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

Updated README.md to align with latest build #462

Merged
merged 8 commits into from
Aug 25, 2017
Merged

Updated README.md to align with latest build #462

merged 8 commits into from
Aug 25, 2017

Conversation

dgraney
Copy link
Contributor

@dgraney dgraney commented Aug 25, 2017

  • Changed how you get a summoner
  • Added a deprecated tag to the summoner.GetRankedStats() blurb
  • Created a blurb on how to get champion masteries as a means of displaying the interaction between regular and static api. (Not sure if this is necessary, but thought I may as well add ¯_(ツ)_/¯ ).

Note: for some reason it isn't seeing the change to StatsStatic.cs from before :/

Copy link
Owner

@BenFradet BenFradet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea 👍


/// <summary>
/// Flat Armor value for the object.
/// </summary>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you remove this commit as it's already been merged?

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should be able to do so with a git rebase origin/develop if origin is the name of this remote.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You'll have to excuse my lack of knowledge, but I used that command to no avail. the remote is named origin. Any advice?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably causing more problems than I'm solving :)

README.md Outdated
}
catch (RiotSharpException ex)
{
// Handle the exception however you want.
}
```

To get the stats in ranked for a specific champion for this summoner:
**(DEPRECATED)** To get the stats in ranked for a specific champion for this summoner:
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can remove the whole paragraph since people won't be able to do it.

@dgraney
Copy link
Contributor Author

dgraney commented Aug 25, 2017

Will make these changes, it may be a bit. A tad busy

Daniel Graney and others added 2 commits August 25, 2017 13:55
@dgraney
Copy link
Contributor Author

dgraney commented Aug 25, 2017

Well at the very least, it seems that the commit still exists... however it isn't saying it is a changed file. I'm not sure if that's sufficient. Also deleted that blurb on the ranked stats.

Copy link
Owner

@BenFradet BenFradet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks 👍 , merging.

Regarding the remote you can add the one for this repo with

git remote add upstream https://github.com/BenFradet/RiotSharp.git

and then do

git rebase upstream/develop

@BenFradet BenFradet merged commit d086128 into BenFradet:develop Aug 25, 2017
@dgraney
Copy link
Contributor Author

dgraney commented Aug 25, 2017

awesome, thanks for the heads up

@BenFradet
Copy link
Owner

Usually it's good practice to have a different branch for each pull request, the flow boils down to:

git checkout develop
git pull upstream develop # to have a up-to-date copy of develop
git checkout -b my-fix       # creates a new branch dedicated to the fix
...

Shidesu pushed a commit to Shidesu/RiotSharp that referenced this pull request Sep 25, 2017
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.

2 participants