Skip to content

stiven/fixdrop #75

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
BreinnerS08 wants to merge 54 commits into
base: main
Choose a base branch
from
Open

stiven/fixdrop #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
12a0bde
git commit -m "feat: implementar pantalla principal con jugadores con…
Kyle-gi Apr 14, 2026
39b1811
Merge branch 'dev' into E3-US3-T6
kylex1 May 5, 2026
34c6535
Merge changes from E3-US3-T6 and dev branches
kylex1 May 5, 2026
838cd12
Refactor MainGUI to remove login screen logic
kylex1 May 5, 2026
932fcff
Crear vista de partida con tablero, nombre de jugadores, tiempo y mar…
SophiaForeroedu May 10, 2026
6da952c
Crear vista de partida con tablero, nombre de jugadores, tiempo y mar…
SophiaForeroedu May 11, 2026
028472f
- Cambiar tablero de 19x19 a 9x9 con celdas más grandes (CELL_SIZE=50)
SophiaForeroedu May 12, 2026
1726dfb
Merge pull request #53 from ED1DAM2526/E3-US3-T5-(UI)
SophiaForeroedu May 12, 2026
abe323d
Merge pull request #51 from ED1DAM2526/E3-US3-T6
Saamu844 May 12, 2026
981aeb6
iniciacion con firebase y test a FirebaseMainRepository
Santaro13 May 12, 2026
b151308
iniciacion con firebase y test a FirebaseMainRepository
Santaro13 May 12, 2026
9a8df5d
Merge branch 'dev' into feat/Firebase-ini
Copilot May 12, 2026
ec6a2f3
Arreglo del error del pom.
sergiolozanoprofe May 12, 2026
14115fa
mejorar tablero y validar email en login
SophiaForeroedu May 12, 2026
6295e7c
mejorar tablero y validar email en login
SophiaForeroedu May 12, 2026
c1514f6
Merge remote-tracking branch 'origin/E3-US3-T5-(UI)' into E3-US3-T5-(UI)
SophiaForeroedu May 12, 2026
87c0b4e
mejorar tablero y validar email en login
SophiaForeroedu May 12, 2026
854be49
Correción de un error en el CI
sergiolozanoprofe May 12, 2026
1b62d9a
Correción de un error en el CI
sergiolozanoprofe May 12, 2026
7505f02
Merge pull request #57 from ED1DAM2526/arreglo_java_sdk21
sergiolozanoprofe May 12, 2026
89c7b76
Correción del mismo eror de antes en el CI, todavía había una mención…
sergiolozanoprofe May 12, 2026
18c104a
Merge branch 'dev' into fix/pom
sergiolozanoprofe May 12, 2026
18d620a
Merge pull request #61 from ED1DAM2526/fix/pom
sergiolozanoprofe May 12, 2026
f28b140
arreglo error, mejorar tablero y validar email en login
SophiaForeroedu May 13, 2026
f102db9
Merge branch 'dev' into feat/Firebase-ini
Alvantos22 May 13, 2026
a3dc067
Merge pull request #56 from ED1DAM2526/feat/Firebase-ini
Saamu844 May 13, 2026
449626e
arreglo error, mejorar tablero y validar email en login
SophiaForeroedu May 13, 2026
c0f792c
Merge branch 'dev' into E3-US3-T5-(UI)
Troy-250 May 13, 2026
f1632e2
arreglo error, mejorar tablero y validar email en login
SophiaForeroedu May 13, 2026
79ec901
Merge remote-tracking branch 'origin/E3-US3-T5-(UI)' into E3-US3-T5-(UI)
SophiaForeroedu May 13, 2026
e84b40a
arreglo error, mejorar tablero y validar email en login
SophiaForeroedu May 13, 2026
512dcf1
Merge pull request #60 from ED1DAM2526/E3-US3-T5-(UI)
SophiaForeroedu May 13, 2026
3f5ba7a
Logica del juego preparada para UI
Santaro13 May 13, 2026
da503c3
Merge branch 'dev' into feat/game-logic
LaJefaOff May 13, 2026
68a53c8
Merge pull request #64 from ED1DAM2526/feat/game-logic
LaJefaOff May 14, 2026
a016400
logica y JavaFX implementado y fusionado
Santaro13 May 19, 2026
f59c3ec
Merge pull request #67 from ED1DAM2526/feat/game-logic
Saamu844 May 19, 2026
ae72903
Cambios realizados
Kyle-gi May 19, 2026
b0b2508
Merge branch 'dev' into pantalla_emparejamiento
kylex1 May 19, 2026
229983d
Cambios realizados
Kyle-gi May 19, 2026
4b69ce0
Merge remote-tracking branch 'origin/pantalla_emparejamiento' into pa…
Kyle-gi May 19, 2026
899c7b5
Merge remote-tracking branch 'origin/pantalla_emparejamiento' into pa…
Kyle-gi May 19, 2026
44d66bc
Merge remote-tracking branch 'origin/pantalla_emparejamiento' into pa…
Kyle-gi May 19, 2026
cc91b0a
Merge pull request #70 from ED1DAM2526/pantalla_emparejamiento
Saamu844 May 20, 2026
8f9e5f4
Merge remote-tracking branch 'origin/main' into feat/firebase-final
Santaro13 May 22, 2026
74a12cd
Merge remote-tracking branch 'origin/dev' into feat/firebase-final
Santaro13 May 22, 2026
d2b5413
Registro de usuarios real implementando ui existente
Santaro13 May 22, 2026
1e46551
feat: Implementación completa de multijugador con sincronización Fire…
Santaro13 May 22, 2026
ea0e7a6
docs: Documentación completa para multijugador MM-impl
Santaro13 May 22, 2026
89cc5e8
Merge pull request #71 from ED1DAM2526/feat/firebase-final
Alvantos22 May 22, 2026
e1024d2
implementacion de juego multijugador + juego local.
Santaro13 May 25, 2026
8373fa1
Merge pull request #72 from ED1DAM2526/feat/MM-impl
Alvantos22 May 26, 2026
da25a9b
fix: handle double-pass endgame and avoid freeze in controllers
BreinnerS Jun 17, 2026
3196185
Realizado fixtime y fixdrop
BreinnerS Jun 17, 2026
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
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ target/
### IntelliJ IDEA ###
.idea/modules.xml
.idea/jarRepositories.xml
.idea/compiler.xml
.idea/libraries/
*.iws
*.iml
Expand Down
8 changes: 0 additions & 8 deletions .idea/.gitignore
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/codeInsightSettings.xml
View file
Open in desktop

This file was deleted.

13 changes: 13 additions & 0 deletions .idea/compiler.xml
View file
Open in desktop

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

6 changes: 0 additions & 6 deletions .idea/copilot.data.migration.ask2agent.xml
View file
Open in desktop

This file was deleted.

137 changes: 137 additions & 0 deletions .idea/copilotDiffState.xml
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 0 additions & 12 deletions .idea/material_theme_project_new.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion .idea/misc.xml
View file
Open in desktop

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

3 changes: 2 additions & 1 deletion .idea/vcs.xml
View file
Open in desktop

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

133 changes: 133 additions & 0 deletions .idea/workspace.xml
View file
Open in desktop

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

Loading
Loading