0000000000000000000000000000000000000000 8fdf437363a03666c13091a595f0d0b9942b5e1c Catman <cat.piro@gmail.com> 1454116512 +0100	commit (initial): gitignore
8fdf437363a03666c13091a595f0d0b9942b5e1c 8fdf437363a03666c13091a595f0d0b9942b5e1c Catman <cat.piro@gmail.com> 1454116528 +0100	checkout: moving from master to master
8fdf437363a03666c13091a595f0d0b9942b5e1c a0aaa6e5cd30ea1e620dfb4cb4dbdd695799bf30 Catman <cat.piro@gmail.com> 1454116542 +0100	commit: empty project
a0aaa6e5cd30ea1e620dfb4cb4dbdd695799bf30 32a68c538dd0fae73471e05ff2c966f9988b3a12 Michele Pirovano <cat.piro@gmail.com> 1454116764 +0100	commit: fixed meta. starting folders.
32a68c538dd0fae73471e05ff2c966f9988b3a12 5c1451de942ed9d4aba06004f05ba2d5e02fb279 Michele Pirovano <cat.piro@gmail.com> 1454116988 +0100	commit: test scenes created
5c1451de942ed9d4aba06004f05ba2d5e02fb279 1e6eb1126e8e67072ac0d02988a5ebae2d3a6944 Michele Pirovano <cat.piro@gmail.com> 1454118472 +0100	commit: Added some test sprites and basic FSMs
1e6eb1126e8e67072ac0d02988a5ebae2d3a6944 a3fa00ad7336722b05e97c2932d8cb6a10b444e1 Michele Pirovano <cat.piro@gmail.com> 1454119014 +0100	commit: Added Adept prefab
a3fa00ad7336722b05e97c2932d8cb6a10b444e1 980a97143d5a5dc6823cc0ab7d4ccf652b98a4d5 Michele Pirovano <cat.piro@gmail.com> 1454119399 +0100	commit: Moved some files.
980a97143d5a5dc6823cc0ab7d4ccf652b98a4d5 7e04a4923976bcd131b15cf37c8435bf851b167e Michele Pirovano <cat.piro@gmail.com> 1454119682 +0100	pull origin master: Fast-forward
7e04a4923976bcd131b15cf37c8435bf851b167e 893e7741eb3e2f4c022543bb26199f62bc06c812 Michele Pirovano <cat.piro@gmail.com> 1454119714 +0100	commit: Added Rituals and their prefabs.
893e7741eb3e2f4c022543bb26199f62bc06c812 6f56befc45d7a87ede114a1a022f4e3122ab33d2 Michele Pirovano <cat.piro@gmail.com> 1454119867 +0100	pull origin master: Fast-forward
6f56befc45d7a87ede114a1a022f4e3122ab33d2 d44d3ba1b7d478e47ad0f277cff1cb95552b1706 Michele Pirovano <cat.piro@gmail.com> 1454119987 +0100	commit: Added ritual debug keys.
d44d3ba1b7d478e47ad0f277cff1cb95552b1706 5c26e5d98bd72746d50ba03a8e8fc8c4f145a939 Michele Pirovano <cat.piro@gmail.com> 1454120912 +0100	commit: Added ritual throw logic.
5c26e5d98bd72746d50ba03a8e8fc8c4f145a939 7473b20b958f97dd01b38f9d800ac759a29e7328 Michele Pirovano <cat.piro@gmail.com> 1454121311 +0100	commit: Adepts increase / decrease from ritual
7473b20b958f97dd01b38f9d800ac759a29e7328 3f9ccc65ef58bc3b43a3ee84f54fb32e5958649b Michele Pirovano <cat.piro@gmail.com> 1454121328 +0100	pull origin master: Merge made by the 'recursive' strategy.
3f9ccc65ef58bc3b43a3ee84f54fb32e5958649b 23b93b1fc9c8caf57000f934d38e74d4be31f19b Michele Pirovano <cat.piro@gmail.com> 1454121587 +0100	pull origin master: Fast-forward
23b93b1fc9c8caf57000f934d38e74d4be31f19b 4aaa80d97a212720c641e29734714c7112cd02c6 Michele Pirovano <cat.piro@gmail.com> 1454121937 +0100	commit: Added music and sfx controller
4aaa80d97a212720c641e29734714c7112cd02c6 6db5cd78dddbcbf11c2548944993ad058f2e4033 Michele Pirovano <cat.piro@gmail.com> 1454122221 +0100	pull origin master: Fast-forward
6db5cd78dddbcbf11c2548944993ad058f2e4033 203b60b4a5bfb56d108462a0dd3b2e5f8591dd5d Michele Pirovano <cat.piro@gmail.com> 1454122445 +0100	commit: FIxed warning.
203b60b4a5bfb56d108462a0dd3b2e5f8591dd5d 4c3d9ae00b2ede7c5b3585f0d60711488a308994 Michele Pirovano <cat.piro@gmail.com> 1454122572 +0100	pull origin master: Fast-forward
4c3d9ae00b2ede7c5b3585f0d60711488a308994 629a9453a4565321d7c67b1a389c99b64e4e9809 Michele Pirovano <cat.piro@gmail.com> 1454122604 +0100	commit: Added game scene
629a9453a4565321d7c67b1a389c99b64e4e9809 7ea489de134d716b018d5605989bb1a454276b25 Michele Pirovano <cat.piro@gmail.com> 1454122659 +0100	pull origin master: Fast-forward
7ea489de134d716b018d5605989bb1a454276b25 e0149d155376952053992b5746f1e478304830f0 Michele Pirovano <cat.piro@gmail.com> 1454123753 +0100	commit: Added AdeptSpawner and RandomUtilities
e0149d155376952053992b5746f1e478304830f0 7d60ef5bd6247088d0f3f3ad10db4cc995619618 Michele Pirovano <cat.piro@gmail.com> 1454123844 +0100	commit: Prefabbed AdeptSpawner
7d60ef5bd6247088d0f3f3ad10db4cc995619618 16f9ed41cdb280e18d1a4b5d804f8f80c106d8b4 Michele Pirovano <cat.piro@gmail.com> 1454123870 +0100	pull origin master: Merge made by the 'recursive' strategy.
16f9ed41cdb280e18d1a4b5d804f8f80c106d8b4 66b3206ce3343b69265633ba49254f6e7ed009a1 Michele Pirovano <cat.piro@gmail.com> 1454124225 +0100	pull origin master: Fast-forward
66b3206ce3343b69265633ba49254f6e7ed009a1 6c8a36a3e75c8faecb317a9835f212adbddab0fe Michele Pirovano <cat.piro@gmail.com> 1454124472 +0100	commit: Clicking Adpets now kills them
6c8a36a3e75c8faecb317a9835f212adbddab0fe 82eabce4c3252a9b317ea46d7f04ff6b26f789d4 Michele Pirovano <cat.piro@gmail.com> 1454124688 +0100	pull origin master: Fast-forward
82eabce4c3252a9b317ea46d7f04ff6b26f789d4 65f5c02c556c5d9f1a4585d3ffd76ec211fe1e4b Michele Pirovano <cat.piro@gmail.com> 1454126419 +0100	commit: Added ritual logics.
65f5c02c556c5d9f1a4585d3ffd76ec211fe1e4b b48e714168eff1cef68d8bc580236aacc637a340 Michele Pirovano <cat.piro@gmail.com> 1454126446 +0100	pull origin master: Merge made by the 'recursive' strategy.
b48e714168eff1cef68d8bc580236aacc637a340 c1b315922e1eb2753b0876c6841d5bb1a99a038f Michele Pirovano <cat.piro@gmail.com> 1454126907 +0100	pull origin master: Fast-forward
c1b315922e1eb2753b0876c6841d5bb1a99a038f c23d360f837ef8603c0b2d41a151339c0df6d25f Michele Pirovano <cat.piro@gmail.com> 1454143018 +0100	commit: Fixed bugs with DEBUGGAMECONTROL
c23d360f837ef8603c0b2d41a151339c0df6d25f cf79d93762bec1903e7fffdba30093428f0f8330 Michele Pirovano <cat.piro@gmail.com> 1454143752 +0100	commit: Added DOTween with a test
cf79d93762bec1903e7fffdba30093428f0f8330 7a81c67bbd2d66247810924cbf29040636342d82 Michele Pirovano <cat.piro@gmail.com> 1454146166 +0100	pull origin master: Fast-forward
7a81c67bbd2d66247810924cbf29040636342d82 d96602ee0b56c39692bae404bb154fac48672219 Michele Pirovano <cat.piro@gmail.com> 1454148572 +0100	commit: Added RitualManager
d96602ee0b56c39692bae404bb154fac48672219 97aabea958153635219e7c4b3d3f439110e76fa7 Michele Pirovano <cat.piro@gmail.com> 1454148588 +0100	pull origin master: Merge made by the 'recursive' strategy.
97aabea958153635219e7c4b3d3f439110e76fa7 7476eb16db641dca5462a061a858b5ae7dffe8d7 Michele Pirovano <cat.piro@gmail.com> 1454151790 +0100	pull origin master: Fast-forward
7476eb16db641dca5462a061a858b5ae7dffe8d7 fabb7cc6d170d9c904b0da76d807440c77fda919 Michele Pirovano <cat.piro@gmail.com> 1454152020 +0100	commit: Refactored DebugGameControl.
fabb7cc6d170d9c904b0da76d807440c77fda919 cf4b936218f6994d805b36e765afff36802d0426 Michele Pirovano <cat.piro@gmail.com> 1454152667 +0100	commit: Added MinigameManager timer and timeout.
cf4b936218f6994d805b36e765afff36802d0426 39112b10ad84de415c08c41695f013ef7af52fcb Michele Pirovano <cat.piro@gmail.com> 1454152795 +0100	commit: Adept is now dancing a lot. Exposed currentDanceIndex.
39112b10ad84de415c08c41695f013ef7af52fcb f6ead9a06c54bd8e63ef5ff9fc086584be96cb92 Michele Pirovano <cat.piro@gmail.com> 1454152894 +0100	commit: Fixed adept bug.
f6ead9a06c54bd8e63ef5ff9fc086584be96cb92 42b31ef412f63deb7962db625a0e74f5dfdddc3f Michele Pirovano <cat.piro@gmail.com> 1454153350 +0100	pull origin master: Fast-forward
42b31ef412f63deb7962db625a0e74f5dfdddc3f 909a822255917c79f480900ab169283c983eeefa Michele Pirovano <cat.piro@gmail.com> 1454153780 +0100	commit: Added feedback on minigame.
909a822255917c79f480900ab169283c983eeefa e16e9c5f5b7138839d43bf53a77eb1266d7f8454 Michele Pirovano <cat.piro@gmail.com> 1454153852 +0100	commit (merge): Merge branch 'master' of https://bitbucket.org/ggj2016ritual/ggj2016ritual
e16e9c5f5b7138839d43bf53a77eb1266d7f8454 5e95fca699d7ed0d95a657050118fdd4de7bb7b5 Michele Pirovano <cat.piro@gmail.com> 1454154508 +0100	pull origin master: Fast-forward
5e95fca699d7ed0d95a657050118fdd4de7bb7b5 70a719761ed3699d714e55e12a345ffe4adcea38 Michele Pirovano <cat.piro@gmail.com> 1454161921 +0100	pull origin master: Fast-forward
70a719761ed3699d714e55e12a345ffe4adcea38 7fc52b8a852b6622500a409af6e073c4bee044c0 Michele Pirovano <cat.piro@gmail.com> 1454162585 +0100	commit: dotween meta I don't know why it keeps adding it
7fc52b8a852b6622500a409af6e073c4bee044c0 c4c86b94f2987c5e5485237c5e7f7bc0a1b46987 Michele Pirovano <cat.piro@gmail.com> 1454162603 +0100	pull origin master: Merge made by the 'recursive' strategy.
c4c86b94f2987c5e5485237c5e7f7bc0a1b46987 a2a9464539c096524376a4d23ba4b2fff28d9ada Michele Pirovano <cat.piro@gmail.com> 1454162790 +0100	commit: Added movement to adept
a2a9464539c096524376a4d23ba4b2fff28d9ada 0661f814e880af2e0106a4c431d0ffc9a07f0a21 Michele Pirovano <cat.piro@gmail.com> 1454162851 +0100	commit: VecTTor
0661f814e880af2e0106a4c431d0ffc9a07f0a21 d9f94c5bf6817724f61901f85702f57e305ac7eb Michele Pirovano <cat.piro@gmail.com> 1454163808 +0100	commit: Added random masks to the adept.
d9f94c5bf6817724f61901f85702f57e305ac7eb e28fcb0c0c18a469447618255b46cb8ff31947f6 Michele Pirovano <cat.piro@gmail.com> 1454164115 +0100	commit: deprecated load level
e28fcb0c0c18a469447618255b46cb8ff31947f6 0495817438a25f8bd90230dd7cb251e2a696eae4 Michele Pirovano <cat.piro@gmail.com> 1454164129 +0100	pull origin master: Merge made by the 'recursive' strategy.
0495817438a25f8bd90230dd7cb251e2a696eae4 77730653250e7f0ce8e0024faa1ee2cd39e5cd59 Michele Pirovano <cat.piro@gmail.com> 1454167868 +0100	pull origin master: Fast-forward
77730653250e7f0ce8e0024faa1ee2cd39e5cd59 ec41bf9c10ae0744ecbbc6fad1dd7a4770c0cf75 Michele Pirovano <cat.piro@gmail.com> 1454168802 +0100	commit: Added adept movements.
ec41bf9c10ae0744ecbbc6fad1dd7a4770c0cf75 726701a331fc6428ba95789f666fc60fd2ffedde Michele Pirovano <cat.piro@gmail.com> 1454168994 +0100	commit: GO
726701a331fc6428ba95789f666fc60fd2ffedde 27c6277f176386a467305eb466cd0aed8168fc42 Michele Pirovano <cat.piro@gmail.com> 1454171074 +0100	pull origin master: Fast-forward
27c6277f176386a467305eb466cd0aed8168fc42 9699999c7762c801fceb70d70f7fffd9587faf8b Michele Pirovano <cat.piro@gmail.com> 1454172241 +0100	commit: Fixed bug with music controller.
9699999c7762c801fceb70d70f7fffd9587faf8b 1b0eba9d764f757f38790220bad73ce547611800 Michele Pirovano <cat.piro@gmail.com> 1454173920 +0100	commit: Added russina animation.
1b0eba9d764f757f38790220bad73ce547611800 7db69a8141fb43a96fc2ba88ebb520a8474288a0 Michele Pirovano <cat.piro@gmail.com> 1454173960 +0100	pull origin master: Merge made by the 'recursive' strategy.
7db69a8141fb43a96fc2ba88ebb520a8474288a0 7fd25138e0bf76e0389f9632b8806e9ce77f01d7 Michele Pirovano <cat.piro@gmail.com> 1454174201 +0100	commit: giga adepts
7fd25138e0bf76e0389f9632b8806e9ce77f01d7 2149800fa1528f9876b059d78781c4d775d23068 Michele Pirovano <cat.piro@gmail.com> 1454174587 +0100	pull origin master: Fast-forward
2149800fa1528f9876b059d78781c4d775d23068 096e662dc5eddfeba14318c4b7d1be6574be33c5 Michele Pirovano <cat.piro@gmail.com> 1454174644 +0100	pull origin master: Fast-forward
096e662dc5eddfeba14318c4b7d1be6574be33c5 9e7beffa06771085d1ae7f0de9c196df4bd4b315 Michele Pirovano <cat.piro@gmail.com> 1454176101 +0100	commit: Adept with two more animations
9e7beffa06771085d1ae7f0de9c196df4bd4b315 6f5b7d7ab7d9c0edcba84ff532c9558c6558b2fc Michele Pirovano <cat.piro@gmail.com> 1454176258 +0100	commit (merge): Merge branch 'master' of https://bitbucket.org/ggj2016ritual/ggj2016ritual
6f5b7d7ab7d9c0edcba84ff532c9558c6558b2fc 8a1966b2c8b43366c80a5a66704037c991cf71ac Michele Pirovano <cat.piro@gmail.com> 1454176723 +0100	pull origin master: Fast-forward
8a1966b2c8b43366c80a5a66704037c991cf71ac 71643eb87aa4dfc12363473dec7d1c67be6e9bf8 Michele Pirovano <cat.piro@gmail.com> 1454176742 +0100	commit: Added Toro Mask
71643eb87aa4dfc12363473dec7d1c67be6e9bf8 31627a4f70a5524b1e4b3d8ebd20f8e407c6003a Michele Pirovano <cat.piro@gmail.com> 1454176767 +0100	pull origin master: Merge made by the 'recursive' strategy.
31627a4f70a5524b1e4b3d8ebd20f8e407c6003a a239f2e731d28f3c52046c6e5498ccf0db5aa648 Michele Pirovano <cat.piro@gmail.com> 1454177028 +0100	pull origin master: Fast-forward
a239f2e731d28f3c52046c6e5498ccf0db5aa648 5c1786885145076df746531f29a7fcbc48cd635e Michele Pirovano <cat.piro@gmail.com> 1454177187 +0100	pull origin master: Fast-forward
5c1786885145076df746531f29a7fcbc48cd635e 94862eb1547e15d8fd958ca701a6742065e0b38d Michele Pirovano <cat.piro@gmail.com> 1454179365 +0100	commit: WOOO MILESTONE GAME
94862eb1547e15d8fd958ca701a6742065e0b38d 2c5a123086d0f7528970d4c28fc6fd575b9c39f4 Michele Pirovano <cat.piro@gmail.com> 1454191466 +0100	pull origin master: Fast-forward
2c5a123086d0f7528970d4c28fc6fd575b9c39f4 bb1f8754a3b913fd92a727a1ab6a405dc9d1e154 Michele Pirovano <cat.piro@gmail.com> 1454194713 +0100	commit: A lot of new animations.
bb1f8754a3b913fd92a727a1ab6a405dc9d1e154 f551c3328384021a73c0e0d30a870694bbe5634f Michele Pirovano <cat.piro@gmail.com> 1454194874 +0100	commit (merge): Merge branch 'master' of https://bitbucket.org/ggj2016ritual/ggj2016ritual
f551c3328384021a73c0e0d30a870694bbe5634f 30f08572a799c9f08adbd901be148bcf9f573e2a Michele Pirovano <cat.piro@gmail.com> 1454197581 +0100	commit: Fixed Game scene, balanced stuff a bit.
30f08572a799c9f08adbd901be148bcf9f573e2a ed2da26013beec61ab0e2387418d5256b7a061a9 Michele Pirovano <cat.piro@gmail.com> 1454228960 +0100	pull origin master: Fast-forward
ed2da26013beec61ab0e2387418d5256b7a061a9 41cbe5ed5a604a47c1ac4b815758b326fe35be9e Michele Pirovano <cat.piro@gmail.com> 1454230875 +0100	commit: Added FlowManager for the game's flow: the game starts with a small delay for now
41cbe5ed5a604a47c1ac4b815758b326fe35be9e 46e9e80d3dca02eed628c740110c82a6a29b45d0 Michele Pirovano <cat.piro@gmail.com> 1454230882 +0100	pull origin master: Merge made by the 'recursive' strategy.
46e9e80d3dca02eed628c740110c82a6a29b45d0 9e94b9967b918f0b1c904166334e71a4dc1b38cf Michele Pirovano <cat.piro@gmail.com> 1454231738 +0100	commit: Fixed bug with flow manager.
9e94b9967b918f0b1c904166334e71a4dc1b38cf cf66f69eba9c059854251110784db57ec551c1bd Michele Pirovano <cat.piro@gmail.com> 1454231920 +0100	commit (merge): Merge branch 'master' of https://bitbucket.org/ggj2016ritual/ggj2016ritual
cf66f69eba9c059854251110784db57ec551c1bd cccee81ab1980c46a09e6a66fdeb04800bb31a3a Michele Pirovano <cat.piro@gmail.com> 1454232158 +0100	commit: Added wow bar pause
cccee81ab1980c46a09e6a66fdeb04800bb31a3a 6b752a23310e7258d517e0bb84abbb09d295305a Michele Pirovano <cat.piro@gmail.com> 1454233027 +0100	pull origin master: Fast-forward
6b752a23310e7258d517e0bb84abbb09d295305a 9ba4059c0d1b3fcb98ddec92adcd03dbbd15efca Michele Pirovano <cat.piro@gmail.com> 1454233047 +0100	pull origin master: Fast-forward
9ba4059c0d1b3fcb98ddec92adcd03dbbd15efca 6126178f4ac97d5f445d44392886d25c8246c0c0 Michele Pirovano <cat.piro@gmail.com> 1454233411 +0100	pull origin master: Fast-forward
6126178f4ac97d5f445d44392886d25c8246c0c0 ef94a3e8241c08b2cc3cd870ae7f31b9857e76c4 Michele Pirovano <cat.piro@gmail.com> 1454233443 +0100	commit: added more SFXs
ef94a3e8241c08b2cc3cd870ae7f31b9857e76c4 e1deedb3c4df92d68a6fcd22b06e760bb99204f0 Michele Pirovano <cat.piro@gmail.com> 1454234235 +0100	pull origin master: Fast-forward
e1deedb3c4df92d68a6fcd22b06e760bb99204f0 8b773e92b90706acd892b336b147f41b27e04877 Michele Pirovano <cat.piro@gmail.com> 1454234288 +0100	pull origin master: Fast-forward
8b773e92b90706acd892b336b147f41b27e04877 884028ec28e8a63486555ca8e51722084c06c7ce Michele Pirovano <cat.piro@gmail.com> 1454234957 +0100	commit: Fixed music controller.
884028ec28e8a63486555ca8e51722084c06c7ce 8cccbe7e16e2f1d51df67f8a13afddc04eccc2e9 Michele Pirovano <cat.piro@gmail.com> 1454234970 +0100	pull origin master: Merge made by the 'recursive' strategy.
8cccbe7e16e2f1d51df67f8a13afddc04eccc2e9 3a9a9734a6c88334b17d0924c0942138be931476 Michele Pirovano <cat.piro@gmail.com> 1454236406 +0100	commit: added logic for sacrifice
3a9a9734a6c88334b17d0924c0942138be931476 9ed64adebfbcd3451bad86245ef15ab72c5d37f0 Michele Pirovano <cat.piro@gmail.com> 1454236422 +0100	pull origin master: Merge made by the 'recursive' strategy.
9ed64adebfbcd3451bad86245ef15ab72c5d37f0 eda758adeb81e12e129d89b13bd0979d27d626bb Michele Pirovano <cat.piro@gmail.com> 1454236998 +0100	commit: Added sacrifice for good.
eda758adeb81e12e129d89b13bd0979d27d626bb efaaecf9ca03a26c993c7a78f5ee18d3af8bd0d8 Michele Pirovano <cat.piro@gmail.com> 1454237019 +0100	pull origin master: Merge made by the 'recursive' strategy.
efaaecf9ca03a26c993c7a78f5ee18d3af8bd0d8 9d6eff13bc892e04cbe93e0d6b98df30647d97a1 Michele Pirovano <cat.piro@gmail.com> 1454237309 +0100	commit: font and scoremanager prefab
9d6eff13bc892e04cbe93e0d6b98df30647d97a1 28a90cb95e00202c9a27f7caa15fbfcd93851ee9 Michele Pirovano <cat.piro@gmail.com> 1454237964 +0100	commit: Ritual sacrifice now works
28a90cb95e00202c9a27f7caa15fbfcd93851ee9 ff8e9928a6ed1e4e6ed207d3049b0322a2c7923d Michele Pirovano <cat.piro@gmail.com> 1454237984 +0100	pull origin master: Merge made by the 'recursive' strategy.
ff8e9928a6ed1e4e6ed207d3049b0322a2c7923d 4385997f3927827ea4a13958cc26583a23b126ca Michele Pirovano <cat.piro@gmail.com> 1454238613 +0100	pull origin master: Fast-forward
4385997f3927827ea4a13958cc26583a23b126ca 3bc8d2305bbae79bc38cf2b210e371223f018c8d Michele Pirovano <cat.piro@gmail.com> 1454240129 +0100	commit: Added all rituals. Added prefabs for Fabio.
3bc8d2305bbae79bc38cf2b210e371223f018c8d 3899c91fc069cb1902cb4a43d2f9535993b872b1 Michele Pirovano <cat.piro@gmail.com> 1454240156 +0100	pull origin master: Merge made by the 'recursive' strategy.
3899c91fc069cb1902cb4a43d2f9535993b872b1 eafe656b9c62c79347afc640b90d9ea70aa910f4 Michele Pirovano <cat.piro@gmail.com> 1454240301 +0100	commit: Adept fixes
eafe656b9c62c79347afc640b90d9ea70aa910f4 1c38426d38e158ee269b85462a32c399c0adc1ba Michele Pirovano <cat.piro@gmail.com> 1454241093 +0100	commit: fixed adept, fixed sacrifice
1c38426d38e158ee269b85462a32c399c0adc1ba d6fc4dd88694425c63e0f4f4a07a6be8737a47f7 Michele Pirovano <cat.piro@gmail.com> 1454241110 +0100	pull origin master: Merge made by the 'recursive' strategy.
d6fc4dd88694425c63e0f4f4a07a6be8737a47f7 839f78c748cc2c8c76736e07644fe4fcaf95f651 Michele Pirovano <cat.piro@gmail.com> 1454241875 +0100	pull origin master: Fast-forward
839f78c748cc2c8c76736e07644fe4fcaf95f651 220d43dd9bd518ce47db37a6f5755653f6233082 Michele Pirovano <cat.piro@gmail.com> 1454242563 +0100	pull origin master: Fast-forward
220d43dd9bd518ce47db37a6f5755653f6233082 aa1946d184a2f308b3c59e2aacf4ee865d12cc1b Michele Pirovano <cat.piro@gmail.com> 1454243075 +0100	commit: Fixed rituals.
aa1946d184a2f308b3c59e2aacf4ee865d12cc1b 3355fa5e6bafce412dfdd2ffedc4756d2174c835 Michele Pirovano <cat.piro@gmail.com> 1454243094 +0100	pull origin master: Merge made by the 'recursive' strategy.
3355fa5e6bafce412dfdd2ffedc4756d2174c835 836f4cfc12c9c88ed05e6f36a2203174629a6803 Michele Pirovano <cat.piro@gmail.com> 1454244189 +0100	commit: fixed bug
836f4cfc12c9c88ed05e6f36a2203174629a6803 1e9631bfb1f474fd3f6c645753841c204652e994 Michele Pirovano <cat.piro@gmail.com> 1454244206 +0100	pull origin master: Merge made by the 'recursive' strategy.
1e9631bfb1f474fd3f6c645753841c204652e994 63fef8707931fe7e67271d017f480d4d8e113190 Michele Pirovano <cat.piro@gmail.com> 1454245640 +0100	commit: new adept
63fef8707931fe7e67271d017f480d4d8e113190 24594cbe6be02fd47b947f429063c8328fa1ccd8 Michele Pirovano <cat.piro@gmail.com> 1454245678 +0100	pull origin master: Merge made by the 'recursive' strategy.
24594cbe6be02fd47b947f429063c8328fa1ccd8 8ecae8384b299a650972b701a08138983f6e52d9 Michele Pirovano <cat.piro@gmail.com> 1454246681 +0100	commit: timer reset
8ecae8384b299a650972b701a08138983f6e52d9 a19841531ddb71fcb5c559db1f64a49d009975e3 Michele Pirovano <cat.piro@gmail.com> 1454247166 +0100	commit: fixed initial canceling
a19841531ddb71fcb5c559db1f64a49d009975e3 0ea209927d490d04eccd48b508561c49254508be Michele Pirovano <cat.piro@gmail.com> 1454248260 +0100	commit: fixed
0ea209927d490d04eccd48b508561c49254508be 4d57d4321aa1406ca01fc4e5119633eb582ee54c Michele Pirovano <cat.piro@gmail.com> 1454249051 +0100	commit: Fixed colors.
4d57d4321aa1406ca01fc4e5119633eb582ee54c 0196d97bf1046a28cd84a4921df7d2fbc4f1eadd Michele Pirovano <cat.piro@gmail.com> 1454249068 +0100	pull origin master: Merge made by the 'recursive' strategy.
0196d97bf1046a28cd84a4921df7d2fbc4f1eadd 8198b012127408f45742ddd3ce2c1d8c063f61a2 Michele Pirovano <cat.piro@gmail.com> 1454250134 +0100	pull origin master: Fast-forward
8198b012127408f45742ddd3ce2c1d8c063f61a2 e4ce48e83e812952c5ca02d5a8401d652784aaeb Michele Pirovano <cat.piro@gmail.com> 1454251611 +0100	commit: fixed colors
e4ce48e83e812952c5ca02d5a8401d652784aaeb 11ffa4ffac583f1f2eddd2dcda2a3d323801325a Michele Pirovano <cat.piro@gmail.com> 1454251627 +0100	pull origin master: Merge made by the 'recursive' strategy.
11ffa4ffac583f1f2eddd2dcda2a3d323801325a 3be52d9f34ead00c7b8bfefcc70bd5f7e7924cf5 Michele Pirovano <cat.piro@gmail.com> 1454252255 +0100	commit: dsffdshbsgd
3be52d9f34ead00c7b8bfefcc70bd5f7e7924cf5 f465d03c81961f05a153a9894b263ceabf25e6f4 Michele Pirovano <cat.piro@gmail.com> 1454252689 +0100	pull origin master: Merge made by the 'recursive' strategy.
f465d03c81961f05a153a9894b263ceabf25e6f4 6768ba05a222420cdf8061783daa07bd6e76be60 Michele Pirovano <cat.piro@gmail.com> 1454252704 +0100	commit: better audio, fake gameover
6768ba05a222420cdf8061783daa07bd6e76be60 472f432bcf34350ec7b206b252d3208faf8c0e8e Michele Pirovano <cat.piro@gmail.com> 1454253407 +0100	commit: added Game Over
472f432bcf34350ec7b206b252d3208faf8c0e8e f447846cb96d56b4bfbc0cb241fa925f687e3084 Michele Pirovano <cat.piro@gmail.com> 1454253427 +0100	pull origin master: Merge made by the 'recursive' strategy.
f447846cb96d56b4bfbc0cb241fa925f687e3084 8049a1325c757218e291eb1d9c533dfdef8697b4 Michele Pirovano <cat.piro@gmail.com> 1454253512 +0100	pull origin master: Fast-forward
8049a1325c757218e291eb1d9c533dfdef8697b4 5f8571f6828f5809b98ec556006bceac7d1c808c Michele Pirovano <cat.piro@gmail.com> 1454253721 +0100	pull origin master: Fast-forward
5f8571f6828f5809b98ec556006bceac7d1c808c 1e0cca12780a852b7e8b140d24f61e5f7309b97a Michele Pirovano <cat.piro@gmail.com> 1454253811 +0100	commit: fixed game over
1e0cca12780a852b7e8b140d24f61e5f7309b97a 44dee1d02045db6f5f67b75853ff4d71485ac285 Michele Pirovano <cat.piro@gmail.com> 1454253828 +0100	pull origin master: Merge made by the 'recursive' strategy.
44dee1d02045db6f5f67b75853ff4d71485ac285 8acdfde3d98b9f5084ed3632dd7b36640c6813bd Michele Pirovano <cat.piro@gmail.com> 1454253892 +0100	pull origin master: Fast-forward
8acdfde3d98b9f5084ed3632dd7b36640c6813bd 4a88f17b72c513b69ff23783e2668a84ac2ca605 Michele Pirovano <cat.piro@gmail.com> 1454254359 +0100	pull origin master: Fast-forward
4a88f17b72c513b69ff23783e2668a84ac2ca605 b2464f44ea95f030e8a46e135b55786a997af5bc Michele Pirovano <cat.piro@gmail.com> 1454254391 +0100	commit: gameover added
b2464f44ea95f030e8a46e135b55786a997af5bc c24c25db8d8e5c446b312ef0fc08389834f9c9dd Michele Pirovano <cat.piro@gmail.com> 1454254753 +0100	commit: small shaman
c24c25db8d8e5c446b312ef0fc08389834f9c9dd 13eb5ae989284f455b892b2043cca94c8b86bd01 Michele Pirovano <cat.piro@gmail.com> 1454254767 +0100	pull origin master: Merge made by the 'recursive' strategy.
