Commits

Branch selector

 master

User selector

All users

Datepicker

All time

Commit History

Commits on May 31, 2022

• eventos post acciones, por ahora combates

  Patataman

  committed
  1285e26

  Copy full SHA for 1285e26

• cambio en los nombres de ficheros y json de mapas para que coincidan

  Patataman

  committed
  f744ee4

  Copy full SHA for f744ee4

Commits on May 16, 2022

• merge con el rework del combate

  Patataman

  committed
  db27d34

  Copy full SHA for db27d34

• Merge pull request #12 from guluc3m/dev_adri

  Show description for 535c1f3
  Patataman

  authored
  535c1f3

  Copy full SHA for 535c1f3

• cosas olvidadas, comienzo eventos post combates y miniarreglos inventario

  Patataman

  committed
  97deef1

  Copy full SHA for 97deef1

Commits on Nov 25, 2021

• Cambiar variable de estados a un diccionario

  SeindElBardo

  committed
  4e8c87c

  Copy full SHA for 4e8c87c

• Mejora de duelo para añadir stados y fases de duelo

  SeindElBardo

  committed
  533a0fb

  Copy full SHA for 533a0fb

Commits on Oct 18, 2021

• Merge remote-tracking branch 'origin/master' into dev_adri

  SeindElBardo

  committed
  403b5e1

  Copy full SHA for 403b5e1

Commits on Oct 12, 2021

• adapt to fullscrean resolution

  Patataman

  committed
  8506162

  Copy full SHA for 8506162

Commits on Oct 7, 2021

• Merge remote-tracking branch 'origin/master' into dev_adri

  SeindElBardo

  committed
  f966f39

  Copy full SHA for f966f39

Commits on Sep 30, 2021

• Merge pull request #11 from guluc3m/dev_adri

  Show description for bf218d5
  Patataman

  authored
  bf218d5

  Copy full SHA for bf218d5

Commits on Sep 26, 2021

• menús inventario

  Patataman

  committed
  05490d7

  Copy full SHA for 05490d7

Commits on Aug 2, 2021

• Integración

  SeindElBardo

  committed
  9b50313

  Copy full SHA for 9b50313

• added equipped items 1st iteration but UI is wrong

  Patataman

  committed
  f54e119

  Copy full SHA for f54e119

Commits on Jul 26, 2021

• Merge remote-tracking branch 'origin/master' into dev_adri

  Show description for 413488f
  SeindElBardo

  committed
  413488f

  Copy full SHA for 413488f

• New duel scene

  SeindElBardo

  committed
  d675fd2

  Copy full SHA for d675fd2

• intertactive inventary

  Patataman

  committed
  52b3fea

  Copy full SHA for 52b3fea

Commits on Jul 12, 2021

• lógica y early stage de los items

  Patataman

  committed
  ec1563e

  Copy full SHA for ec1563e

Commits on Jun 15, 2021

• Merge remote-tracking branch 'origin/master' into dev_adri

  SeindElBardo

  committed
  88f6893

  Copy full SHA for 88f6893

Commits on Jun 12, 2021

• Merge branch 'master' of https://github.com/guluc3m/morgana

  Patataman

  committed
  742f6d4

  Copy full SHA for 742f6d4

• remake mvp_lvl1

  Patataman

  committed
  7a8a9e2

  Copy full SHA for 7a8a9e2

• Merge pull request #10 from guluc3m/dev_adri

  Show description for 2dd2b3e
  Patataman

  authored
  2dd2b3e

  Copy full SHA for 2dd2b3e

Commits on Jun 7, 2021

• Merge remote-tracking branch 'origin/master' into dev_adri

  Show description for 76c9d40
  SeindElBardo

  committed
  76c9d40

  Copy full SHA for 76c9d40

• Cambio de los sprites de los enemigos en duelo, creación de animaciones y barras de vida de los enemigos.

  SeindElBardo

  committed
  9957a03

  Copy full SHA for 9957a03

• rehacer vista duelo

  Patataman

  committed
  cba3ca9

  Copy full SHA for cba3ca9

Commits on Jun 3, 2021

• Merge remote-tracking branch 'origin/master' into dev_adri

  SeindElBardo

  committed
  354ff7c

  Copy full SHA for 354ff7c

Commits on May 31, 2021

• vida apuntable + empezar rediseño vista duelo

  Patataman

  committed
  dda243d

  Copy full SHA for dda243d

Commits on May 17, 2021

• Merge remote-tracking branch 'origin/master' into dev_adri

  Show description for b6fc75c
  SeindElBardo

  committed
  b6fc75c

  Copy full SHA for b6fc75c

• Rewards and inventory struct

  SeindElBardo

  committed
  8a176c7

  Copy full SHA for 8a176c7

• restore player health and energy when going to the lobby

  Patataman

  committed
  ad3ef40

  Copy full SHA for ad3ef40

• Merge remote-tracking branch 'origin/master' into dev_adri

  SeindElBardo

  committed
  56f04ea

  Copy full SHA for 56f04ea

Commits on May 10, 2021

• Merge pull request #9 from guluc3m/dev_adri

  Show description for 6e64fff
  Patataman

  authored
  6e64fff

  Copy full SHA for 6e64fff

Commits on May 9, 2021

• update change scene to keep position and stuff

  Patataman

  committed
  552ebe0

  Copy full SHA for 552ebe0

Commits on Apr 30, 2021

• Puestas las nuevas imágenes de las cartas

  SeindElBardo

  committed
  6fb35bc

  Copy full SHA for 6fb35bc

• Merge remote-tracking branch 'origin/dev_adri' into dev_adri

  SeindElBardo

  committed
  cbb4675

  Copy full SHA for cbb4675

Pagination

Previous

Next