Commits · Tipos_enemigos · Álvaro Morales García / DesarrolloDeVideojuegos_Proyecto · GitLab

09 May, 2020 5 commits
- Arreglos · 1a13433f
  Álvaro Morales García committed May 09, 2020
  
  1a13433f
- Varios tipos de enemigos con diferentes balas · 38967b4b
  Álvaro Morales García committed May 09, 2020
  
  38967b4b
- Merge branch '17-comprobacion-del-logro-recogidas-todas-las-notas' into Release · e46f3a32
  David Colmenero Chica committed May 09, 2020
  
  e46f3a32 Browse Files
- Ligeros cambios · 5f512eaa
  David Colmenero Chica committed May 09, 2020
  
  5f512eaa
- Merge branch 'Release' into 17-comprobacion-del-logro-recogidas-todas-las-notas · 77aace5c
  David Colmenero Chica committed May 09, 2020
  
  77aace5c Browse Files
08 May, 2020 2 commits
- Merge branch 'Montaje_Nivel' into Release · 9253c261
  Juan Carlos committed May 09, 2020
  
  9253c261 Browse Files
- Nivel medio hecho, falta: · 02ba42a7
```
- Colocar coleccionables correctamente
- El segundo mob que matas te da directamente la ultima parte, hacer que la de el último que matas
```
  Juan Carlos committed May 09, 2020
  02ba42a7 Browse Files
07 May, 2020 9 commits
- Merge branch 'Plataformas' into Release · cb24184f
  Juan Carlos committed May 07, 2020
  
  cb24184f Browse Files
- Commit antes de merge · 6671ee87
  Juan Carlos committed May 07, 2020
  
  6671ee87
- Merge remote-tracking branch 'origin/Ataque_melee_y_creditos' into Release · 16b2820d
  David Colmenero Chica committed May 07, 2020
  
  16b2820d Browse Files
- Arreglo de algunos bugs · 762a060d
  David Colmenero Chica committed May 07, 2020
  
  762a060d
- Merge branch 'Release' into Ataque_melee_y_creditos · f8ab9694
  David Colmenero Chica committed May 07, 2020
  
  f8ab9694 Browse Files
- Pequeño conflicto arreglado · 1bfeae6a
  David Colmenero Chica committed May 07, 2020
  
  1bfeae6a
- Merge remote-tracking branch 'origin/Ataque_melee_y_creditos' into Release · 3ff7242a
  David Colmenero Chica committed May 07, 2020
  
  3ff7242a Browse Files
- Y los creditos tambien ^^ · 38d3d23a
  David Colmenero Chica committed May 07, 2020
  
  38d3d23a
- El ataque a melee funcionaaa!!! · a25ed37c
  David Colmenero Chica committed May 07, 2020
  
  a25ed37c
06 May, 2020 11 commits
- Pequeño cambio · f398900b
  David Colmenero Chica committed May 06, 2020
  
  f398900b Browse Files
- Conflicto arreglado · 31a86fd9
  Juan Carlos committed May 06, 2020
  
  31a86fd9
- Merge branch 'Interfaz_Nivel' into Release · 84f56ba1
  Juan Carlos committed May 06, 2020
  
  84f56ba1 Browse Files
- Commit antes de merge · d5e59bf9
  Juan Carlos committed May 06, 2020
  
  d5e59bf9 Browse Files
- Commit interfaz hecha · 1a3ecbc5
  Juan Carlos committed May 06, 2020
  
  1a3ecbc5 Browse Files
- Merge remote-tracking branch 'origin/Diseño-menu-extras' into Release · 8726b94e
  David Colmenero Chica committed May 06, 2020
  
  8726b94e Browse Files
- Merge remote-tracking branch 'origin/Release' into Diseño-menu-extras · c0865be5
  David Colmenero Chica committed May 06, 2020
  
  c0865be5 Browse Files
- Añadida la cancion · 1e96615f
  David Colmenero Chica committed May 06, 2020
  
  1e96615f
- Merge branch 'Musica' into Release · 88de7131
  Álvaro Morales García committed May 06, 2020
  
  88de7131 Browse Files
- Musica de menú · 070fd30f
  Álvaro Morales García committed May 06, 2020
  
  070fd30f
- Merge remote-tracking branch 'origin/Release' into Diseño-menu-extras · 862b0750
  David Colmenero Chica committed May 06, 2020
  
  862b0750 Browse Files
05 May, 2020 13 commits
- Merge branch 'Power_Ups' into Release · 70e1c2cd
  Juan Carlos committed May 05, 2020
  
  70e1c2cd Browse Files
- Commit antes de merge · 8cf47d52
  Juan Carlos committed May 05, 2020
  
  8cf47d52
- Ya solo queda que suene la cancion :D · c290fa8d
  David Colmenero Chica committed May 05, 2020
  
  c290fa8d
- Merge 'Power_Ups' into Release · c5c6d1bf
  Juan Carlos committed May 05, 2020
  
  c5c6d1bf Browse Files
- Merge 'Release' into Power_Ups · 944a28b7
  Juan Carlos committed May 05, 2020
  
  944a28b7 Browse Files
- Commit antes de merge · b9c10d90
  Juan Carlos committed May 05, 2020
  
  b9c10d90
- Merge remote-tracking branch 'origin/Release' into Diseño-menu-extras · c45580fa
  David Colmenero Chica committed May 05, 2020
  
  c45580fa Browse Files
- Menu extras añadido pero sin funcionalidades aun · 03cac2e5
  David Colmenero Chica committed May 05, 2020
  
  03cac2e5 Browse Files
- Merge branch 'Muerte(CondicionesFracaso)' into Release · 918e834f
  Álvaro Morales García committed May 05, 2020
  
  918e834f Browse Files
- Muerte del jugador por 0 vidas o caida · d07b0fdf
  Álvaro Morales García committed May 05, 2020
  
  d07b0fdf
- Merge branch 'Release' into Power_Ups · 4217049b
  Juan Carlos committed May 05, 2020
  
  4217049b Browse Files
- Commit antes de merge · a3f9e7ab
  Juan Carlos committed May 05, 2020
  
  a3f9e7ab Browse Files
- Cosillas añadidas · 0cae2485
```
Me acabo de dar cuenta que estaba trabajando en la release, no volvera a pasar...
```
  David Colmenero Chica committed May 05, 2020
  0cae2485