0000000000000000000000000000000000000000 d1ba7100b95e3e96a88d2d0baf28a385917f22e4 Oscar Losada <oscarlosu@gmail.com> 1454147975 +0100	clone: from https://oscarlosu@github.com/cebollinos11/pentagramo.git
d1ba7100b95e3e96a88d2d0baf28a385917f22e4 29b718fc2d595a2cb6d4fee1013a3432d4024945 Oscar Losada <oscarlosu@gmail.com> 1454148292 +0100	commit: Folder structure is life.
29b718fc2d595a2cb6d4fee1013a3432d4024945 ffcf3ebf550d23133e131789c0ea1fed240131eb Oscar Losada <oscarlosu@gmail.com> 1454148322 +0100	pull origin master: Merge made by the 'recursive' strategy.
ffcf3ebf550d23133e131789c0ea1fed240131eb 77090af8aa9cd7dcd87c7ee571bdb356dea4ffcd Oscar Losada <oscarlosu@gmail.com> 1454151550 +0100	commit: Pentagramo movement.
77090af8aa9cd7dcd87c7ee571bdb356dea4ffcd 9e027c2ce7900c46285e57652c6a4bfab3be4e35 Oscar Losada <oscarlosu@gmail.com> 1454156871 +0100	commit: Pentragramo state machine.
9e027c2ce7900c46285e57652c6a4bfab3be4e35 d0e75c747c2aa47421d3dd27af992f5846249833 Oscar Losada <oscarlosu@gmail.com> 1454156883 +0100	pull origin master: Merge made by the 'recursive' strategy.
d0e75c747c2aa47421d3dd27af992f5846249833 e0060e4e42ee86c8b50f52606817927d52f0de2c Oscar Losada <oscarlosu@gmail.com> 1454159948 +0100	pull origin master: Fast-forward
e0060e4e42ee86c8b50f52606817927d52f0de2c 4e9b6f66f43c7d48a6f7f9016931091b955e3991 Oscar Losada <oscarlosu@gmail.com> 1454159976 +0100	pull origin master: Fast-forward
4e9b6f66f43c7d48a6f7f9016931091b955e3991 e1b7da2fb2aa688e387aa3148722746b62eb9860 Oscar Losada <oscarlosu@gmail.com> 1454160311 +0100	commit: Moved Pentagramo script from parent to child object with the collider.
e1b7da2fb2aa688e387aa3148722746b62eb9860 8e9242753df80ab57d219fee8372eea09d120eb3 Oscar Losada <oscarlosu@gmail.com> 1454160382 +0100	commit (merge): Merge branch 'master' of https://github.com/cebollinos11/pentagramo
8e9242753df80ab57d219fee8372eea09d120eb3 8487643aa98635c97a2c21caa570d7348f4aebe9 Oscar Losada <oscarlosu@gmail.com> 1454160654 +0100	commit: Merged prefab changes.
8487643aa98635c97a2c21caa570d7348f4aebe9 6684829e20b9648ab61be38464fd5319dd113e40 Oscar Losada <oscarlosu@gmail.com> 1454161519 +0100	pull origin master: Fast-forward
6684829e20b9648ab61be38464fd5319dd113e40 2ab4cacbd8debb5937f0c0815a060d115853b232 Oscar Losada <oscarlosu@gmail.com> 1454167311 +0100	pull origin master: Fast-forward
2ab4cacbd8debb5937f0c0815a060d115853b232 01a5b6f7bb4aaafe3d12508f2532e1a4d6d756c2 Oscar Losada <oscarlosu@gmail.com> 1454167955 +0100	commit: Prototype level, folder structure
01a5b6f7bb4aaafe3d12508f2532e1a4d6d756c2 d1101522af815e35501d4af04a68a1910230810f Oscar Losada <oscarlosu@gmail.com> 1454169957 +0100	pull origin master: Fast-forward
d1101522af815e35501d4af04a68a1910230810f 573aa8a6baf750764d652407a93b37677d1dac40 Oscar Losada <oscarlosu@gmail.com> 1454185456 +0100	commit: Created StartScreen.
573aa8a6baf750764d652407a93b37677d1dac40 d4f0ec5353780aef5089624c274d71b251bec0db Oscar Losada <oscarlosu@gmail.com> 1454185523 +0100	commit (merge): Merge branch 'master' of https://github.com/cebollinos11/pentagramo
d4f0ec5353780aef5089624c274d71b251bec0db 2117685cdf78433cb0701a9a817715c12febeef1 Oscar Losada <oscarlosu@gmail.com> 1454191643 +0100	pull origin master: Fast-forward
2117685cdf78433cb0701a9a817715c12febeef1 4663d6094b4a9349dcbd258b4f96d41190ae4f00 Oscar Losada <oscarlosu@gmail.com> 1454191999 +0100	commit: Implemented loop back to start screen.
4663d6094b4a9349dcbd258b4f96d41190ae4f00 dc8b6c8d1b85b6f6680cd668a7ef5412a83a754d Oscar Losada <oscarlosu@gmail.com> 1454193488 +0100	commit: Started implementing recipe.
dc8b6c8d1b85b6f6680cd668a7ef5412a83a754d c6758417697b5dac8a2217592edcf2f0fbf2e5ca Oscar Losada <oscarlosu@gmail.com> 1454193497 +0100	pull origin master: Merge made by the 'recursive' strategy.
c6758417697b5dac8a2217592edcf2f0fbf2e5ca 1da8460029551d8be88f0064d27d097893d11b32 Oscar Losada <oscarlosu@gmail.com> 1454193574 +0100	commit: Fucking GameMaker sneaking into my brain.
1da8460029551d8be88f0064d27d097893d11b32 0815cde5cfff10eade51b381464c7f8749b5bed6 Oscar Losada <oscarlosu@gmail.com> 1454196041 +0100	commit: Implemented Recipe.
0815cde5cfff10eade51b381464c7f8749b5bed6 da5b63fd8e754fa8beecd594d2565cb119d5fe39 Oscar Losada <oscarlosu@gmail.com> 1454196050 +0100	pull origin master: Merge made by the 'recursive' strategy.
da5b63fd8e754fa8beecd594d2565cb119d5fe39 c1206b4c6ed81223b51e55fb5a8dc5ff1ba66ce7 Oscar Losada <oscarlosu@gmail.com> 1454233912 +0100	commit: Moved progress UI to side of screen.
c1206b4c6ed81223b51e55fb5a8dc5ff1ba66ce7 2ff1529ca88a78029f37c9834c3bd4b6002b2cf4 Oscar Losada <oscarlosu@gmail.com> 1454235072 +0100	commit: StartScreen.
2ff1529ca88a78029f37c9834c3bd4b6002b2cf4 a003f98a625068bd7593f4f871e2b8e3abdf10f8 Oscar Losada <oscarlosu@gmail.com> 1454235077 +0100	pull origin master: Merge made by the 'recursive' strategy.
a003f98a625068bd7593f4f871e2b8e3abdf10f8 6ef74a8e3a31e1e8c1b8c5c6f071077d7461c976 Oscar Losada <oscarlosu@gmail.com> 1454235844 +0100	commit: Recipe UI mockup.
6ef74a8e3a31e1e8c1b8c5c6f071077d7461c976 c33ca77be76a38573f8231b64928e33c920945c1 Oscar Losada <oscarlosu@gmail.com> 1454236087 +0100	commit: Progress mockup.
c33ca77be76a38573f8231b64928e33c920945c1 6da4445170cb60c785533eabb4440360747842b4 Oscar Losada <oscarlosu@gmail.com> 1454241521 +0100	pull origin master: Fast-forward
6da4445170cb60c785533eabb4440360747842b4 af2307b452fd1a98736c6489a0ee1f0d55b44725 Oscar Losada <oscarlosu@gmail.com> 1454241941 +0100	commit: PLAYTEST!
af2307b452fd1a98736c6489a0ee1f0d55b44725 5d9d49f1169def4520fe77ce1e04c619a388135a Oscar Losada <oscarlosu@gmail.com> 1454242424 +0100	pull origin master: Fast-forward
5d9d49f1169def4520fe77ce1e04c619a388135a 91836510a5d2ced7ac17f8b6fcc355bc5de2026f Oscar Losada <oscarlosu@gmail.com> 1454242481 +0100	pull origin master: Fast-forward
91836510a5d2ced7ac17f8b6fcc355bc5de2026f c3781063e0d247cd964f2edb721ce73445fb9d2e Oscar Losada <oscarlosu@gmail.com> 1454243522 +0100	pull origin master: Fast-forward
c3781063e0d247cd964f2edb721ce73445fb9d2e bdbddeda1c5fc709ce68129e4b152e5be713407c Oscar Losada <oscarlosu@gmail.com> 1454244819 +0100	commit: More work on mockup and fixed bug with mops not pursuing the player.
bdbddeda1c5fc709ce68129e4b152e5be713407c 271e067f4757b6dce1a7a9320f501092e8da14cb Oscar Losada <oscarlosu@gmail.com> 1454244828 +0100	pull origin master: Merge made by the 'recursive' strategy.
271e067f4757b6dce1a7a9320f501092e8da14cb 24f0e4122d75cb3a0fa1e04af504a6b3393b50e9 Oscar Losada <oscarlosu@gmail.com> 1454247436 +0100	commit: Changed Press Start text to Press A.
24f0e4122d75cb3a0fa1e04af504a6b3393b50e9 6e96c6571160e21462752529aa6720baddf184bb Oscar Losada <oscarlosu@gmail.com> 1454247444 +0100	pull origin master: Merge made by the 'recursive' strategy.
6e96c6571160e21462752529aa6720baddf184bb e1485be37022b0e0bd68447151e3c7025a291be1 Oscar Losada <oscarlosu@gmail.com> 1454248413 +0100	pull origin master: Fast-forward
e1485be37022b0e0bd68447151e3c7025a291be1 ceec341c6d4eae39127742795c99325a0124b060 Oscar Losada <oscarlosu@gmail.com> 1454249622 +0100	pull origin master: Fast-forward
