From baf092882f06f213f14b5f35e73c815685c0f2de Mon Sep 17 00:00:00 2001 From: Colin Willis <45341650+colinwillis2@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:30:44 -0700 Subject: [PATCH 1/4] Updated README file. Added more instructions about running project on IntelliJ and running it will gradle. Added a clip that shows a little about how the game is played. Also updated the contributors sections. --- README.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 26914f3c..4461eed1 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,15 @@ Open your command line/terminal, navigate to the downloaded .jar and run `java - Running ---------------- -To run this project in IntelliJ use the [these configurations](https://imgur.com/a/IpXX3Jy) +- **IntelliJ:** IntelliJ is the recommended IDE for this project. Follow these directions to setup the project in IntelliJ. + - To run this project in IntelliJ, add a Run/Debug configuration like [this configuration](https://imgur.com/a/IpXX3Jy). +- **Gradle:** To run this project just in your terminal/command prompt with gradle, just execute these command when in the Text-Fighter directory: + - gradle build + - gradle run + +Game Play +------------------ +To see a clip that shows a little about how the game is played, go [here](https://www.youtube.com/watch?v=Xrw0zHYXGFI). Modifications ------------------- @@ -58,6 +66,8 @@ Thanks for all your work! [xdvrx1](https://github.com/xdvrx1) [R1ndT](https://github.com/R1ndT) [SaurabhKukreja](https://github.com/SaurabhKukreja) +[emmamickas](https://github.com/emmamickas) +[rberlin-2019](https://github.com/rberlin-2019) License -------------- From bd946741c4a0ee9f0ba53f0fbc11c185effc226a Mon Sep 17 00:00:00 2001 From: Colin Willis <45341650+colinwillis2@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:35:34 -0700 Subject: [PATCH 2/4] Update README file. The contributor list was listing three name side by side instead in a list view. Fixed this. --- README.md | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 4461eed1..c7c4b766 100644 --- a/README.md +++ b/README.md @@ -61,13 +61,16 @@ Thanks for all your work! [docschorsch](https://github.com/docschorsch) [htn17](https://github.com/htn17) [Will-Estes](https://github.com/Will-Estes) -[CLEMENTJOHNSHAJI](https://github.com/CLEMENTJOHNSHAJI) +[CLEMENTJOHNSHAJI](https://github.com/CLEMENTJOHNSHAJI) [alfr3dosv](https://github.com/alfr3dosv) [xdvrx1](https://github.com/xdvrx1) -[R1ndT](https://github.com/R1ndT) -[SaurabhKukreja](https://github.com/SaurabhKukreja) -[emmamickas](https://github.com/emmamickas) -[rberlin-2019](https://github.com/rberlin-2019) +[R1ndT](https://github.com/R1ndT) +[SaurabhKukreja](https://github.com/SaurabhKukreja) +[emmamickas](https://github.com/emmamickas) +[rberlin-2019](https://github.com/rberlin-2019) + + + License -------------- From faded83467626bdaf878a53d9ec7aa48ff124d22 Mon Sep 17 00:00:00 2001 From: Colin Willis <45341650+colinwillis2@users.noreply.github.com> Date: Sun, 24 Oct 2021 15:24:54 -0700 Subject: [PATCH 3/4] Create CHANGE.md --- CHANGE.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 CHANGE.md diff --git a/CHANGE.md b/CHANGE.md new file mode 100644 index 00000000..17610722 --- /dev/null +++ b/CHANGE.md @@ -0,0 +1,14 @@ +# Changes in this branch + +## This branch addresses the following issue: +### Time, ([issue #74](https://github.com/hhaslam11/Text-Fighter/issues/74) in the source hhaslam11/Text-Fighter repository, [issue #6](https://github.com/emmamickas/Text-Fighter/issues/6) in the forked emmamickas/Text-Fighter repository) + +## Desired modifications: +### Update the README.md file since because it hasn't been updated for a while. + +## Modified files: + * [README](https://github.com/hhaslam11/Text-Fighter/blob/master/README.md) + - Updated running instructions for IntelliJ and Gradle. + - Added a clip that shows game play. + - Updated contributors. + From f492a78e26f921b05e43d6bb5c6e09e155002f76 Mon Sep 17 00:00:00 2001 From: emmamickas <79439546+emmamickas@users.noreply.github.com> Date: Sun, 24 Oct 2021 23:37:48 -0700 Subject: [PATCH 4/4] Rename CHANGE.md to CHANGES.md --- CHANGE.md => CHANGES.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename CHANGE.md => CHANGES.md (100%) diff --git a/CHANGE.md b/CHANGES.md similarity index 100% rename from CHANGE.md rename to CHANGES.md