Commit f3dbff61 authored 4 months ago by viccall

Merge branch 'arreglar-cousas' into 'develop'

Feature:

See merge request !64

parents 7e7b242e 37b1f7f0

Hide whitespace changes

Inline Side-by-side

Showing

.idea/deploymentTargetSelector.xml 1 addition, 1 deletion

.idea/deploymentTargetSelector.xml
.idea/misc.xml 2 additions, 1 deletion

.idea/misc.xml
app/src/main/java/com/example/ellegadodepintia/ArmeriaActivity.kt 12 additions, 2 deletions

...main/java/com/example/ellegadodepintia/ArmeriaActivity.kt
app/src/main/java/com/example/ellegadodepintia/AuthActivity.kt 87 additions, 8 deletions

...rc/main/java/com/example/ellegadodepintia/AuthActivity.kt
app/src/main/java/com/example/ellegadodepintia/LeaderBoardActivity.kt 22 additions, 5 deletions

.../java/com/example/ellegadodepintia/LeaderBoardActivity.kt
app/src/main/java/com/example/ellegadodepintia/MainActivity.kt 0 additions, 6 deletions

...rc/main/java/com/example/ellegadodepintia/MainActivity.kt
app/src/main/java/com/example/ellegadodepintia/MapActivity.kt 27 additions, 6 deletions

...src/main/java/com/example/ellegadodepintia/MapActivity.kt
app/src/main/java/com/example/ellegadodepintia/TabernaActivity.kt 11 additions, 3 deletions

...main/java/com/example/ellegadodepintia/TabernaActivity.kt
app/src/main/java/com/example/ellegadodepintia/TiendaActivity.kt 13 additions, 1 deletion

.../main/java/com/example/ellegadodepintia/TiendaActivity.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/ExploradoresDePintia.kt 36 additions, 2 deletions

...gadodepintia/exploradoresDePintia/ExploradoresDePintia.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/ModalConfirmacion.kt 9 additions, 0 deletions

...llegadodepintia/exploradoresDePintia/ModalConfirmacion.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/ModalDetallesCompra.kt 10 additions, 0 deletions

...egadodepintia/exploradoresDePintia/ModalDetallesCompra.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/ModalDetallesEnemigo.kt 9 additions, 0 deletions

...gadodepintia/exploradoresDePintia/ModalDetallesEnemigo.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/ModalDetallesFragment.kt 9 additions, 1 deletion

...adodepintia/exploradoresDePintia/ModalDetallesFragment.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/ModalHabilidadesProtagonista.kt 10 additions, 0 deletions

...ntia/exploradoresDePintia/ModalHabilidadesProtagonista.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/LayoutUtils.kt 11 additions, 6 deletions

...llegadodepintia/exploradoresDePintia/model/LayoutUtils.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/habilidad/efectoHabilidad/EfectoBuffo.kt 8 additions, 1 deletion

...esDePintia/model/habilidad/efectoHabilidad/EfectoBuffo.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/habilidad/efectoHabilidad/EfectoGolpeMultiple.kt 12 additions, 0 deletions

...ia/model/habilidad/efectoHabilidad/EfectoGolpeMultiple.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/objeto/efectoObjeto/EfectoObjetoAtacar.kt 7 additions, 1 deletion

...sDePintia/model/objeto/efectoObjeto/EfectoObjetoAtacar.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/objeto/efectoObjeto/EfectoObjetoCura.kt 6 additions, 0 deletions

...resDePintia/model/objeto/efectoObjeto/EfectoObjetoCura.kt

with 302 additions and 44 deletions

Please register or to comment