Skip to content

merge all contributors changes into staging to catch up commits #87

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.

Sign up for GitHub

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

Merged
ASteinheiser merged 5 commits into from
Oct 3, 2019
Merged

merge all contributors changes into staging to catch up commits #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4437afc
docs: update README.md
allcontributors[bot] May 21, 2019
ebd7d80
docs: update .all-contributorsrc
allcontributors[bot] May 21, 2019
7722820
Merge pull request #82 from ASteinheiser/all-contributors/add-ajrusse…
ASteinheiser May 21, 2019
06e7977
Merge pull request #83 from ASteinheiser/staging
ASteinheiser May 21, 2019
a6a6203
Merge pull request #86 from ASteinheiser/staging
ASteinheiser Oct 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .all-contributorsrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,16 @@
"bug",
"ideas"
]
},
{
"login": "ajrussellaudio",
"name": "Alan Russell",
"avatar_url": "https://avatars3.githubusercontent.com/u/1347511?v=4",
"profile": "https://twitter.com/ajrussellaudio",
"contributions": [
"code",
"bug"
]
}
],
"contributorsPerLine": 7
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# React RPG
[![All Contributors](https://img.shields.io/badge/all_contributors-4-orange.svg?style=flat-square)](#contributors)
[![All Contributors](https://img.shields.io/badge/all_contributors-5-orange.svg?style=flat-square)](#contributors)

React RPG is an Open-Source RPG made with React and Redux. The game is a turn-based, dungeon crawler that comes with two game modes: Story and Endless. Story mode will lead you through a short story while introducing you to the most powerful creatures. In Endless mode, a unique challenge waits around every corner, as no two maps are the same.

Expand Down Expand Up @@ -28,7 +28,7 @@ Thanks goes to these wonderful people ([emoji key](https://github.com/all-contri

<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
<!-- prettier-ignore -->
<table><tr><td align="center"><a href="http://iamandrew.io"><img src="https://avatars1.githubusercontent.com/u/9949512?v=4" width="100px;" alt="Andrew Steinheiser"/><br /><sub><b>Andrew Steinheiser</b></sub></a><br /><a href="#ideas-ASteinheiser" title="Ideas, Planning, & Feedback">🤔</a> <a href="#question-ASteinheiser" title="Answering Questions">💬</a> <a href="https://github.com/ASteinheiser/react-rpg.com/commits?author=ASteinheiser" title="Tests">⚠️</a> <a href="https://github.com/ASteinheiser/react-rpg.com/commits?author=ASteinheiser" title="Code">💻</a> <a href="https://github.com/ASteinheiser/react-rpg.com/commits?author=ASteinheiser" title="Documentation">📖</a> <a href="#maintenance-ASteinheiser" title="Maintenance">🚧</a> <a href="#tool-ASteinheiser" title="Tools">🔧</a> <a href="#review-ASteinheiser" title="Reviewed Pull Requests">👀</a></td><td align="center"><a href="https://github.com/Alphanumber"><img src="https://avatars0.githubusercontent.com/u/9552208?v=4" width="100px;" alt="Alphanumber"/><br /><sub><b>Alphanumber</b></sub></a><br /><a href="#ideas-Alphanumber" title="Ideas, Planning, & Feedback">🤔</a></td><td align="center"><a href="http://www.alaric.us"><img src="https://avatars1.githubusercontent.com/u/15240432?v=4" width="100px;" alt="Alaric von Teplitz"/><br /><sub><b>Alaric von Teplitz</b></sub></a><br /><a href="#question-Alaricus" title="Answering Questions">💬</a> <a href="#ideas-Alaricus" title="Ideas, Planning, & Feedback">🤔</a> <a href="#review-Alaricus" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/ASteinheiser/react-rpg.com/commits?author=Alaricus" title="Code">💻</a> <a href="https://github.com/ASteinheiser/react-rpg.com/issues?q=author%3AAlaricus" title="Bug reports">🐛</a></td><td align="center"><a href="https://github.com/Saintroi"><img src="https://avatars2.githubusercontent.com/u/13038366?v=4" width="100px;" alt="Drew Nelson"/><br /><sub><b>Drew Nelson</b></sub></a><br /><a href="https://github.com/ASteinheiser/react-rpg.com/commits?author=Saintroi" title="Tests">⚠️</a> <a href="https://github.com/ASteinheiser/react-rpg.com/issues?q=author%3ASaintroi" title="Bug reports">🐛</a> <a href="#ideas-Saintroi" title="Ideas, Planning, & Feedback">🤔</a></td></tr></table>
<table><tr><td align="center"><a href="http://iamandrew.io"><img src="https://avatars1.githubusercontent.com/u/9949512?v=4" width="100px;" alt="Andrew Steinheiser"/><br /><sub><b>Andrew Steinheiser</b></sub></a><br /><a href="#ideas-ASteinheiser" title="Ideas, Planning, & Feedback">🤔</a> <a href="#question-ASteinheiser" title="Answering Questions">💬</a> <a href="https://github.com/ASteinheiser/react-rpg.com/commits?author=ASteinheiser" title="Tests">⚠️</a> <a href="https://github.com/ASteinheiser/react-rpg.com/commits?author=ASteinheiser" title="Code">💻</a> <a href="https://github.com/ASteinheiser/react-rpg.com/commits?author=ASteinheiser" title="Documentation">📖</a> <a href="#maintenance-ASteinheiser" title="Maintenance">🚧</a> <a href="#tool-ASteinheiser" title="Tools">🔧</a> <a href="#review-ASteinheiser" title="Reviewed Pull Requests">👀</a></td><td align="center"><a href="https://github.com/Alphanumber"><img src="https://avatars0.githubusercontent.com/u/9552208?v=4" width="100px;" alt="Alphanumber"/><br /><sub><b>Alphanumber</b></sub></a><br /><a href="#ideas-Alphanumber" title="Ideas, Planning, & Feedback">🤔</a></td><td align="center"><a href="http://www.alaric.us"><img src="https://avatars1.githubusercontent.com/u/15240432?v=4" width="100px;" alt="Alaric von Teplitz"/><br /><sub><b>Alaric von Teplitz</b></sub></a><br /><a href="#question-Alaricus" title="Answering Questions">💬</a> <a href="#ideas-Alaricus" title="Ideas, Planning, & Feedback">🤔</a> <a href="#review-Alaricus" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/ASteinheiser/react-rpg.com/commits?author=Alaricus" title="Code">💻</a> <a href="https://github.com/ASteinheiser/react-rpg.com/issues?q=author%3AAlaricus" title="Bug reports">🐛</a></td><td align="center"><a href="https://github.com/Saintroi"><img src="https://avatars2.githubusercontent.com/u/13038366?v=4" width="100px;" alt="Drew Nelson"/><br /><sub><b>Drew Nelson</b></sub></a><br /><a href="https://github.com/ASteinheiser/react-rpg.com/commits?author=Saintroi" title="Tests">⚠️</a> <a href="https://github.com/ASteinheiser/react-rpg.com/issues?q=author%3ASaintroi" title="Bug reports">🐛</a> <a href="#ideas-Saintroi" title="Ideas, Planning, & Feedback">🤔</a></td><td align="center"><a href="https://twitter.com/ajrussellaudio"><img src="https://avatars3.githubusercontent.com/u/1347511?v=4" width="100px;" alt="Alan Russell"/><br /><sub><b>Alan Russell</b></sub></a><br /><a href="https://github.com/ASteinheiser/react-rpg.com/commits?author=ajrussellaudio" title="Code">💻</a> <a href="https://github.com/ASteinheiser/react-rpg.com/issues?q=author%3Aajrussellaudio" title="Bug reports">🐛</a></td></tr></table>

<!-- ALL-CONTRIBUTORS-LIST:END -->

Expand Down