Commit 038ec0c8 authored by Aric Peng's avatar Aric Peng
Browse files

Merge remote-tracking branch 'origin/arics_update' into arics_update

# Conflicts:
#	.gradle/7.5/executionHistory/executionHistory.lock
#	.gradle/7.5/fileHashes/fileHashes.bin
#	.gradle/7.5/fileHashes/fileHashes.lock
#	.gradle/buildOutputCleanup/buildOutputCleanup.lock
#	.idea/workspace.xml
parents fb25838e f27aec61
Loading
Loading
Loading
Loading
+71 −19
Original line number Diff line number Diff line
@@ -2,39 +2,91 @@



## Eau de Hotdog
## Getting started

A Falling Block Game for Android
To make it easy for you to get started with GitLab, here's a list of recommended next steps.

## Description
Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!

## Add your files

- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:

```
cd existing_repo
git remote add origin https://agile.bu.edu/gitlab/jilin/group3project.git
git branch -M master
git push -uf origin master
```

## Integrate with your tools

- [ ] [Set up project integrations](https://agile.bu.edu/gitlab/jilin/group3project/-/settings/integrations)

## Collaborate with your team

- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
- [ ] [Automatically merge when pipeline succeeds](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html)

A Tetris-like game where food-textured blocks fall from the top of the 
screen and certain foods disappear when they are matched together. 
## Test and Deploy

## Team Members
Use the built-in continuous integration in GitLab.

WikiName (hereby referred to as)
- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html)
- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing(SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)

***

# Editing this README

When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thank you to [makeareadme.com](https://www.makeareadme.com/) for this template.

## Suggestions for a good README
Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.

## Name
Choose a self-explaining name for your project.

## Description
Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors.

KyleFieleke (Kyle)
## Badges
On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge.

AricPeng (Aric)
## Visuals
Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method.

JilinZheng (Jilin)
## Installation
Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection.

ThomasMurillo (Tommy)
## Usage
Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README.

HugrunHelgadottir (Hugrún)
## Support
Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.

EllaHedman (Ella)
## Roadmap
If you have ideas for releases in the future, it is a good idea to list them in the README.

## Roles
## Contributing
State if you are open to contributions and what your requirements are for accepting them.

Team Lead: Kyle [100%]
For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.

Front end: Aric [50%], Jilin [50%]
You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.

Back end: Tommy [50%], Aric [25%], Ella [25%]
## Authors and acknowledgment
Show your appreciation to those who have contributed to the project.

Documentation: Hugrun [50%], Ella [50%]
## License
For open source projects, say how it is licensed.

Testing: Jilin [50%], Tommy [25%], Hugrun [25%]
## Project status
If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.
+1 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe

                    Intent intent2 = new Intent(MainActivity.this, GameOverScreen.class);
                    startActivity(intent2);
                    mediaPlayer.stop();
                    finish();
                }
            }
+8 −8
Original line number Diff line number Diff line
@@ -12,13 +12,13 @@
    <string name="score">Score</string>
    <string name="game_over">Game Over</string>
    <string name="ruleset">
        1. Game is played on a rectangular grid called the “Kitchen”.\n
        2. Blocks fall from the top of the “Kitchen”.\n
        3. The player can move the blocks left or right, rotate them, or drop them down faster.\n
        4. The goal is to match the three pieces of each food item together.\n
        5. When a food item is created, it disappears (Ari eats it), and the other food items above it will fall down to fill the gap.\n
        6. The game is over when the stack of food reaches the top of the kitchen, making it impossible to add new food items.\n
        7. The game is scored based on the number of food items you clear. Additional points will be awarded if you clear multiple items in a row. (combo points)\n
        8. As the game goes on the food will start dropping quicker until the player can no longer keep up.
        1. Game is played on a rectangular grid called the “playfield”.\n
        2. Fruit falls from the top of the “playfield”. \n
        3. The player can move the blocks of fruit left or right, rotate them, or drop them down faster. \n
        4. The goal is to complete one or more horizontal lines of blocks of fruit, which will then disappear from the screen (Ari eats the fruit) and earn the player points. \n
        5. When the fruit disappears (Ari eats it), the other fruit blocks above will fall down to fill the gap. \n
        6. The game is over when the stack of fruit reaches the top of the playfield, making it impossible to add new food items. \n
        7. The game is scored based on the number of lines you clear. (we could maybe have more points for specific fruits). Additional points will be awarded if you clear multiple items in a row. (combo points) \n
        8. As the game goes on the fruit will start dropping quicker until the player can no longer keep up.
    </string>
</resources>
 No newline at end of file

finalprojectdemo.mp4

0 → 100644
+20.1 MiB

File added.

No diff preview for this file type.