Skip to content

UAT #36

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

Open
wants to merge 28 commits into
base: main
Choose a base branch
from
Open

UAT #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
8febc96
change speed of game
renasusan Jul 9, 2025
e9ec2c8
change speed of game
renasusan Jul 9, 2025
f4380af
change game speed
renasusan Jul 9, 2025
d929346
Merge pull request #1 from renasusan/feature-change-speed
renasusan Jul 9, 2025
b638840
Update index.html
renasusan Jul 9, 2025
6da4365
Update index.html -2
renasusan Jul 9, 2025
2a7afc4
Merge pull request #2 from renasusan/feature-change-speed
renasusan Jul 9, 2025
101a89b
Update README.md
renasusan Jul 15, 2025
31bc499
Merge pull request #3 from renasusan/hot-fix
renasusan Jul 15, 2025
7a3dca0
Update README.md
renasusan Jul 15, 2025
cfe33a8
Merge pull request #4 from renasusan/renasusan-patch-1
renasusan Jul 15, 2025
f906505
Merge pull request #5 from renasusan/hotfix
renasusan Jul 15, 2025
3823338
Update README.md / UAT
renasusan Jul 15, 2025
b5ab605
Merge pull request #6 from renasusan/UAT
renasusan Jul 15, 2025
fee25e6
Merge pull request #7 from renasusan/develop
renasusan Jul 15, 2025
b360cc6
Update README.md
renasusan Jul 15, 2025
b25205c
Merge pull request #8 from renasusan/UAT
renasusan Jul 15, 2025
191f998
Update README.md
renasusan Jul 16, 2025
7294ae4
Merge pull request #9 from renasusan/renasusan-patch-1
renasusan Jul 16, 2025
1d205f4
Update README.md
renasusan Jul 16, 2025
1ae7dfd
Merge branch 'main' into hotfix
renasusan Jul 16, 2025
356a082
Merge pull request #10 from renasusan/hotfix
renasusan Jul 16, 2025
7346e75
Update README.md
renasusan Jul 16, 2025
54b5304
Merge pull request #11 from renasusan/develop
renasusan Jul 16, 2025
12438e7
Update README.md
renasusan Jul 16, 2025
50694fc
Merge branch 'develop' into feature-changecolor
renasusan Jul 16, 2025
296bbf0
Merge pull request #12 from renasusan/feature-changecolor
renasusan Jul 16, 2025
0a0554a
Merge pull request #13 from renasusan/develop
renasusan Jul 16, 2025
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
3 changes: 3 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
feature
DEVELOP 1

## Welcome to Thirty Minutes to Merge

A project based learning activity for people who are getting started with branching with Git.
Expand Down
4 changes: 2 additions & 2 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title>Javascript Tetris</title>
<title>Javascript Tetris Trial - Branching </title>
<style>
body { font-family: Helvetica, sans-serif; }
#tetris { margin: 1em auto; padding: 1em; border: 4px solid black; border-radius: 10px; background-color: #F8F8F8; }
Expand Down Expand Up @@ -75,7 +75,7 @@
ctx = canvas.getContext('2d'),
ucanvas = get('upcoming'),
uctx = ucanvas.getContext('2d'),
speed = { start: 0.6, decrement: 0.005, min: 0.1 }, // how long before piece drops by 1 row (seconds)
speed = { start: 0.5, decrement: 0.005, min: 0.1 }, // how long before piece drops by 1 row (seconds)
nx = 10, // width of tetris court (in blocks)
ny = 20, // height of tetris court (in blocks)
nu = 5; // width/height of upcoming preview (in blocks)
Expand Down