0000000000000000000000000000000000000000 35bddc241f2ead8427ffacb176e700c395365224 AquiL4X <mike.vermeulen9@gmail.com> 1454135928 +1300	clone: from https://github.com/DoodyFroody/daily_witch.git
35bddc241f2ead8427ffacb176e700c395365224 851eea3aff39038b5fe9e9b0700019206098eb38 AquiL4X <mike.vermeulen9@gmail.com> 1454136986 +1300	commit: Recommiting my stuff
851eea3aff39038b5fe9e9b0700019206098eb38 90c135c7ba384bb75935033a5d841e478806072b AquiL4X <mike.vermeulen9@gmail.com> 1454137074 +1300	commit: Removed library files
90c135c7ba384bb75935033a5d841e478806072b bbb5de5ca3606b5db7dd92640d3561eaa86ce205 AquiL4X <mike.vermeulen9@gmail.com> 1454137428 +1300	pull: Merge made by the 'recursive' strategy.
bbb5de5ca3606b5db7dd92640d3561eaa86ce205 2b5d3c0a1f5c087d1265d68ed6854a826fbe3c72 AquiL4X <mike.vermeulen9@gmail.com> 1454137860 +1300	rebase finished: refs/heads/master onto 2b5d3c0a1f5c087d1265d68ed6854a826fbe3c72
2b5d3c0a1f5c087d1265d68ed6854a826fbe3c72 75b05b9eea37893e408381cfbd1cbe57473f9019 AquiL4X <mike.vermeulen9@gmail.com> 1454138032 +1300	commit: Fixed witch's animcontroller
75b05b9eea37893e408381cfbd1cbe57473f9019 30ea86bc0272071d1885a8cba7da967898d52de7 AquiL4X <mike.vermeulen9@gmail.com> 1454138147 +1300	commit: Added badges sprites
30ea86bc0272071d1885a8cba7da967898d52de7 86d1ae4568c24374adbb4f33395becd14c2949a6 AquiL4X <mike.vermeulen9@gmail.com> 1454138192 +1300	commit: Added correct badgesBG
86d1ae4568c24374adbb4f33395becd14c2949a6 d44072ac5a10a5482a1c1f4ec7732964b7ba5d3a AquiL4X <mike.vermeulen9@gmail.com> 1454139311 +1300	commit: Removed old playground and added sorting layers
d44072ac5a10a5482a1c1f4ec7732964b7ba5d3a 6e6d77fc8d6067ea10ac000fb4e04f6ccded884c AquiL4X <mike.vermeulen9@gmail.com> 1454139328 +1300	commit: Removed all playground and added sorting layers
6e6d77fc8d6067ea10ac000fb4e04f6ccded884c fd1386d2548ba399563436da9b36b353b781a1fd AquiL4X <mike.vermeulen9@gmail.com> 1454139336 +1300	rebase finished: refs/heads/master onto 54ba54ea0d777ec57a1d92c7ef92b90e192c2a81
fd1386d2548ba399563436da9b36b353b781a1fd 98a21a0b9ff681926a25158e1e6ea60538cc8ce2 AquiL4X <mike.vermeulen9@gmail.com> 1454141041 +1300	commit: Enemy work
98a21a0b9ff681926a25158e1e6ea60538cc8ce2 7a40befaa9bc43bcb939ef65c50acd56e1d255df AquiL4X <mike.vermeulen9@gmail.com> 1454141329 +1300	commit: More UI imports
7a40befaa9bc43bcb939ef65c50acd56e1d255df 030146c0b99885a575551556a4809128f63d568b AquiL4X <mike.vermeulen9@gmail.com> 1454141657 +1300	commit: Added Portal Prefabs
030146c0b99885a575551556a4809128f63d568b 61683abefd24f699210f7798cfd5e04d8b66f8eb AquiL4X <mike.vermeulen9@gmail.com> 1454142595 +1300	commit: Added Owlnpc
61683abefd24f699210f7798cfd5e04d8b66f8eb e92e54f94565abbc1e6e1a49e4d0ebef4e27544d AquiL4X <mike.vermeulen9@gmail.com> 1454142633 +1300	commit: Made owlnpc prefab
e92e54f94565abbc1e6e1a49e4d0ebef4e27544d c09ea23a266f95ed70ac4d6a89e20c5ab1586e9b AquiL4X <mike.vermeulen9@gmail.com> 1454143281 +1300	commit: Added all items
c09ea23a266f95ed70ac4d6a89e20c5ab1586e9b e1aecfec7d504ebefe108a6e892682b585d3265b AquiL4X <mike.vermeulen9@gmail.com> 1454143299 +1300	rebase finished: refs/heads/master onto c373bb3a966315a830d98f83eb024197697714e7
e1aecfec7d504ebefe108a6e892682b585d3265b a657d9ebedf4390b841fd3a75ababea33e81b302 AquiL4X <mike.vermeulen9@gmail.com> 1454146129 +1300	pull --progress --prune origin master: Fast-forward
a657d9ebedf4390b841fd3a75ababea33e81b302 8f61823a2b3171a1dc5d702090b94e67cb56a13b AquiL4X <mike.vermeulen9@gmail.com> 1454146133 +1300	commit: Brought in another imp and updated badgebg
8f61823a2b3171a1dc5d702090b94e67cb56a13b 244d9b9c70aa583f3094379ef29a562f5751eb3d AquiL4X <mike.vermeulen9@gmail.com> 1454146685 +1300	commit: Brought in more imps and added evil tileset
244d9b9c70aa583f3094379ef29a562f5751eb3d d272dd0282234117f4497cb0a0bfd1d31db06634 AquiL4X <mike.vermeulen9@gmail.com> 1454187905 +1300	pull --progress --prune origin master: Fast-forward
d272dd0282234117f4497cb0a0bfd1d31db06634 78486d821c6a4540efcb42ec9a262588fcf9bd83 AquiL4X <mike.vermeulen9@gmail.com> 1454187916 +1300	commit: Started Fungus implementation
78486d821c6a4540efcb42ec9a262588fcf9bd83 505a139110d5d4e0b9d375bcee48cd969d1adee0 AquiL4X <mike.vermeulen9@gmail.com> 1454188367 +1300	commit: Added scrolling BG graphic and UI box
505a139110d5d4e0b9d375bcee48cd969d1adee0 612d68f795e7b907f4ec5740cf0ba4b6516c9810 AquiL4X <mike.vermeulen9@gmail.com> 1454189516 +1300	pull --progress --prune origin master: Merge made by the 'recursive' strategy.
612d68f795e7b907f4ec5740cf0ba4b6516c9810 ed07e1fff908b6d528497452b19526949c5d25e7 AquiL4X <mike.vermeulen9@gmail.com> 1454189527 +1300	commit: Added town placeholder
ed07e1fff908b6d528497452b19526949c5d25e7 0aedf914d182c8096c0de2a527050e54f1a550cf AquiL4X <mike.vermeulen9@gmail.com> 1454190851 +1300	commit: Added portraits and new UI elemts
0aedf914d182c8096c0de2a527050e54f1a550cf 14d7767261fd4b1c306a8fab3572754a3d97273f AquiL4X <mike.vermeulen9@gmail.com> 1454190993 +1300	commit: Added new RPS selections
14d7767261fd4b1c306a8fab3572754a3d97273f bd75b9c543091dbbcdb54b5edb1d126618ca6345 AquiL4X <mike.vermeulen9@gmail.com> 1454192602 +1300	commit: First pass of fungus set up
bd75b9c543091dbbcdb54b5edb1d126618ca6345 d2fb8d0e4a442da28095f0392870488debef1791 AquiL4X <mike.vermeulen9@gmail.com> 1454192912 +1300	rebase finished: refs/heads/master onto 33740982f5a9e99784c3fe1b019c5a0ea6bc1ef2
d2fb8d0e4a442da28095f0392870488debef1791 ea9437a30eabc3dc868359114587ba6a729a9281 AquiL4X <mike.vermeulen9@gmail.com> 1454193175 +1300	rebase finished: refs/heads/master onto ea9437a30eabc3dc868359114587ba6a729a9281
ea9437a30eabc3dc868359114587ba6a729a9281 aba7e794ae1e5f08c274473e430d54c7572df2a9 AquiL4X <mike.vermeulen9@gmail.com> 1454193383 +1300	commit: Fix pivot problem with side tiles
aba7e794ae1e5f08c274473e430d54c7572df2a9 b0b81b4ffc7b184598dc5286d38599e46c493452 AquiL4X <mike.vermeulen9@gmail.com> 1454196402 +1300	pull --progress --prune origin master: Fast-forward
b0b81b4ffc7b184598dc5286d38599e46c493452 f44a254c9114f2cb006f534071a95bcf0338ffa5 AquiL4X <mike.vermeulen9@gmail.com> 1454196526 +1300	pull --progress --prune origin master: Fast-forward
f44a254c9114f2cb006f534071a95bcf0338ffa5 ee90fa51f82a1bb37fba49422bbbbea9b7d597c8 AquiL4X <mike.vermeulen9@gmail.com> 1454197386 +1300	commit: Added and fixed fungus system
ee90fa51f82a1bb37fba49422bbbbea9b7d597c8 a55a8b4e4b8cc33a8a0f4fd06beee1e3eb349fd3 AquiL4X <mike.vermeulen9@gmail.com> 1454197392 +1300	rebase finished: refs/heads/master onto 724fee78eec029fa5aa9d278a733a6539879f88a
a55a8b4e4b8cc33a8a0f4fd06beee1e3eb349fd3 bc80bbf6962302702201428d84760e7a45e96170 AquiL4X <mike.vermeulen9@gmail.com> 1454197873 +1300	commit: Added summoning circle to town
bc80bbf6962302702201428d84760e7a45e96170 220dfab3a37ff4ee9eced4a94d4615eebacadc7b AquiL4X <mike.vermeulen9@gmail.com> 1454197898 +1300	rebase finished: refs/heads/master onto ff461b5044aabd613bc37712b26542ef01e2da57
220dfab3a37ff4ee9eced4a94d4615eebacadc7b 9b64f729ae237fdb5cf8fbf80c924e94c8f3bc62 AquiL4X <mike.vermeulen9@gmail.com> 1454197999 +1300	commit: Fixed sorting order for summoning circle
9b64f729ae237fdb5cf8fbf80c924e94c8f3bc62 7c116322bddf7f6892522b18fb2a9cac60cbe01e AquiL4X <mike.vermeulen9@gmail.com> 1454198181 +1300	rebase finished: refs/heads/master onto 7c116322bddf7f6892522b18fb2a9cac60cbe01e
7c116322bddf7f6892522b18fb2a9cac60cbe01e a846b8463b6cbdb38f34ee6b5e9c7ad0ef699ab3 AquiL4X <mike.vermeulen9@gmail.com> 1454199723 +1300	commit: Tried potential flip fix
a846b8463b6cbdb38f34ee6b5e9c7ad0ef699ab3 441939bf4123a3a1964e6ccaafd6c95f42aea7c4 AquiL4X <mike.vermeulen9@gmail.com> 1454199763 +1300	commit (merge): Merge remote-tracking branch 'origin/master'
441939bf4123a3a1964e6ccaafd6c95f42aea7c4 0af3a359043b936cf6f507c30f76f28cfe4e73ca AquiL4X <mike.vermeulen9@gmail.com> 1454200138 +1300	commit: witch victory animation added
0af3a359043b936cf6f507c30f76f28cfe4e73ca d2117d628334016ac4ff5915245be2cef68c4f88 AquiL4X <mike.vermeulen9@gmail.com> 1454200247 +1300	commit: Boss ui buttons are in
d2117d628334016ac4ff5915245be2cef68c4f88 b8659b4eac46ec22c9e31bc2cf6d390c8437065f AquiL4X <mike.vermeulen9@gmail.com> 1454200421 +1300	commit: Added sound
b8659b4eac46ec22c9e31bc2cf6d390c8437065f 8089cfaf57208ace2af2090fb6101054d17f8d41 AquiL4X <mike.vermeulen9@gmail.com> 1454200631 +1300	commit: Added particle prefabs
8089cfaf57208ace2af2090fb6101054d17f8d41 d903836962728d353d82b0210289c2cac404cde1 AquiL4X <mike.vermeulen9@gmail.com> 1454200639 +1300	rebase finished: refs/heads/master onto b38241d94eb0c0373696852c5503bf2239632602
d903836962728d353d82b0210289c2cac404cde1 7e3c20969deec3bc4f8b14e18af6e3d21ba227b1 AquiL4X <mike.vermeulen9@gmail.com> 1454201300 +1300	commit: Added terrible intro screen
7e3c20969deec3bc4f8b14e18af6e3d21ba227b1 c7170b3b6f73ab1781537a10b4e1e56f5768c4ad AquiL4X <mike.vermeulen9@gmail.com> 1454201864 +1300	commit: Fixed pivot on boss and added tag
c7170b3b6f73ab1781537a10b4e1e56f5768c4ad 557344102bc8039978b4a9403783319422cc7e23 AquiL4X <mike.vermeulen9@gmail.com> 1454203427 +1300	commit: Added intro and end screens
557344102bc8039978b4a9403783319422cc7e23 833cd3cb288cd60390065ac845bd7e3901ccfdb7 AquiL4X <mike.vermeulen9@gmail.com> 1454203438 +1300	rebase finished: refs/heads/master onto 901f8c67da4b09db08488b5f03dd3e260e49ccf0
833cd3cb288cd60390065ac845bd7e3901ccfdb7 7011f27f0262b2274017c5f66bc8f6836f9c8c4b AquiL4X <mike.vermeulen9@gmail.com> 1454204250 +1300	commit: Added Slime
7011f27f0262b2274017c5f66bc8f6836f9c8c4b d6c29cab74fff4c450b38f11f99422daa6b442b2 AquiL4X <mike.vermeulen9@gmail.com> 1454204260 +1300	commit: Fixed layers for enemies
d6c29cab74fff4c450b38f11f99422daa6b442b2 b643c5049ab9f891314be4f27c5c836aab113e43 AquiL4X <mike.vermeulen9@gmail.com> 1454204805 +1300	commit: Added sound fx and fixed credits
b643c5049ab9f891314be4f27c5c836aab113e43 0b3478f443e2d6decd4bcca733a0626054e35199 AquiL4X <mike.vermeulen9@gmail.com> 1454204812 +1300	rebase finished: refs/heads/master onto ce126d8bad11539b0b57f596e3f4f471447b0c99
0b3478f443e2d6decd4bcca733a0626054e35199 5987f2e18e9d3df7d331cec29bcd9c429ba7019c AquiL4X <mike.vermeulen9@gmail.com> 1454205900 +1300	commit: Added enemy balancing
5987f2e18e9d3df7d331cec29bcd9c429ba7019c 68eb7bf7220e1459b23fbbf2bec8bf365e5dc233 AquiL4X <mike.vermeulen9@gmail.com> 1454206611 +1300	commit: Enemy shadows added
68eb7bf7220e1459b23fbbf2bec8bf365e5dc233 a178a6d679adffb3d8e5950d7854a340caf0ae9c AquiL4X <mike.vermeulen9@gmail.com> 1454207322 +1300	commit: Added shadow animation sync
a178a6d679adffb3d8e5950d7854a340caf0ae9c 16d3789149e4b9e84d11054da16a31c3a43bd6d8 AquiL4X <mike.vermeulen9@gmail.com> 1454209644 +1300	commit: All dialogue in along with a test script.
16d3789149e4b9e84d11054da16a31c3a43bd6d8 a18cd4f661293ac63ebefd03d5c768ce2a1c1212 AquiL4X <mike.vermeulen9@gmail.com> 1454209906 +1300	commit: FUNGUS FUCKING WORKS BRAH
a18cd4f661293ac63ebefd03d5c768ce2a1c1212 3f501fe6b934a750764e81c6e63d73a7fc03fcc7 AquiL4X <mike.vermeulen9@gmail.com> 1454210282 +1300	commit: some dfjskfh
3f501fe6b934a750764e81c6e63d73a7fc03fcc7 ad84fd0bf9ab01ecc582e258b97a0f87ff17ff1a AquiL4X <mike.vermeulen9@gmail.com> 1454210808 +1300	commit (merge): Merge remote-tracking branch 'origin/master'
ad84fd0bf9ab01ecc582e258b97a0f87ff17ff1a 586b90dc01d5864e00a66a3eccc0f70083fb8376 AquiL4X <mike.vermeulen9@gmail.com> 1454211141 +1300	commit: K NOW IT WORKS
586b90dc01d5864e00a66a3eccc0f70083fb8376 b05f267ecdf2d12af65b48bd51b9e194577db41a AquiL4X <mike.vermeulen9@gmail.com> 1454211863 +1300	commit: fdgfhj
b05f267ecdf2d12af65b48bd51b9e194577db41a bd6078db3622480530ed9aca274b2100057542e6 AquiL4X <mike.vermeulen9@gmail.com> 1454211881 +1300	commit (merge): Merge remote-tracking branch 'origin/master'
bd6078db3622480530ed9aca274b2100057542e6 c1758744401f98306f7dd2400001a838e5383353 AquiL4X <mike.vermeulen9@gmail.com> 1454212264 +1300	commit: sadgdfh
