Skip to content
Snippets Groups Projects

Repository graph

You can move around the graph by using the arrow keys.
Select Git revision
  • main default protected
1 result
Created with Raphaël 2.2.018Mar12Dec103228Nov25242322232221222120191817161514131276531mainmainmainMerge branch 'cacacaacacacacacaccacacacallej' into 'main'Feature:Merge branch 'develop' into 'main'Feature:Feature:Merge branch 'arreglar-cousas' into 'develop'Feature:Feature:Feature:Feature:Feature:Feature:Merge branch 'bloquear-y-interfaces' into 'develop'Feature:Merge branch 'tutoriales' into 'develop'Feature:Feature:Feature:Feature:Merge branch 'inventarioDB' into 'develop'Fix: No dar cosas incialmente al jugadorFeature: El inventario se guarda en la base de datosFix: Fusión de ciudad con develop sin erroresMerge branch 'ciudad' into 'develop'Merge branch 'develop' into 'ciudad'Fix: El jugador es el único que se comunica con su repositorioMerge remote-tracking branch 'origin/develop' into developFeature: nuevo enemigo loboMerge branch 'efectos' into 'develop'Feature:Fix: Ya se actualizan las monedas en el mapa de la ciudad al gastar en los edificiosMerge branch 'taberna' into 'ciudad'Fix: Ahora todos los objetos tienen un atributo costeMerge branch 'intefaces' into 'develop'Merge branch 'develop' into 'intefaces'Feature:Feature: Añadido nuevo objeto puñalFeature:Feature: Añadida nuevo evento reliquia