Skip to content

Commit

Permalink
conflicts in readme resolved
Browse files Browse the repository at this point in the history
  • Loading branch information
shellygarg10 committed Jul 12, 2024
2 parents ec76b19 + bc581c4 commit 520a835
Show file tree
Hide file tree
Showing 145 changed files with 26,267 additions and 627 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/level_tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,15 @@ jobs:
let tagsToAdd = [];
// Check if issue text contains "Documentation Bug"
if (body && body.toLowerCase().includes('documentation bug')) {
if (title && title.toLowerCase().includes('documentation bug')) {
tagsToAdd.push('Documentation Bug 🐛');
tagsToAdd.push('level1');
}
// Check if issue title contains "Enhancement"
if (title && title.toLowerCase().includes('enhancement')) {
tagsToAdd.push('Enhancement ⚡️');
tagsToAdd.push('level2');
}
if (tagsToAdd.length > 0) {
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/new_game.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,6 @@ jobs:
script: |
const { owner, repo, number } = context.issue;
const label = 'New Game 🎮';
await github.issues.addLabels({ owner, repo, issue_number: number, labels: [label] });
const level_label='level3';
await github.issues.addLabels({ owner, repo, issue_number: number, labels: [label,level_label] });
console.log(`Added label "${label}" to the issue.`);
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"liveServer.settings.port": 5501
}
37 changes: 37 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,43 @@ in case you are stuck:

<br>

### Alternatively contribute using GitHub Desktop

1. **Open GitHub Desktop:**
Launch GitHub Desktop and log in to your GitHub account if you haven't already.

2. **Clone the Repository:**
- If you haven't cloned the GameZone repository yet, you can do so by clicking on the "File" menu and selecting "Clone Repository."
- Choose the GameZone repository from the list of repositories on GitHub and clone it to your local machine.

3. **Switch to the Correct Branch:**
- Ensure you are on the branch that you want to submit a pull request for.
- If you need to switch branches, you can do so by clicking on the "Current Branch" dropdown menu and selecting the desired branch.

4. **Make Changes:**
Make your changes to the code or files in the repository using your preferred code editor.

5. **Commit Changes:**
- In GitHub Desktop, you'll see a list of the files you've changed. Check the box next to each file you want to include in the commit.
- Enter a summary and description for your changes in the "Summary" and "Description" fields, respectively. Click the "Commit to <branch-name>" button to commit your changes to the local branch.

6. **Push Changes to GitHub:**
After committing your changes, click the "Push origin" button in the top right corner of GitHub Desktop to push your changes to your forked repository on GitHub.

7. **Create a Pull Request:**
- Go to the GitHub website and navigate to your fork of the GameZone repository.
- You should see a button to "Compare & pull request" between your fork and the original repository. Click on it.

8. **Review and Submit:**
- On the pull request page, review your changes and add any additional information, such as a title and description, that you want to include with your pull request.
- Once you're satisfied, click the "Create pull request" button to submit your pull request.

9. **Wait for Review:**
Your pull request will now be available for review by the project maintainers. They may provide feedback or ask for changes before merging your pull request into the main branch of the GameZone repository.

⭐️ Support the Project
If you find this project helpful, please consider giving it a star on GitHub! Your support helps to grow the project and reach more contributors.

## **Issue Report Process 📌**

1. Go to the project's issues.
Expand Down
3 changes: 1 addition & 2 deletions Games/Aero_Acrobat/README → Games/Aero_Acrobat/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ finding appropriate values of x for which (time % x) evaluated to every ~1-3 sec
* HTML and CSS
* HTML Canvas

-

<br>

## **How to play? 🕹️**
Expand All @@ -47,7 +47,6 @@ finding appropriate values of x for which (time % x) evaluated to every ~1-3 sec
<br>

## **Screenshots 📸**

<br>
<!-- add your screenshots like this -->

Expand Down
29 changes: 29 additions & 0 deletions Games/Ball_Shooting_Game/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Ball Shooting Game

This is a simple ball shooting game where you shoot balls to hit targets. The game is built using HTML, CSS, and JavaScript.

## How to Play

- Click anywhere on the canvas to shoot a ball.
- Hit the targets with the balls to score points.
- Each target hit increases your score by 10 points.
- The game continues indefinitely, with new targets appearing as you hit them.

## Project Structure

The project consists of the following files:

- `index.html`: The main HTML file that contains the structure of the game.
- `styles.css`: The CSS file that styles the game.
- `script.js`: The JavaScript file that contains the game logic.

## Setup and Installation

1. Clone the repository or download the project files.
2. Open `index.html` in your web browser to start the game.

## Gameplay
Click on the canvas to shoot balls.
Aim to hit the red targets.
Each hit adds 10 points to your score.
The game is endless; try to score as high as you can!
16 changes: 16 additions & 0 deletions Games/Ball_Shooting_Game/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Ball Shooting Game</title>
<link rel="stylesheet" href="styles.css">
</head>
<body>
<div id="gameContainer">
<canvas id="gameCanvas"></canvas>
<div id="score">Score: 0</div>
</div>
<script src="script.js"></script>
</body>
</html>
101 changes: 101 additions & 0 deletions Games/Ball_Shooting_Game/script.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
// script.js
const canvas = document.getElementById('gameCanvas');
const ctx = canvas.getContext('2d');
const scoreElement = document.getElementById('score');
canvas.width = 800;
canvas.height = 600;

let score = 0;
let balls = [];
let targets = [];
const ballRadius = 5;
const targetRadius = 20;
const ballSpeed = 5;

// Function to create a new ball
function createBall(x, y) {
balls.push({ x, y, dx: ballSpeed, dy: ballSpeed });
}

// Function to create targets at random positions
function createTarget() {
const x = Math.random() * (canvas.width - 2 * targetRadius) + targetRadius;
const y = Math.random() * (canvas.height - 2 * targetRadius) + targetRadius;
targets.push({ x, y });
}

// Function to update the positions of balls
function updateBalls() {
balls.forEach((ball, index) => {
ball.x += ball.dx;
ball.y += ball.dy;

// Check for collisions with walls
if (ball.x + ballRadius > canvas.width || ball.x - ballRadius < 0) {
ball.dx = -ball.dx;
}
if (ball.y + ballRadius > canvas.height || ball.y - ballRadius < 0) {
ball.dy = -ball.dy;
}

// Check for collisions with targets
targets.forEach((target, targetIndex) => {
const dist = Math.hypot(ball.x - target.x, ball.y - target.y);
if (dist < ballRadius + targetRadius) {
targets.splice(targetIndex, 1);
balls.splice(index, 1);
score += 10;
scoreElement.innerText = `Score: ${score}`;
createTarget();
}
});
});
}

// Function to draw the balls
function drawBalls() {
balls.forEach(ball => {
ctx.beginPath();
ctx.arc(ball.x, ball.y, ballRadius, 0, Math.PI * 2);
ctx.fillStyle = '#00f';
ctx.fill();
ctx.closePath();
});
}

// Function to draw the targets
function drawTargets() {
targets.forEach(target => {
ctx.beginPath();
ctx.arc(target.x, target.y, targetRadius, 0, Math.PI * 2);
ctx.fillStyle = '#f00';
ctx.fill();
ctx.closePath();
});
}

// Function to draw everything
function draw() {
ctx.clearRect(0, 0, canvas.width, canvas.height);
drawBalls();
drawTargets();
}

// Main game loop
function gameLoop() {
updateBalls();
draw();
requestAnimationFrame(gameLoop);
}

// Event listener to shoot balls
canvas.addEventListener('click', (e) => {
const rect = canvas.getBoundingClientRect();
const x = e.clientX - rect.left;
const y = e.clientY - rect.top;
createBall(x, y);
});

// Initialize the game
createTarget();
gameLoop();
28 changes: 28 additions & 0 deletions Games/Ball_Shooting_Game/styles.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/* styles.css */
body {
margin: 0;
padding: 0;
display: flex;
justify-content: center;
align-items: center;
height: 100vh;
background: linear-gradient(to right, #ff7e5f, #feb47b);
font-family: Arial, sans-serif;
}

#gameContainer {
position: relative;
}

#gameCanvas {
background-color: #fff;
border: 2px solid #000;
}

