-
- Downloads
Merge branch 'develop' into 'ciudad'
# Conflicts: # app/src/main/java/com/example/ellegadodepintia/repositorios/RepositorioObjetos.kt
No related branches found
No related tags found
This commit is part of merge request !60. Comments created here will be created in the context of that merge request.
Showing
- .idea/deploymentTargetSelector.xml 8 additions, 0 deletions.idea/deploymentTargetSelector.xml
- .idea/misc.xml 1 addition, 1 deletion.idea/misc.xml
- app/src/main/AndroidManifest.xml 1 addition, 0 deletionsapp/src/main/AndroidManifest.xml
- app/src/main/java/com/example/ellegadodepintia/ListaMinijuegos.kt 11 additions, 0 deletions...main/java/com/example/ellegadodepintia/ListaMinijuegos.kt
- app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/ExploradoresDePintia.kt 72 additions, 6 deletions...gadodepintia/exploradoresDePintia/ExploradoresDePintia.kt
- app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/ModalDetallesEnemigo.kt 1 addition, 1 deletion...gadodepintia/exploradoresDePintia/ModalDetallesEnemigo.kt
- app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/Atributo.kt 2 additions, 1 deletion...e/ellegadodepintia/exploradoresDePintia/model/Atributo.kt
- app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/GeneradorDeEventos.kt 72 additions, 7 deletions...depintia/exploradoresDePintia/model/GeneradorDeEventos.kt
- app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/GestorCombate.kt 76 additions, 20 deletions...egadodepintia/exploradoresDePintia/model/GestorCombate.kt
- app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/GestorDeEventos.kt 0 additions, 1 deletion...adodepintia/exploradoresDePintia/model/GestorDeEventos.kt
- app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/Jugador.kt 16 additions, 1 deletion...le/ellegadodepintia/exploradoresDePintia/model/Jugador.kt
- app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/LayoutUtils.kt 29 additions, 15 deletions...llegadodepintia/exploradoresDePintia/model/LayoutUtils.kt
- app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/TipoEvento.kt 6 additions, 2 deletions...ellegadodepintia/exploradoresDePintia/model/TipoEvento.kt
- app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/efecto/EfectoAtaqueEnemigo.kt 1 addition, 1 deletion.../exploradoresDePintia/model/efecto/EfectoAtaqueEnemigo.kt
- app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/efecto/EfectoAtaqueProtagonista.kt 2 additions, 2 deletions...oradoresDePintia/model/efecto/EfectoAtaqueProtagonista.kt
- app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/efecto/EfectoCriticoAutomaticoEnemigo.kt 20 additions, 0 deletions...esDePintia/model/efecto/EfectoCriticoAutomaticoEnemigo.kt
- app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/efecto/EfectoDestruir.kt 8 additions, 1 deletion...intia/exploradoresDePintia/model/efecto/EfectoDestruir.kt
- app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/efecto/EfectoLadron.kt 18 additions, 0 deletions...epintia/exploradoresDePintia/model/efecto/EfectoLadron.kt
- app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/efecto/EfectoNubeVaccea.kt 24 additions, 0 deletions...tia/exploradoresDePintia/model/efecto/EfectoNubeVaccea.kt
- app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/efecto/EfectoRegeneracionEnemigo.kt 14 additions, 0 deletions...radoresDePintia/model/efecto/EfectoRegeneracionEnemigo.kt
Loading
Please register or sign in to comment