0000000000000000000000000000000000000000 15f086dc8d2d0fd9997a3f6be2e972c7d6772de6 Laure <lcb40@alu.ua.es> 1633970003 +0200	clone: from github.com:ABPMultimediaUA/tomahawkpixels_z80.git
15f086dc8d2d0fd9997a3f6be2e972c7d6772de6 0788eb2793e7d5125b70f3216f3b661967924792 Laure <lcb40@alu.ua.es> 1633972303 +0200	commit: cambio
0788eb2793e7d5125b70f3216f3b661967924792 ef5d8d126c87691bc19dbe20b3aaea1c274be321 Laure <lcb40@alu.ua.es> 1634204672 +0200	pull --tags origin main: Fast-forward
ef5d8d126c87691bc19dbe20b3aaea1c274be321 ca81ec0fe00c7c5afddf506098a81fd2473d4ba8 Laure <lcb40@alu.ua.es> 1634207362 +0200	commit: man entity forall matching implementado
ca81ec0fe00c7c5afddf506098a81fd2473d4ba8 5b71c304c88e9cf8e44eec96a946f8d33c76525b Laure <lcb40@alu.ua.es> 1634471080 +0200	pull: Fast-forward
5b71c304c88e9cf8e44eec96a946f8d33c76525b 8d4d5650c955d35bf9e2dfd67af787a7086027bd Laure <lcb40@alu.ua.es> 1634547233 +0200	commit: cambios en entity manager forall matching --esperando tutoria -- no funciona bien
8d4d5650c955d35bf9e2dfd67af787a7086027bd 1fc82cd01846ffc9354c6635798ca08182373021 Laure <lcb40@alu.ua.es> 1634576003 +0200	commit: avancecs entity
1fc82cd01846ffc9354c6635798ca08182373021 11f3d2be3e52cc390d3d52194b315ea13c34c1d9 Laure <lcb40@alu.ua.es> 1634649019 +0200	pull: Fast-forward
11f3d2be3e52cc390d3d52194b315ea13c34c1d9 43fd2816c3f01491c3067745b1e438ae3da6a6c9 Laure <lcb40@alu.ua.es> 1634656887 +0200	commit: actualizacion entity manager
43fd2816c3f01491c3067745b1e438ae3da6a6c9 9b02a2c8c48c20c671131139f8719a108d669584 Laure <lcb40@alu.ua.es> 1634684457 +0200	commit: cambios en paleta, sprites, entidades e inicio del sistema de colisiones
9b02a2c8c48c20c671131139f8719a108d669584 49b1241c2c8677820c06c393d26b13c3f4f9eb76 Laure <lcb40@alu.ua.es> 1634933592 +0200	pull --tags origin main: Fast-forward
49b1241c2c8677820c06c393d26b13c3f4f9eb76 e4741597379637a1185dcc639facbbb065db0b48 Laure <lcb40@alu.ua.es> 1634933839 +0200	commit: cambio enter por space en el menu
e4741597379637a1185dcc639facbbb065db0b48 7d45081213ab05bb08f89970cd480e43b9700d92 Laure <lcb40@alu.ua.es> 1634935275 +0200	commit: game loop cambiado nueva forma de crear entidades
7d45081213ab05bb08f89970cd480e43b9700d92 17985d108a62cd571f5a2a376ca8d7323e0f42fe Laure <lcb40@alu.ua.es> 1635023730 +0200	commit: collisiones implementadas
17985d108a62cd571f5a2a376ca8d7323e0f42fe 676c4bfdaa8a7254ea2397f1698e45d91a9ee721 Laure <lcb40@alu.ua.es> 1635086095 +0200	commit: suelo colisionable
676c4bfdaa8a7254ea2397f1698e45d91a9ee721 83c714c86a77fa300361e1d780b4738866fa0de3 Laure <lcb40@alu.ua.es> 1635086099 +0200	pull --tags origin main: Merge made by the 'recursive' strategy.
83c714c86a77fa300361e1d780b4738866fa0de3 c4ca6f0de1354e28bc075ccf994b265f000b8c27 Laure <lcb40@alu.ua.es> 1635096288 +0200	commit: salto implementado // plataformas rotas
c4ca6f0de1354e28bc075ccf994b265f000b8c27 d4a353c27d28937f397eae5954e47bd6f686c2cb Laure <lcb40@alu.ua.es> 1635167843 +0200	pull --tags origin main: Fast-forward
d4a353c27d28937f397eae5954e47bd6f686c2cb 5d91a019c6f3e88df041cdf36be41335f6aa5c14 Laure <lcb40@alu.ua.es> 1635170425 +0200	commit: plataformas que matan iniciadas
5d91a019c6f3e88df041cdf36be41335f6aa5c14 64d844f95427ff1319d39ef6e221137a2f6bfbca Laure <lcb40@alu.ua.es> 1635185090 +0200	commit: animacion de andar
64d844f95427ff1319d39ef6e221137a2f6bfbca 7701cb65a32ea100fa8af10b88f7419629d9152b Laure <lcb40@alu.ua.es> 1635240460 +0200	commit: cambiadas las animaciones de pasos y a medias con las de salto
7701cb65a32ea100fa8af10b88f7419629d9152b b2476b1a7246feebdfa712dee98c2298489f0921 Laure <lcb40@alu.ua.es> 1635240469 +0200	pull --tags origin main: Merge made by the 'recursive' strategy.
b2476b1a7246feebdfa712dee98c2298489f0921 0a4e4fc8845cb56049e582a4c9861902180d2d58 Laure <lcb40@alu.ua.es> 1635254067 +0200	pull --tags origin main: Fast-forward
0a4e4fc8845cb56049e582a4c9861902180d2d58 0f744dc6794026681da26fa2c1c8999029a7783a Laure <lcb40@alu.ua.es> 1635255492 +0200	commit: colision con final mejorada
0f744dc6794026681da26fa2c1c8999029a7783a 0c7c73871d0428fc9d46417fd30344799dba5eec Laure <lcb40@alu.ua.es> 1635273008 +0200	commit: sprites buenos, plataformas cambiadas
0c7c73871d0428fc9d46417fd30344799dba5eec dc53ee0ede55b4977dedd67a468e570e8bb0a496 Laure <lcb40@alu.ua.es> 1635273015 +0200	pull --tags origin main: Merge made by the 'recursive' strategy.
dc53ee0ede55b4977dedd67a468e570e8bb0a496 556add490a0feadec6c5f7fee4de1e26499eadf8 Laure <lcb40@alu.ua.es> 1635809707 +0100	pull --tags origin main: Fast-forward
556add490a0feadec6c5f7fee4de1e26499eadf8 fa92329a17a0c63c9891364549c2b0d97b1c1b44 Laure <lcb40@alu.ua.es> 1635861983 +0100	pull --tags origin main: Fast-forward
fa92329a17a0c63c9891364549c2b0d97b1c1b44 029b05d3416eb446becf6245cb76b4c61be99799 Laure <lcb40@alu.ua.es> 1635867924 +0100	commit: change in posiciones
029b05d3416eb446becf6245cb76b4c61be99799 fa26806434dd5337e1b24c5479e605e584dffaab Laure <lcb40@alu.ua.es> 1635867931 +0100	pull --tags origin main: Merge made by the 'recursive' strategy.
fa26806434dd5337e1b24c5479e605e584dffaab eb5de659abfe414d5a80ffa3e1d1a1f4871cde72 Laure <lcb40@alu.ua.es> 1635870016 +0100	commit: fondo dde muuerte
eb5de659abfe414d5a80ffa3e1d1a1f4871cde72 4b6083f62c898673b1af77e340c442b6310387a3 Laure <lcb40@alu.ua.es> 1635873076 +0100	commit: todo preparado
4b6083f62c898673b1af77e340c442b6310387a3 733e17321ea0522fd42e1f763f973541e4ddd9a2 Laure <lcb40@alu.ua.es> 1635874688 +0100	commit: commit fin
