Skip to content
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.

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

tyr #45

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

tyr #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
8514213
Modificacion en main
OmarVasquez May 7, 2024
3b0c477
Reverso Nombre
OmarVasquez May 7, 2024
76455e1
Merge pull request #1 from OmarVasquez/cambionombre
afarenasde May 7, 2024
d292a96
Cambio Nombre + Cambio OV
OmarVasquez May 8, 2024
39b9297
Revert "rename index.html to inde.html"
OmarVasquez May 8, 2024
462b970
Merge pull request #11 from OmarVasquez/renameindex
afarenasde May 8, 2024
9b5a4e5
Cambio local en main
OmarVasquez May 9, 2024
dea4135
Merge pull request #17 from OmarVasquez/dev/featureA
OmarVasquez May 9, 2024
4e9072a
EJERCICIO2
Claudiaquemba May 9, 2024
e746f3c
CAMBIO DESDE MAIN
OmarVasquez May 9, 2024
34dc874
Cambio desde Branch
OmarVasquez May 9, 2024
b30d944
Merge branch 'main' into dev/featureA
OmarVasquez 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
c0a5d5d
Renombrar archivo
OmarVasquez May 9, 2024
1ad0f1c
123
Claudiaquemba May 9, 2024
abcd3b7
123
Claudiaquemba May 9, 2024
cfe73db
Cambio 1+2+3
OmarVasquez May 9, 2024
e22eb2f
Merge branch 'main' of https://github.com/Claudiaquemba/github-games
Claudiaquemba May 9, 2024
bb5602c
Merge pull request #22 from OmarVasquez/dev/featureA
OmarVasquez 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
284deac
QA2CMQ2
Claudiaquemba May 9, 2024
c52eb7d
Merge pull request #8 from Claudiaquemba/QA2CMQ
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
File renamed without changes.
9 changes: 6 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
## Welcome to GitHub Games
## Welcome to GitHub Games - Omar Vásquez cambio 1 cambio 3

A project based learning activity for people who are getting started with Git and GitHub.
A project based learning activity for peopleCAMBIO DESDE who are getting started with Git and GitHub.

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
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<!DOCTYPE html>
<html>
<head>
<title>Javascript Tetris</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