0000000000000000000000000000000000000000 37fb7b5bb3619b72dcaf52c46aaf8df921d9e2d6 Dariusz Szylak <dariusz.szylak@logicims.com> 1454115266 +0100	clone: from https://github.com/CppMaster/SemiPlatformer.git
37fb7b5bb3619b72dcaf52c46aaf8df921d9e2d6 3d7280fdc0e1d729cb757ce8406f9f6ddc9d24f4 Dariusz Szylak <dariusz.szylak@logicims.com> 1454115328 +0100	checkout: moving from master to Simplified_level_design
3d7280fdc0e1d729cb757ce8406f9f6ddc9d24f4 3d7280fdc0e1d729cb757ce8406f9f6ddc9d24f4 Dariusz Szylak <dariusz.szylak@logicims.com> 1454116692 +0100	checkout: moving from Simplified_level_design to WolfHp
3d7280fdc0e1d729cb757ce8406f9f6ddc9d24f4 3d7280fdc0e1d729cb757ce8406f9f6ddc9d24f4 Dariusz Szylak <dariusz.szylak@logicims.com> 1454117871 +0100	checkout: moving from WolfHp to Simplified_level_design
3d7280fdc0e1d729cb757ce8406f9f6ddc9d24f4 03ae1b26a9c927230adbf0d87bce20f8fa4314d8 Dariusz Szylak <dariusz.szylak@logicims.com> 1454117889 +0100	pull origin Simplified_level_design: Fast-forward
03ae1b26a9c927230adbf0d87bce20f8fa4314d8 3d7280fdc0e1d729cb757ce8406f9f6ddc9d24f4 Dariusz Szylak <dariusz.szylak@logicims.com> 1454117904 +0100	checkout: moving from Simplified_level_design to WolfHp
3d7280fdc0e1d729cb757ce8406f9f6ddc9d24f4 03ae1b26a9c927230adbf0d87bce20f8fa4314d8 Dariusz Szylak <dariusz.szylak@logicims.com> 1454117946 +0100	pull origin Simplified_level_design: Fast-forward
03ae1b26a9c927230adbf0d87bce20f8fa4314d8 119717a18fb58593f70f86dce152ba2aed14a562 Dariusz Szylak <dariusz.szylak@logicims.com> 1454122467 +0100	commit: Added hp bar
119717a18fb58593f70f86dce152ba2aed14a562 03ae1b26a9c927230adbf0d87bce20f8fa4314d8 Dariusz Szylak <dariusz.szylak@logicims.com> 1454155323 +0100	checkout: moving from WolfHp to Simplified_level_design
03ae1b26a9c927230adbf0d87bce20f8fa4314d8 3b304d3e1c1b1db6a22aada707b26487b3a9cd48 Dariusz Szylak <dariusz.szylak@logicims.com> 1454155357 +0100	pull origin Simplified_level_design: Fast-forward
3b304d3e1c1b1db6a22aada707b26487b3a9cd48 3b304d3e1c1b1db6a22aada707b26487b3a9cd48 Dariusz Szylak <dariusz.szylak@logicims.com> 1454156919 +0100	checkout: moving from Simplified_level_design to betterHp
3b304d3e1c1b1db6a22aada707b26487b3a9cd48 cce6578ea92163701a0c45fcd661dfd9f0f99e03 Dariusz Szylak <dariusz.szylak@logicims.com> 1454157037 +0100	commit: Added testScene HP bar
cce6578ea92163701a0c45fcd661dfd9f0f99e03 119717a18fb58593f70f86dce152ba2aed14a562 Dariusz Szylak <dariusz.szylak@logicims.com> 1454157072 +0100	checkout: moving from betterHp to WolfHp
119717a18fb58593f70f86dce152ba2aed14a562 cce6578ea92163701a0c45fcd661dfd9f0f99e03 Dariusz Szylak <dariusz.szylak@logicims.com> 1454157128 +0100	checkout: moving from WolfHp to betterHp
cce6578ea92163701a0c45fcd661dfd9f0f99e03 e54400bbf4560a2c2a057ce000d90170f3865d82 Dariusz Szylak <dariusz.szylak@logicims.com> 1454158044 +0100	commit: Added hp bar to hero
e54400bbf4560a2c2a057ce000d90170f3865d82 3ebd7bfcfb44a656d67e39cce493715b9c080607 Dariusz Szylak <dariusz.szylak@logicims.com> 1454158065 +0100	commit: Added hp bar to hero
3ebd7bfcfb44a656d67e39cce493715b9c080607 119717a18fb58593f70f86dce152ba2aed14a562 Dariusz Szylak <dariusz.szylak@logicims.com> 1454158082 +0100	checkout: moving from betterHp to WolfHp
119717a18fb58593f70f86dce152ba2aed14a562 3ebd7bfcfb44a656d67e39cce493715b9c080607 Dariusz Szylak <dariusz.szylak@logicims.com> 1454158177 +0100	checkout: moving from WolfHp to betterHp
3ebd7bfcfb44a656d67e39cce493715b9c080607 73a87c18e951326f87bbf4d626b5a9d0442ae39f Dariusz Szylak <dariusz.szylak@logicims.com> 1454159864 +0100	commit: Added Garlic Man hp and Monk hp
73a87c18e951326f87bbf4d626b5a9d0442ae39f 3b304d3e1c1b1db6a22aada707b26487b3a9cd48 Dariusz Szylak <dariusz.szylak@logicims.com> 1454169243 +0100	checkout: moving from betterHp to Simplified_level_design
3b304d3e1c1b1db6a22aada707b26487b3a9cd48 83c76ea2e484461e4c0c11ca1e171524f4ddc338 Dariusz Szylak <dariusz.szylak@logicims.com> 1454169360 +0100	pull origin Simplified_level_design: Fast-forward
83c76ea2e484461e4c0c11ca1e171524f4ddc338 83c76ea2e484461e4c0c11ca1e171524f4ddc338 Dariusz Szylak <dariusz.szylak@logicims.com> 1454172286 +0100	checkout: moving from Simplified_level_design to enemyHp
83c76ea2e484461e4c0c11ca1e171524f4ddc338 993dad73e5d930b2d69772508dbc9b40453d37d9 Dariusz Szylak <dariusz.szylak@logicims.com> 1454172342 +0100	commit: Added enemy hp bar
993dad73e5d930b2d69772508dbc9b40453d37d9 993dad73e5d930b2d69772508dbc9b40453d37d9 Dariusz Szylak <dariusz.szylak@logicims.com> 1454174348 +0100	checkout: moving from enemyHp to enemyHp
993dad73e5d930b2d69772508dbc9b40453d37d9 fcff5769fbbb38eeaae470f311b397bef46ce8ab Dariusz Szylak <dariusz.szylak@logicims.com> 1454177910 +0100	commit: Update hp bar after death
fcff5769fbbb38eeaae470f311b397bef46ce8ab 83c76ea2e484461e4c0c11ca1e171524f4ddc338 Dariusz Szylak <dariusz.szylak@logicims.com> 1454178608 +0100	checkout: moving from enemyHp to Simplified_level_design
83c76ea2e484461e4c0c11ca1e171524f4ddc338 83c76ea2e484461e4c0c11ca1e171524f4ddc338 Dariusz Szylak <dariusz.szylak@logicims.com> 1454178623 +0100	checkout: moving from Simplified_level_design to Simplified_level_design
83c76ea2e484461e4c0c11ca1e171524f4ddc338 b49f5ac6304a4b9bbeeeaea59a60251095079974 Dariusz Szylak <dariusz.szylak@logicims.com> 1454178659 +0100	pull origin Simplified_level_design: Fast-forward
b49f5ac6304a4b9bbeeeaea59a60251095079974 b49f5ac6304a4b9bbeeeaea59a60251095079974 Dariusz Szylak <dariusz.szylak@logicims.com> 1454182212 +0100	checkout: moving from Simplified_level_design to fixedColision
b49f5ac6304a4b9bbeeeaea59a60251095079974 3aea6d071885f9f41111212c6ee31d7cf686fe5e Dariusz Szylak <dariusz.szylak@logicims.com> 1454182262 +0100	commit: Fixed colision
3aea6d071885f9f41111212c6ee31d7cf686fe5e b49f5ac6304a4b9bbeeeaea59a60251095079974 Dariusz Szylak <dariusz.szylak@logicims.com> 1454192724 +0100	checkout: moving from fixedColision to Simplified_level_design
b49f5ac6304a4b9bbeeeaea59a60251095079974 4e8cef8182e96c111f80d1ee8b4ddb96a5c400e0 Dariusz Szylak <dariusz.szylak@logicims.com> 1454192758 +0100	pull origin Simplified_level_design: Fast-forward
4e8cef8182e96c111f80d1ee8b4ddb96a5c400e0 3ff89cb7ad54d46a39a5764bb0e29706c47b53d7 Dariusz Szylak <dariusz.szylak@logicims.com> 1454203243 +0100	commit: New ui for Garlic Man
3ff89cb7ad54d46a39a5764bb0e29706c47b53d7 4e0dab5b4d1ea0cd9c1e91d1b1caf7b16bbb686a Dariusz Szylak <dariusz.szylak@logicims.com> 1454203291 +0100	pull origin Simplified_level_design: Merge made by the 'recursive' strategy.
4e0dab5b4d1ea0cd9c1e91d1b1caf7b16bbb686a 5a859de3987d1866e5b8aa36e889dc8603c8dbdc Dariusz Szylak <dariusz.szylak@logicims.com> 1454203704 +0100	commit: Minor fix
5a859de3987d1866e5b8aa36e889dc8603c8dbdc 993859a1f6d429daeae7d60c149b3ee07c672957 Dariusz Szylak <dariusz.szylak@logicims.com> 1454204504 +0100	pull origin Simplified_level_design: Fast-forward
993859a1f6d429daeae7d60c149b3ee07c672957 3da21bf2fc5aab2b5bf2a46bef2f477c5d7d4370 Dariusz Szylak <dariusz.szylak@logicims.com> 1454204947 +0100	commit: Fixed ui position
3da21bf2fc5aab2b5bf2a46bef2f477c5d7d4370 3da21bf2fc5aab2b5bf2a46bef2f477c5d7d4370 Dariusz Szylak <dariusz.szylak@logicims.com> 1454240397 +0100	checkout: moving from Simplified_level_design to UpdateBalance
3da21bf2fc5aab2b5bf2a46bef2f477c5d7d4370 a7b16655067721472d0e3efd1a02d7ba40809991 Dariusz Szylak <dariusz.szylak@logicims.com> 1454240451 +0100	commit: Fixed Balance Game
a7b16655067721472d0e3efd1a02d7ba40809991 3da21bf2fc5aab2b5bf2a46bef2f477c5d7d4370 Dariusz Szylak <dariusz.szylak@logicims.com> 1454240544 +0100	checkout: moving from UpdateBalance to Simplified_level_design
3da21bf2fc5aab2b5bf2a46bef2f477c5d7d4370 fb09604c2cd8a419b9ef969f5321e107c99774d7 Dariusz Szylak <dariusz.szylak@logicims.com> 1454241783 +0100	commit: Set correct control (pad and key)
fb09604c2cd8a419b9ef969f5321e107c99774d7 51b25d8d777f4fd1c724d914467808da5c6f2c47 Dariusz Szylak <dariusz.szylak@logicims.com> 1454241818 +0100	pull origin Simplified_level_design: Merge made by the 'recursive' strategy.
51b25d8d777f4fd1c724d914467808da5c6f2c47 775aa7ddbe2145b6ee1599b00f8bb990c41a1570 Dariusz Szylak <dariusz.szylak@logicims.com> 1454241990 +0100	pull origin Simplified_level_design: Merge made by the 'recursive' strategy.
775aa7ddbe2145b6ee1599b00f8bb990c41a1570 4a40bdb3fa252d21dbebf073017dc6b4ba052cb3 Dariusz Szylak <dariusz.szylak@logicims.com> 1454242059 +0100	pull origin Simplified_level_design: Merge made by the 'recursive' strategy.
4a40bdb3fa252d21dbebf073017dc6b4ba052cb3 4a40bdb3fa252d21dbebf073017dc6b4ba052cb3 Dariusz Szylak <dariusz.szylak@logicims.com> 1454242116 +0100	checkout: moving from Simplified_level_design to PadControl
4a40bdb3fa252d21dbebf073017dc6b4ba052cb3 4a40bdb3fa252d21dbebf073017dc6b4ba052cb3 Dariusz Szylak <dariusz.szylak@logicims.com> 1454242293 +0100	checkout: moving from PadControl to Simplified_level_design
4a40bdb3fa252d21dbebf073017dc6b4ba052cb3 bb8b92f265ed715204e517d584b47bf42add38f4 Dariusz Szylak <dariusz.szylak@logicims.com> 1454246295 +0100	pull origin Simplified_level_design: Fast-forward
bb8b92f265ed715204e517d584b47bf42add38f4 daa71e899de6c464d0e8ba54d1162c0cc6c2117a Dariusz Szylak <dariusz.szylak@logicims.com> 1454248755 +0100	commit: Fixed screen and pad control
