0000000000000000000000000000000000000000 1cf65b42a01674ad4a1bb285e55d88c71f2f14ba unknown <Paul@Paul-PC.(none)> 1422038240 +0100	clone: from E:\globalgamejam\unityscene
1cf65b42a01674ad4a1bb285e55d88c71f2f14ba 1ace0fc45280b9b9aa00da7584e4ae93b60ff50f Paul Lawitzki <p.lawitzki@gmailcom> 1422042453 +0100	commit: Added color palette
1ace0fc45280b9b9aa00da7584e4ae93b60ff50f e286f485435360ffb02ca9af1b5e7663b7f13493 Paul Lawitzki <p.lawitzki@gmailcom> 1422065126 +0100	commit: Created demon sprites, and first version of Demon prefab setup (wip)
e286f485435360ffb02ca9af1b5e7663b7f13493 02e63dea09a0b581c88a5ce6dcc1c607a2163d2c Paul Lawitzki <p.lawitzki@gmailcom> 1422065155 +0100	pull origin master: Merge made by the 'recursive' strategy.
02e63dea09a0b581c88a5ce6dcc1c607a2163d2c 84978221dbfc090f96b8e13ada1baf6315fbca26 Paul Lawitzki <p.lawitzki@gmailcom> 1422092379 +0100	commit: finished basic demon setup
84978221dbfc090f96b8e13ada1baf6315fbca26 53769b13ec1999015f5db00e8135d616c0408e08 Paul Lawitzki <p.lawitzki@gmailcom> 1422092401 +0100	pull origin master: Merge made by the 'recursive' strategy.
53769b13ec1999015f5db00e8135d616c0408e08 c10fdb3a52011ea6b2315e45cc8fb77cb13d15bd Paul Lawitzki <p.lawitzki@gmailcom> 1422095951 +0100	commit: finished demon configurator
c10fdb3a52011ea6b2315e45cc8fb77cb13d15bd edeaf120c2678ef633d16a4d33bdf3abbe83b19f Paul Lawitzki <p.lawitzki@gmailcom> 1422096040 +0100	commit (merge): Merge branch 'master' of E:\globalgamejam\unityscene
edeaf120c2678ef633d16a4d33bdf3abbe83b19f 556e8d6ae77884b436cd5fccb1a8e75f6c361597 Paul Lawitzki <p.lawitzki@gmailcom> 1422111263 +0100	commit: final demon parts. slash animation
556e8d6ae77884b436cd5fccb1a8e75f6c361597 f58da68730a443d761abb4142b3042f0fe3f9954 Paul Lawitzki <p.lawitzki@gmailcom> 1422111367 +0100	commit (merge): Merge branch 'master' of E:\globalgamejam\unityscene
f58da68730a443d761abb4142b3042f0fe3f9954 d4deec50623d3c99493b0c3b8a9dee06d674a72a Paul Lawitzki <p.lawitzki@gmailcom> 1422112843 +0100	commit: demon attack animation finished
d4deec50623d3c99493b0c3b8a9dee06d674a72a b411cc0a789dad5924a71e87b81f8a302455788f Paul Lawitzki <p.lawitzki@gmailcom> 1422112851 +0100	pull origin master: Merge made by the 'recursive' strategy.
b411cc0a789dad5924a71e87b81f8a302455788f b6bb3946c4aea3baa5120486f065e8afb79209ed Paul Lawitzki <p.lawitzki@gmailcom> 1422121311 +0100	pull origin master: Fast-forward
b6bb3946c4aea3baa5120486f065e8afb79209ed 2575f7f2812f6fcd09caf2f7836a6ee66f0fe0db Paul Lawitzki <p.lawitzki@gmailcom> 1422121523 +0100	commit: Attic graphics, first pass
2575f7f2812f6fcd09caf2f7836a6ee66f0fe0db a0ce1a9b5a3b2aad2b26b79c7a96e1abade05a90 Paul Lawitzki <p.lawitzki@gmailcom> 1422121884 +0100	commit: exported attic as png
a0ce1a9b5a3b2aad2b26b79c7a96e1abade05a90 619316278eeb03febd313b82773b90aa10132d89 Paul Lawitzki <p.lawitzki@gmailcom> 1422121895 +0100	pull origin master: Merge made by the 'recursive' strategy.
619316278eeb03febd313b82773b90aa10132d89 16515b57fa3ba752d66c086e25ea68954384b9e8 Paul Lawitzki <p.lawitzki@gmailcom> 1422127668 +0100	commit: final environment sprites
16515b57fa3ba752d66c086e25ea68954384b9e8 3325fe57dfb3ac532e129559f577f2b4fab8d911 Paul Lawitzki <p.lawitzki@gmailcom> 1422130541 +0100	commit: Demon configurator ... er... configured (?)
3325fe57dfb3ac532e129559f577f2b4fab8d911 1fdd5938f095dd9d57dc74c9674047caaae27468 Paul Lawitzki <p.lawitzki@gmailcom> 1422130549 +0100	pull origin master: Merge made by the 'recursive' strategy.
1fdd5938f095dd9d57dc74c9674047caaae27468 79697af3a295095eb9f63e86d872dd4250af55a7 Paul Lawitzki <p.lawitzki@gmailcom> 1422134509 +0100	commit: Demon configurator reconfigured. Animations now set the correct z value.
79697af3a295095eb9f63e86d872dd4250af55a7 a4fb6883fd7722ca37f3cba0c42911abb8dd77b2 Paul Lawitzki <p.lawitzki@gmailcom> 1422134518 +0100	pull origin master: Merge made by the 'recursive' strategy.
a4fb6883fd7722ca37f3cba0c42911abb8dd77b2 ba989232db1f882d376fac487a0ea89c0ecf1d7d Paul Lawitzki <p.lawitzki@gmailcom> 1422136776 +0100	commit: commit for forward integration
ba989232db1f882d376fac487a0ea89c0ecf1d7d c0752f9831f2c5e8b00f0b7f136703b3d8f7dcd5 Paul Lawitzki <p.lawitzki@gmailcom> 1422136783 +0100	pull origin master: Merge made by the 'recursive' strategy.
c0752f9831f2c5e8b00f0b7f136703b3d8f7dcd5 5ea6e38761739e2d0a3fac07accfeb41401c3132 Paul Lawitzki <p.lawitzki@gmailcom> 1422136957 +0100	commit: Demon prefab fixed
5ea6e38761739e2d0a3fac07accfeb41401c3132 5f34a72110a380ac5b8b728c5160c049e8e45008 Paul Lawitzki <p.lawitzki@gmailcom> 1422139327 +0100	commit: first pass gui graphics
5f34a72110a380ac5b8b728c5160c049e8e45008 76bf6e1c1f26cf573be28481aa0505d2f19e4072 Paul Lawitzki <p.lawitzki@gmailcom> 1422139342 +0100	pull origin master: Merge made by the 'recursive' strategy.
76bf6e1c1f26cf573be28481aa0505d2f19e4072 42939de0462ddf6790db4061da8ac4a3688d97f9 Paul Lawitzki <p.lawitzki@gmailcom> 1422139658 +0100	pull origin master: Fast-forward
42939de0462ddf6790db4061da8ac4a3688d97f9 f45cb1e769eac24e6af6fdceeb7022279cc0289b Paul Lawitzki <p.lawitzki@gmailcom> 1422142307 +0100	commit: tested fire sprites. Now i feel bad, because i stole them oO
f45cb1e769eac24e6af6fdceeb7022279cc0289b 129f96f22c1689b80031b9c8a781d95195c51edb Paul Lawitzki <p.lawitzki@gmailcom> 1422142349 +0100	commit (merge): Merge branch 'master' of E:\globalgamejam\unityscene
129f96f22c1689b80031b9c8a781d95195c51edb 5ebca38a665acfd802e215219cdb01e4391039be Paul Lawitzki <p.lawitzki@gmailcom> 1422180119 +0100	commit: Title screen and credits prefab
5ebca38a665acfd802e215219cdb01e4391039be 92edb13182e44edf203d5f00417499a7ac5cf3f1 Paul Lawitzki <p.lawitzki@gmailcom> 1422180130 +0100	pull origin master: Merge made by the 'recursive' strategy.
92edb13182e44edf203d5f00417499a7ac5cf3f1 56f7eb16a56a160a5e27be0b45c49f31c3f5bd2a Paul Lawitzki <p.lawitzki@gmailcom> 1422184430 +0100	commit: finished game over screen. Adapted summoning gui color
56f7eb16a56a160a5e27be0b45c49f31c3f5bd2a c16ae3c54d3ccb15e5f1cf14b48b5dea203da84f Paul Lawitzki <p.lawitzki@gmailcom> 1422188449 +0100	commit: Spawn animation
c16ae3c54d3ccb15e5f1cf14b48b5dea203da84f bc53530ab8d88fca73acc1a0cdb71aed02837c75 Paul Lawitzki <p.lawitzki@gmailcom> 1422188635 +0100	pull origin master: Merge made by the 'recursive' strategy.
bc53530ab8d88fca73acc1a0cdb71aed02837c75 2d65b34af2b411f9989c1fc2a1d56c76d5c4f25b Paul Lawitzki <p.lawitzki@gmailcom> 1422189399 +0100	pull origin master: Fast-forward
2d65b34af2b411f9989c1fc2a1d56c76d5c4f25b c2bf21b44589528ced28afbe84d5a537f720eaca Paul Lawitzki <p.lawitzki@gmailcom> 1422192715 +0100	checkout: moving from master to newMaster
c2bf21b44589528ced28afbe84d5a537f720eaca 7ccbb235b9b9605faad2e0b65b2b8438c21ba22e Paul Lawitzki <p.lawitzki@gmailcom> 1422195844 +0100	commit: final merging (part 1)
7ccbb235b9b9605faad2e0b65b2b8438c21ba22e 2b6e0b8236c2d60ce1012f6ffaa9c37b55d03d63 Paul Lawitzki <p.lawitzki@gmailcom> 1422195876 +0100	pull origin newMaster: Merge made by the 'recursive' strategy.
2b6e0b8236c2d60ce1012f6ffaa9c37b55d03d63 c8690269a7ae7dda5b5654d93c212331b862f917 Paul Lawitzki <p.lawitzki@gmailcom> 1422198886 +0100	commit: Sound integrated
c8690269a7ae7dda5b5654d93c212331b862f917 619114f24d39bbf19f9068da2f56f6988bfa3cbf Paul Lawitzki <p.lawitzki@gmailcom> 1422199122 +0100	pull origin newMaster: Fast-forward
619114f24d39bbf19f9068da2f56f6988bfa3cbf b68952e9068de8e4bf3832338494c4d9062beb92 Paul Lawitzki <p.lawitzki@gmailcom> 1422201219 +0100	commit: final commit after presentation
