-
- Downloads
Merge branch 'develop' into 'eventoDescanso'
# Conflicts: # app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/eventoFactory/EventoFactorySelector.kt
No related branches found
No related tags found
Showing
- app/src/main/AndroidManifest.xml 1 addition, 0 deletionsapp/src/main/AndroidManifest.xml
- app/src/main/java/com/example/ellegadodepintia/MapActivity.kt 6 additions, 0 deletions...src/main/java/com/example/ellegadodepintia/MapActivity.kt
- app/src/main/java/com/example/ellegadodepintia/TiendaActivity.kt 29 additions, 0 deletions.../main/java/com/example/ellegadodepintia/TiendaActivity.kt
- app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/Resumen.kt 53 additions, 8 deletions.../example/ellegadodepintia/exploradoresDePintia/Resumen.kt
- app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/Jugador.kt 13 additions, 3 deletions...le/ellegadodepintia/exploradoresDePintia/model/Jugador.kt
- app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/efecto/EfectoRiesgo.kt 4 additions, 2 deletions...epintia/exploradoresDePintia/model/efecto/EfectoRiesgo.kt
- app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/eventoFactory/EventoRiesgo.kt 15 additions, 1 deletion.../exploradoresDePintia/model/eventoFactory/EventoRiesgo.kt
- app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/eventoFactory/ReliquiaFactory.kt 5 additions, 26 deletions...ploradoresDePintia/model/eventoFactory/ReliquiaFactory.kt
- app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/eventoFactory/RiesgoFactory.kt 54 additions, 24 deletions...exploradoresDePintia/model/eventoFactory/RiesgoFactory.kt
- app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/eventoFactory/TiendaFactory.kt 6 additions, 30 deletions...exploradoresDePintia/model/eventoFactory/TiendaFactory.kt
- app/src/main/java/com/example/ellegadodepintia/repositorios/RepositorioObjetos.kt 93 additions, 0 deletions...ample/ellegadodepintia/repositorios/RepositorioObjetos.kt
- app/src/main/java/com/example/ellegadodepintia/ruleta/Ruleta.kt 15 additions, 2 deletions...c/main/java/com/example/ellegadodepintia/ruleta/Ruleta.kt
- app/src/main/res/asi_objeto_ticker.png 0 additions, 0 deletionsapp/src/main/res/asi_objeto_ticker.png
- app/src/main/res/drawable/asi_objeto_ticket.png 0 additions, 0 deletionsapp/src/main/res/drawable/asi_objeto_ticket.png
- app/src/main/res/drawable/background_tienda.png 0 additions, 0 deletionsapp/src/main/res/drawable/background_tienda.png
- app/src/main/res/layout/activity_resumen_partida.xml 10 additions, 0 deletionsapp/src/main/res/layout/activity_resumen_partida.xml
- app/src/main/res/layout/activity_tienda.xml 429 additions, 0 deletionsapp/src/main/res/layout/activity_tienda.xml
Loading
Please register or sign in to comment