Commits

Branch selector

 master

User selector

All users

All time

Commit History

Commits on May 25, 2017

• Merge pull request #15 from blzkz/Equipo_P3

  Show description for 2af40b8
  blzkz

  authored
  2af40b8

  Copy full SHA for 2af40b8

Commits on Feb 21, 2017

• Equipo_P3 - Estadisticas

  blzkz

  committed
  35f2339

  Copy full SHA for 35f2339

Commits on Feb 20, 2017

• Merge pull request #14 from blzkz/Equipo_P2

  Show description for 42404f0
  blzkz

  authored
  42404f0

  Copy full SHA for 42404f0

Commits on Feb 11, 2017

• Equipo_P2 - Interfaz arma

  blzkz

  committed
  6f6982d

  Copy full SHA for 6f6982d

Commits on Feb 5, 2017

• Merge pull request #13 from blzkz/Equipo_P1

  Show description for 35a6710
  blzkz

  authored
  35a6710

  Copy full SHA for 35a6710

Commits on Jan 28, 2017

• Equipo_P1 - Añadida funcionalidad que permite equipar objetos

  blzkz

  committed
  4dfbee7

  Copy full SHA for 4dfbee7

Commits on Dec 20, 2016

• Merge pull request #12 from blzkz/Inventario_P7

  Show description for 271c4e9
  blzkz

  authored
  271c4e9

  Copy full SHA for 271c4e9

• Merge branch 'master' of https://github.com/blzkz/RGP_Unity into Inventario_P7

  Show description for e4578ff
  blzkz

  committed
  e4578ff

  Copy full SHA for e4578ff

• Inventario_P7 - Input

  blzkz

  committed
  3caa764

  Copy full SHA for 3caa764

• Inventario_P7 - Añadida funcionalidad de soltar y recoger objeto

  blzkz

  committed
  62d6f8f

  Copy full SHA for 62d6f8f

• Merge pull request #11 from blzkz/Inventario_P6-2

  Show description for 678d960
  blzkz

  authored
  678d960

  Copy full SHA for 678d960

Commits on Dec 4, 2016

• Inventario_P6-2 añadida funcionalidad de soltar objeto

  blzkz

  committed
  fa0bc7f

  Copy full SHA for fa0bc7f

Commits on Dec 2, 2016

• Merge pull request #10 from blzkz/Inventario_P6

  Show description for 7a8fa1b
  blzkz

  authored
  7a8fa1b

  Copy full SHA for 7a8fa1b

Commits on Nov 21, 2016

• Inventario_P6 - Creacion de la interfaz de usuario de inventario

  blzkz

  committed
  99d6c3d

  Copy full SHA for 99d6c3d

Commits on Nov 13, 2016

• Merge pull request #9 from blzkz/Inventario_P5

  Show description for 4462d20
  blzkz

  authored
  4462d20

  Copy full SHA for 4462d20

• Inventario_P5 - Acumular objetos y establecer límite en el inventario

  blzkz

  committed
  f4f8f77

  Copy full SHA for f4f8f77

• Merge pull request #8 from blzkz/Inventario_P4

  Show description for 683f53a
  blzkz

  authored
  683f53a

  Copy full SHA for 683f53a

• Inventario_P4 - Arreglado mensaje de error al seleccionar el prefab de inventario. En el script InventarioEditor se comprueba que exista una instancia de GameManager antes de acceder a ella

  blzkz

  committed
  118b517

  Copy full SHA for 118b517

Commits on Nov 11, 2016

• Merge pull request #7 from blzkz/Inventario_P4

  Show description for 31651f8
  blzkz

  authored
  31651f8

  Copy full SHA for 31651f8

• Inventario_P4 - Añadida funcionalidad para guardar el estado del inventario y luego cargarlo

  blzkz

  committed
  9a32273

  Copy full SHA for 9a32273

Commits on Nov 9, 2016

• Merge pull request #6 from blzkz/Inventario_P3

  Show description for d67dc12
  blzkz

  authored
  d67dc12

  Copy full SHA for d67dc12

• Inventario_P3 - Modificado el inspector del inventario

  blzkz

  committed
  7bebafa

  Copy full SHA for 7bebafa

Commits on Nov 1, 2016

• Merge pull request #5 from blzkz/Inventario_P2

  Show description for 12a6221
  blzkz

  authored
  12a6221

  Copy full SHA for 12a6221

Commits on Oct 28, 2016

• Inventario_P2 - Añadida mochila y metodos para añadir y borrar objetos a la misma

  blzkz

  committed
  d9c5d26

  Copy full SHA for d9c5d26

Commits on Oct 27, 2016

• Merge pull request #4 from blzkz/Inventario_P1

  Show description for a702006
  blzkz

  authored
  a702006

  Copy full SHA for a702006

Commits on Oct 26, 2016

• Inventario_P1 - Añadir cargador de base de datos de objetos

  blzkz

  committed
  a136579

  Copy full SHA for a136579

Commits on Oct 19, 2016

• Merge pull request #3 from blzkz/GameManager

  Show description for a6ad6b0
  blzkz

  authored
  a6ad6b0

  Copy full SHA for a6ad6b0

Commits on Oct 17, 2016

• GameManager - Añadido gamemanager implementando singleton, modificado el personaje para crearlo desde el game manager

  blzkz

  committed
  2e4255b

  Copy full SHA for 2e4255b

Commits on Oct 6, 2016

• Merge pull request #2 from blzkz/Sorting_layers

  Show description for 4556921
  blzkz

  authored
  4556921

  Copy full SHA for 4556921

Commits on Sep 23, 2016

• Añadiendo sorting layers

  blzkz

  committed
  fb6db41

  Copy full SHA for fb6db41

Commits on Sep 22, 2016

• Merge pull request #1 from blzkz/Introduccion

  Show description for 4741950
  blzkz

  authored
  4741950

  Copy full SHA for 4741950

Commits on Sep 13, 2016

• Commit del video de introducción

  blzkz

  committed
  774b86c

  Copy full SHA for 774b86c

• Initial commit

  blzkz

  committed
  eb905ec

  Copy full SHA for eb905ec