{"push_id":1093675350,"size":26,"distinct_size":6,"ref":"refs/heads/dieste","head":"59de2d93bad1ea116a8c6b814f4bbf533d4ffede","before":"d2011e52a62a44cf42eb9f68760b9a7e99eb9efd","commits":[{"sha":"08e71c97a389ba729e8d17247ca903960a70c3cf","author":{"email":"4a26cbeaa14060363eb2d8f554a0870e2940c11f@unizar.es","name":"Alejandro Dieste Cortes"},"message":"Merge pull request #58 from jorcox/dieste\n\nDieste","distinct":false,"url":"https://api.github.com/repos/jorcox/PokemonEina/commits/08e71c97a389ba729e8d17247ca903960a70c3cf"},{"sha":"9963cbe63efc00733ac86eb7a8919c3754d76558","author":{"email":"4b20260352dbf30ddea70f419ad5e23944a0018a@unizar.es","name":"Jorge"},"message":"NPCs se mueven y tal.","distinct":false,"url":"https://api.github.com/repos/jorcox/PokemonEina/commits/9963cbe63efc00733ac86eb7a8919c3754d76558"},{"sha":"2baf0cf89b6042f91fce26f26f6c3b55ecc608f3","author":{"email":"71fb9912dbc6ccd04d5eb3a15c36d350e1c03207@gmail.com","name":"MrJavo94"},"message":"Empezando contexto global","distinct":false,"url":"https://api.github.com/repos/jorcox/PokemonEina/commits/2baf0cf89b6042f91fce26f26f6c3b55ecc608f3"},{"sha":"36482b596659576ea8d615bb91faaf952adb077e","author":{"email":"71fb9912dbc6ccd04d5eb3a15c36d350e1c03207@gmail.com","name":"MrJavo94"},"message":"Properties de merda","distinct":false,"url":"https://api.github.com/repos/jorcox/PokemonEina/commits/36482b596659576ea8d615bb91faaf952adb077e"},{"sha":"6645e3f9ddf665c5940a3cc41b68bf1a26b9b405","author":{"email":"71fb9912dbc6ccd04d5eb3a15c36d350e1c03207@gmail.com","name":"MrJavo94"},"message":"Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tpokemon_base.properties\n\tsrc/com/pokemon/entities/Player.java\n\tsrc/com/pokemon/pantallas/CombateEntrenador.java\n\tsrc/com/pokemon/pantallas/CombateP.java\n\tsrc/com/pokemon/pantallas/Enfrentamiento.java\n\tsrc/com/pokemon/pantallas/MenuPlay.java\n\tsrc/com/pokemon/pantallas/Play.java","distinct":false,"url":"https://api.github.com/repos/jorcox/PokemonEina/commits/6645e3f9ddf665c5940a3cc41b68bf1a26b9b405"},{"sha":"7a425257b40a4c052d8cd12b3b7c9b1577568977","author":{"email":"4b20260352dbf30ddea70f419ad5e23944a0018a@unizar.es","name":"Jorge"},"message":"Merge remote-tracking branch 'origin/master' into Jorge\n\nConflicts:\n\tpokemon_base.properties","distinct":false,"url":"https://api.github.com/repos/jorcox/PokemonEina/commits/7a425257b40a4c052d8cd12b3b7c9b1577568977"},{"sha":"53df8efc6628b1b17658ef55ca7ed39410b479f0","author":{"email":"4b20260352dbf30ddea70f419ad5e23944a0018a@unizar.es","name":"Jorge Cáncer Gil"},"message":"Merge pull request #59 from jorcox/Jorge\n\nNPCs se mueven y tal.","distinct":false,"url":"https://api.github.com/repos/jorcox/PokemonEina/commits/53df8efc6628b1b17658ef55ca7ed39410b479f0"},{"sha":"8a2178e08feaa2401d4af7656f88e791f96eadea","author":{"email":"71fb9912dbc6ccd04d5eb3a15c36d350e1c03207@gmail.com","name":"MrJavo94"},"message":"Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tpokemon_base.properties\n\tsrc/com/pokemon/PokemonAdaByron.java\n\tsrc/com/pokemon/pantallas/Play.java","distinct":false,"url":"https://api.github.com/repos/jorcox/PokemonEina/commits/8a2178e08feaa2401d4af7656f88e791f96eadea"},{"sha":"5cef640ca1eba08110b07deac5e5ab1dd9d3eeb5","author":{"email":"3b0509df49cab92f40ad74be42ae3b34583645c2@users.noreply.github.com","name":"Javier Beltrán Jorba"},"message":"Merge pull request #60 from jorcox/javier\n\nJavier","distinct":false,"url":"https://api.github.com/repos/jorcox/PokemonEina/commits/5cef640ca1eba08110b07deac5e5ab1dd9d3eeb5"},{"sha":"6ea11e784fa2e9e4a1ec1f7f6cbb98fc47f7c72a","author":{"email":"71fb9912dbc6ccd04d5eb3a15c36d350e1c03207@gmail.com","name":"MrJavo94"},"message":"Contexto: mochila ok","distinct":false,"url":"https://api.github.com/repos/jorcox/PokemonEina/commits/6ea11e784fa2e9e4a1ec1f7f6cbb98fc47f7c72a"},{"sha":"d3731518ec3297ea398d69773fdbb0f7df2a7258","author":{"email":"71fb9912dbc6ccd04d5eb3a15c36d350e1c03207@gmail.com","name":"MrJavo94"},"message":"Merge remote-tracking branch 'origin/master'","distinct":false,"url":"https://api.github.com/repos/jorcox/PokemonEina/commits/d3731518ec3297ea398d69773fdbb0f7df2a7258"},{"sha":"5757757e2bba956a5793c9c889287d60fe507da5","author":{"email":"3b0509df49cab92f40ad74be42ae3b34583645c2@users.noreply.github.com","name":"Javier Beltrán Jorba"},"message":"Merge pull request #61 from jorcox/javier\n\nJavier","distinct":false,"url":"https://api.github.com/repos/jorcox/PokemonEina/commits/5757757e2bba956a5793c9c889287d60fe507da5"},{"sha":"e3de142cba2f03aab70eff2190c921909d1594ca","author":{"email":"4b20260352dbf30ddea70f419ad5e23944a0018a@unizar.es","name":"Jorge"},"message":"Mejoras en visualización. Y en personajes.","distinct":false,"url":"https://api.github.com/repos/jorcox/PokemonEina/commits/e3de142cba2f03aab70eff2190c921909d1594ca"},{"sha":"1ab923ef8b1263dd7e6d40e0c38e9520721eb1e4","author":{"email":"4b20260352dbf30ddea70f419ad5e23944a0018a@unizar.es","name":"Jorge"},"message":"Merge remote-tracking branch 'origin/master' into Jorge\n\nConflicts:\n\tpokemon_base.properties\n\tsrc/com/pokemon/pantallas/Play.java","distinct":false,"url":"https://api.github.com/repos/jorcox/PokemonEina/commits/1ab923ef8b1263dd7e6d40e0c38e9520721eb1e4"},{"sha":"1ba25021456039ec87bc3e815ae1211c804d6000","author":{"email":"4b20260352dbf30ddea70f419ad5e23944a0018a@unizar.es","name":"Jorge Cáncer Gil"},"message":"Merge pull request #62 from jorcox/Jorge\n\nJorge","distinct":false,"url":"https://api.github.com/repos/jorcox/PokemonEina/commits/1ba25021456039ec87bc3e815ae1211c804d6000"},{"sha":"f3d4d2491dffbf7143a9aa5e3a9cee23dd4aef55","author":{"email":"4b20260352dbf30ddea70f419ad5e23944a0018a@unizar.es","name":"Jorge"},"message":"Arreglados dialogos carteles","distinct":false,"url":"https://api.github.com/repos/jorcox/PokemonEina/commits/f3d4d2491dffbf7143a9aa5e3a9cee23dd4aef55"},{"sha":"5eca01a5ced102dce56289514dca82ea886efd17","author":{"email":"4b20260352dbf30ddea70f419ad5e23944a0018a@unizar.es","name":"Jorge Cáncer Gil"},"message":"Merge pull request #63 from jorcox/Jorge\n\nArreglados dialogos carteles","distinct":false,"url":"https://api.github.com/repos/jorcox/PokemonEina/commits/5eca01a5ced102dce56289514dca82ea886efd17"},{"sha":"6e7b0d144e69e465079a391c0bed135a8e7c7fb7","author":{"email":"71fb9912dbc6ccd04d5eb3a15c36d350e1c03207@gmail.com","name":"MrJavo94"},"message":"MO","distinct":false,"url":"https://api.github.com/repos/jorcox/PokemonEina/commits/6e7b0d144e69e465079a391c0bed135a8e7c7fb7"},{"sha":"5d164f6e38c9d67ebd7a48a1d1d6eab23f4e7b69","author":{"email":"71fb9912dbc6ccd04d5eb3a15c36d350e1c03207@gmail.com","name":"MrJavo94"},"message":"Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tpokemon_base.properties\n\tsrc/com/pokemon/PokemonAdaByron.java","distinct":false,"url":"https://api.github.com/repos/jorcox/PokemonEina/commits/5d164f6e38c9d67ebd7a48a1d1d6eab23f4e7b69"},{"sha":"604782a64b5ea1287084abeabbab43efb020b274","author":{"email":"3b0509df49cab92f40ad74be42ae3b34583645c2@users.noreply.github.com","name":"Javier Beltrán Jorba"},"message":"Merge pull request #64 from jorcox/javier\n\nJavier","distinct":false,"url":"https://api.github.com/repos/jorcox/PokemonEina/commits/604782a64b5ea1287084abeabbab43efb020b274"}]}