Skip to content

OTRACMQ #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
Claudiaquemba wants to merge 17 commits into
base: main
Choose a base branch
from
Open

OTRACMQ #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
4e9072a
EJERCICIO2
Claudiaquemba May 9, 2024
ff7a7bd
p123
Claudiaquemba May 9, 2024
436e4f3
DESDE MAIN
Claudiaquemba May 9, 2024
c732362
Merge pull request #2 from Claudiaquemba/cla
Claudiaquemba May 9, 2024
924269f
Merge branch 'main' of https://github.com/Claudiaquemba/github-games
Claudiaquemba May 9, 2024
1ad0f1c
123
Claudiaquemba May 9, 2024
abcd3b7
123
Claudiaquemba May 9, 2024
e22eb2f
Merge branch 'main' of https://github.com/Claudiaquemba/github-games
Claudiaquemba May 9, 2024
3168409
Merge branch 'main' into main
Claudiaquemba May 9, 2024
853b647
ammend
Claudiaquemba May 9, 2024
33cac2c
Merge branch 'main' into Claudiaquemba2
Claudiaquemba May 9, 2024
184e9bd
Merge pull request #3 from Claudiaquemba/Claudiaquemba2
Claudiaquemba May 9, 2024
a2da77a
edni prueba
Claudiaquemba May 9, 2024
8ad2fd1
Merge pull request #4 from Claudiaquemba/Claudiaquemba2
Claudiaquemba May 9, 2024
1891e57
Revert "edni prueba"
Claudiaquemba May 9, 2024
a8976c1
Merge pull request #5 from Claudiaquemba/Claudiaquemba2
Claudiaquemba May 9, 2024
56fadf0
QA2CMQ2
Claudiaquemba May 9, 2024
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
5 changes: 4 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ A project based learning activity for peopleCAMBIO DESDE who are getting started

You can play the game at: https://githubschool.github.io/github-games/

>> _*SUPPORTED BROWSERS*: Chrome, Firefox, Safari, Opera and IE9+_
>> _*SUPPORTED BROWSERS*: Chrome, Firefox, Safari, Opera and IE9+_ prueba de ejercicio
LA MISMA PRUEBA
>> _*SUPPORTED BROWSERS*: Chrome, Firefox, Safari, Opera and IE9+_ MODIFICACION DE LA LINEA 7pero le estoy insertando mas lineas ESTA ES LA LINEA DEL CONFLICTO

This fun open source game was cloned from: https://github.com/jakesgordon/javascript-tetris
hhhTOCO VOLVER A CAMBIAR
3 changes: 2 additions & 1 deletion inde.html → index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<!DOCTYPE html>
<html>
<head>
<title>Javascript Tetris Cambio 2</title>
<title>Javascript Tetris</title>
<title>Javascript Tetris Cambio 2</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