#score {
position: absolute;
top: 10px;
left: 10px;
font-size: 20px;
color: #333;
}
4 changes: 2 additions & 2 deletions Games/Battleship/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Battleship

## **Screenshots 📸**

<br>

![image](../../assets/images/Battleship.png)

<br>
<br>
7 changes: 4 additions & 3 deletions Games/Bird_game/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ Bird_game
<br>

## **Screenshots 📸**
<br>

<!-- add your screenshots like this -->
[image]("https://i.ibb.co/rG4rpdn/Screenshot-56.png")
<br>

![image](https://github.com/Bindusree1515/GameZone/assets/91887086/3c2ab8b5-5701-413a-9bf4-a0d4050a6e8c)


41 changes: 41 additions & 0 deletions Games/Earth_Guardian/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# Earth Guardian


-------------------

<br>

## **Description 📃**
-Earth Guardian is a remake of the classic Space shooter type of games, with 8-bit (pixel art) assets. This project used free assets (music and graphics) provided by [Jonathan So](https://jonathan-so.itch.io/),[KennyNL](https://kenney.nl/) and other sources, like Google images and [OpenGameArt](https://opengameart.org). This was a learning project. There will be some updates in the near future. Hope you like it, have fun!


## **functionalities 🎮**
1. This a classic space shooter game .
2. It has a timer going on , before the timer end you have to kill more more alien ships , it will be your final score
3. You can store your timer and health by collecting the time and health.

<br>

## **How to play? 🕹️**

- Use arrow keys to move the ship !
- Press spacebar to shoot !
- Hold shift key to use booster!

<br>

###### Bugs:
* Minor bug with multiple keys pressed movement (LEFT UP AND SHOOT);

<br>

## **Screenshots 📸**

<br>
![Game image] <img src="../../assets/images/Earth_Guardian.png">

<br>

----------
#### Releases:
##### v1.0.0 - May 14 2024
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added Games/Earth_Guardian/assets/audio/alarm.wav
Binary file not shown.
Binary file not shown.
20 changes: 20 additions & 0 deletions Games/Earth_Guardian/assets/audio/explosion_enemy.wav.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
20 changes: 20 additions & 0 deletions Games/Earth_Guardian/assets/audio/explosion_player.wav.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Games/Earth_Guardian/assets/audio/go.ogg
Binary file not shown.
Binary file added Games/Earth_Guardian/assets/audio/laser1.ogg
Binary file not shown.
Binary file added Games/Earth_Guardian/assets/audio/loading.wav
Binary file not shown.
Binary file added Games/Earth_Guardian/assets/audio/menu hover.wav
Binary file not shown.
Binary file added Games/Earth_Guardian/assets/audio/menu select.wav
Binary file not shown.
Binary file not shown.
20 changes: 20 additions & 0 deletions Games/Earth_Guardian/assets/audio/music_background.wav.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Games/Earth_Guardian/assets/audio/powerUp11.ogg
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 520a835

Please sign in to comment.