0000000000000000000000000000000000000000 b9abace4c7dd3cd893afd97ae89bfabcd74774a0 Billy Rebecchi <billy.rebecchi@googlemail.com> 1548532646 +0000
b9abace4c7dd3cd893afd97ae89bfabcd74774a0 b9abace4c7dd3cd893afd97ae89bfabcd74774a0 Billy Rebecchi <billy.rebecchi@googlemail.com> 1548532737 +0000	checkout: moving from master to babayaga
b9abace4c7dd3cd893afd97ae89bfabcd74774a0 b9abace4c7dd3cd893afd97ae89bfabcd74774a0 Billy Rebecchi <billy.rebecchi@googlemail.com> 1548532768 +0000	checkout: moving from babayaga to master
b9abace4c7dd3cd893afd97ae89bfabcd74774a0 1983026b601d8b2bb1a1510114c83b48202b4775 Billy Rebecchi <billy.rebecchi@googlemail.com> 1548532888 +0000	checkout: moving from master to babayaga
1983026b601d8b2bb1a1510114c83b48202b4775 b9abace4c7dd3cd893afd97ae89bfabcd74774a0 Billy Rebecchi <billy.rebecchi@googlemail.com> 1548532893 +0000	checkout: moving from babayaga to master
b9abace4c7dd3cd893afd97ae89bfabcd74774a0 4df8e736e0b60de73eef36481c7aad8cc95cd1a9 Billy Rebecchi <billy.rebecchi@googlemail.com> 1548535676 +0000	pull: Fast-forward
4df8e736e0b60de73eef36481c7aad8cc95cd1a9 8bc7f6f3c3fa2d7358c282892c30489beb593384 Billy Rebecchi <billy.rebecchi@googlemail.com> 1548537823 +0000	commit: Allow player scroll and update all scene movement
8bc7f6f3c3fa2d7358c282892c30489beb593384 7c2d5bfa8df4fc0685e523ef1a35695371a1dcba Billy Rebecchi <billy.rebecchi@googlemail.com> 1548538192 +0000	pull: Fast-forward
7c2d5bfa8df4fc0685e523ef1a35695371a1dcba c9c7086e3cd8444358a88e2f1a4b5e8736e15471 Billy Rebecchi <billy.rebecchi@googlemail.com> 1548539445 +0000	checkout: moving from master to dialogue
c9c7086e3cd8444358a88e2f1a4b5e8736e15471 3aea5a11f7664847e33d49e20f5ea8148d586bec Billy Rebecchi <billy.rebecchi@googlemail.com> 1548539844 +0000	commit (merge): Completed merge
3aea5a11f7664847e33d49e20f5ea8148d586bec 7c2d5bfa8df4fc0685e523ef1a35695371a1dcba Billy Rebecchi <billy.rebecchi@googlemail.com> 1548539855 +0000	checkout: moving from dialogue to master
7c2d5bfa8df4fc0685e523ef1a35695371a1dcba aa86b207f0998889b0b780307893d558fc9cf976 Billy Rebecchi <billy.rebecchi@googlemail.com> 1548539863 +0000	merge dialogue: Merge made by the 'recursive' strategy.
aa86b207f0998889b0b780307893d558fc9cf976 3c86d3695fc296686d0ac3ac10ae7ae3ca46e159 Billy Rebecchi <billy.rebecchi@googlemail.com> 1548540185 +0000	checkout: moving from master to 3c86d3695fc296686d0ac3ac10ae7ae
3c86d3695fc296686d0ac3ac10ae7ae3ca46e159 aa86b207f0998889b0b780307893d558fc9cf976 Billy Rebecchi <billy.rebecchi@googlemail.com> 1548540332 +0000	checkout: moving from 3c86d3695fc296686d0ac3ac10ae7ae3ca46e159 to master
aa86b207f0998889b0b780307893d558fc9cf976 3aea5a11f7664847e33d49e20f5ea8148d586bec Billy Rebecchi <billy.rebecchi@googlemail.com> 1548540339 +0000	checkout: moving from master to dialogue
3aea5a11f7664847e33d49e20f5ea8148d586bec aa86b207f0998889b0b780307893d558fc9cf976 Billy Rebecchi <billy.rebecchi@googlemail.com> 1548542210 +0000	checkout: moving from dialogue to master
aa86b207f0998889b0b780307893d558fc9cf976 e4b9fcf93c0ca7088e6e204fc53f91ac00610d98 Billy Rebecchi <billy.rebecchi@googlemail.com> 1548542250 +0000	commit: Fix positioning of world map in VRAM to not effect ASCII table
e4b9fcf93c0ca7088e6e204fc53f91ac00610d98 d7aa9399a08bb42db53e5711202caefe2d6e8d34 Billy Rebecchi <billy.rebecchi@googlemail.com> 1548574614 +0000	pull: Fast-forward
d7aa9399a08bb42db53e5711202caefe2d6e8d34 32b62144e98d95b61eddf4ff05581e483bf96457 Billy Rebecchi <billy.rebecchi@googlemail.com> 1548574673 +0000	checkout: moving from master to babayagaAI
32b62144e98d95b61eddf4ff05581e483bf96457 d7aa9399a08bb42db53e5711202caefe2d6e8d34 Billy Rebecchi <billy.rebecchi@googlemail.com> 1548574728 +0000	checkout: moving from babayagaAI to master
d7aa9399a08bb42db53e5711202caefe2d6e8d34 1983026b601d8b2bb1a1510114c83b48202b4775 Billy Rebecchi <billy.rebecchi@googlemail.com> 1548574887 +0000	checkout: moving from master to babayaga
1983026b601d8b2bb1a1510114c83b48202b4775 d7aa9399a08bb42db53e5711202caefe2d6e8d34 Billy Rebecchi <billy.rebecchi@googlemail.com> 1548574893 +0000	merge master: Fast-forward
d7aa9399a08bb42db53e5711202caefe2d6e8d34 d7aa9399a08bb42db53e5711202caefe2d6e8d34 Billy Rebecchi <billy.rebecchi@googlemail.com> 1548574969 +0000	checkout: moving from babayaga to master
d7aa9399a08bb42db53e5711202caefe2d6e8d34 32b62144e98d95b61eddf4ff05581e483bf96457 Billy Rebecchi <billy.rebecchi@googlemail.com> 1548575135 +0000	checkout: moving from master to babayagaAI
32b62144e98d95b61eddf4ff05581e483bf96457 60f90957fcc2a5abc44218ec314304f495b8ad0b Billy Rebecchi <billy.rebecchi@googlemail.com> 1548575599 +0000	commit (merge): Merge babayaAI and improve movement
60f90957fcc2a5abc44218ec314304f495b8ad0b d7aa9399a08bb42db53e5711202caefe2d6e8d34 Billy Rebecchi <billy.rebecchi@googlemail.com> 1548575605 +0000	checkout: moving from babayagaAI to master
d7aa9399a08bb42db53e5711202caefe2d6e8d34 3daada0384e59bdee03cab4b5f7d176fa8d48859 Billy Rebecchi <billy.rebecchi@googlemail.com> 1548575628 +0000	merge babayagaAI: Merge made by the 'recursive' strategy.
3daada0384e59bdee03cab4b5f7d176fa8d48859 abe0fdf54121e0296eee80fc17f1e13b54b0189b Billy Rebecchi <billy.rebecchi@googlemail.com> 1548575706 +0000	commit: Remove standard I/O to save memory
abe0fdf54121e0296eee80fc17f1e13b54b0189b 33e102367691715af043b74017ec2c89242edd33 Billy Rebecchi <billy.rebecchi@googlemail.com> 1548576542 +0000	commit: Create artwork folder
33e102367691715af043b74017ec2c89242edd33 348c289d857852b17b3356c78e7256ecf31f9489 Billy Rebecchi <billy.rebecchi@googlemail.com> 1548576807 +0000	commit: Clean up project
348c289d857852b17b3356c78e7256ecf31f9489 9ef37fc3d7c2a7ec70f96465a9a1961eb06c06fd Billy Rebecchi <billy.rebecchi@googlemail.com> 1548584079 +0000	commit: Create story narrative
9ef37fc3d7c2a7ec70f96465a9a1961eb06c06fd 4c428d36b2fa09cb57239f72f4eb02a39e7880da Billy Rebecchi <billy.rebecchi@googlemail.com> 1548584967 +0000	checkout: moving from master to backgrounds
4c428d36b2fa09cb57239f72f4eb02a39e7880da 0b39a21533744ebc012049a84f7c9df376c9cafd Billy Rebecchi <billy.rebecchi@googlemail.com> 1548585306 +0000	commit (merge): Merge narrative and image loader
0b39a21533744ebc012049a84f7c9df376c9cafd 9ef37fc3d7c2a7ec70f96465a9a1961eb06c06fd Billy Rebecchi <billy.rebecchi@googlemail.com> 1548585328 +0000	checkout: moving from backgrounds to master
9ef37fc3d7c2a7ec70f96465a9a1961eb06c06fd c18cb376ccbb0e92aab4ae1ed03f1d61ae44b6d8 Billy Rebecchi <billy.rebecchi@googlemail.com> 1548585385 +0000	merge backgrounds: Merge made by the 'recursive' strategy.
c18cb376ccbb0e92aab4ae1ed03f1d61ae44b6d8 b18cb9f8e627c4afd777cb012c9a5c3ada493abd Billy Rebecchi <billy.rebecchi@googlemail.com> 1548586307 +0000	commit: Add background images and work on start of narrative
b18cb9f8e627c4afd777cb012c9a5c3ada493abd 90eeb0a1d2e29d9466abcd604d1606399e7bc3de Billy Rebecchi <billy.rebecchi@googlemail.com> 1548586767 +0000	commit: Replaced mushroom with wisp sprite
90eeb0a1d2e29d9466abcd604d1606399e7bc3de a3aadffac1342e2eadeb9beb0b4b88dbb500e89f Billy Rebecchi <billy.rebecchi@googlemail.com> 1548589758 +0000	commit: Add all characters and build the first scene
a3aadffac1342e2eadeb9beb0b4b88dbb500e89f cebd643f4438999cdf8a1e089c202e58e74bcbad Billy Rebecchi <billy.rebecchi@googlemail.com> 1548589820 +0000	checkout: moving from master to decision
cebd643f4438999cdf8a1e089c202e58e74bcbad 5cebe2d4e8651c9391cf74110739013e2641ec88 Billy Rebecchi <billy.rebecchi@googlemail.com> 1548590054 +0000	commit (merge): Add narrative, images and decisions
5cebe2d4e8651c9391cf74110739013e2641ec88 a3aadffac1342e2eadeb9beb0b4b88dbb500e89f Billy Rebecchi <billy.rebecchi@googlemail.com> 1548590061 +0000	checkout: moving from decision to master
a3aadffac1342e2eadeb9beb0b4b88dbb500e89f de837903d60b17d09688d8ff6fb51c7ca7b7a8b1 Billy Rebecchi <billy.rebecchi@googlemail.com> 1548590074 +0000	merge decision: Merge made by the 'recursive' strategy.
de837903d60b17d09688d8ff6fb51c7ca7b7a8b1 14100eb3d4dd24679d0b2ba116df9612248fea1c Billy Rebecchi <billy.rebecchi@googlemail.com> 1548594352 +0000	commit: Complete first scene and first decisison
14100eb3d4dd24679d0b2ba116df9612248fea1c d3d7aafcd3a5becb5e0c8f7577a191fe74d0d61c Billy Rebecchi <billy.rebecchi@googlemail.com> 1548595510 +0000	commit: Disable sprites when decisions are made
d3d7aafcd3a5becb5e0c8f7577a191fe74d0d61c 5fb43d587d81dec5bbb4acaac2cc89f6bca0c3d9 Billy Rebecchi <billy.rebecchi@googlemail.com> 1548595753 +0000	commit: Allow for A button on main menu
5fb43d587d81dec5bbb4acaac2cc89f6bca0c3d9 b8f243f597dd77aa46fb10bad71cdd743218c3da Billy Rebecchi <billy.rebecchi@googlemail.com> 1548598525 +0000	commit: Complete story (as far as possible due to overflow)
b8f243f597dd77aa46fb10bad71cdd743218c3da 0deabb13a2ca53cb2118a2e65bb0e86941b1a000 Billy Rebecchi <billy.rebecchi@googlemail.com> 1548598693 +0000	checkout: moving from master to dungeon
0deabb13a2ca53cb2118a2e65bb0e86941b1a000 8f09f472715aa60ca65a809c3136e34523808db3 Billy Rebecchi <billy.rebecchi@googlemail.com> 1548599680 +0000	commit (merge): Merge gameplay branch
8f09f472715aa60ca65a809c3136e34523808db3 b8f243f597dd77aa46fb10bad71cdd743218c3da Billy Rebecchi <billy.rebecchi@googlemail.com> 1548599726 +0000	checkout: moving from dungeon to master
b8f243f597dd77aa46fb10bad71cdd743218c3da 979f95b796d20e0fbc33919adfaf9be1dd880d7c Billy Rebecchi <billy.rebecchi@googlemail.com> 1548599739 +0000	merge dungeon: Merge made by the 'recursive' strategy.
979f95b796d20e0fbc33919adfaf9be1dd880d7c 979f95b796d20e0fbc33919adfaf9be1dd880d7c Billy Rebecchi <billy.rebecchi@googlemail.com> 1548602693 +0000	checkout: moving from master to credits
979f95b796d20e0fbc33919adfaf9be1dd880d7c 979f95b796d20e0fbc33919adfaf9be1dd880d7c Billy Rebecchi <billy.rebecchi@googlemail.com> 1548602710 +0000	checkout: moving from credits to master
979f95b796d20e0fbc33919adfaf9be1dd880d7c 4e66ff50c013c8d5f6a1d40f2c35a4a5f71e1b6c Billy Rebecchi <billy.rebecchi@googlemail.com> 1548602802 +0000	checkout: moving from master to credits
4e66ff50c013c8d5f6a1d40f2c35a4a5f71e1b6c ccc66edff06111bcd45731450a7bcf82e67db0c8 Billy Rebecchi <billy.rebecchi@googlemail.com> 1548603315 +0000	commit (merge): FIX EVERYTHING
ccc66edff06111bcd45731450a7bcf82e67db0c8 979f95b796d20e0fbc33919adfaf9be1dd880d7c Billy Rebecchi <billy.rebecchi@googlemail.com> 1548603319 +0000	checkout: moving from credits to master
979f95b796d20e0fbc33919adfaf9be1dd880d7c 9c01979bdabb3dce4b02e979a52efe99f7d02652 Billy Rebecchi <billy.rebecchi@googlemail.com> 1548603327 +0000	merge credits: Merge made by the 'recursive' strategy.
