0000000000000000000000000000000000000000 29b7849e11271b28d63d8dfeb4aa38ef521ef552 Pascal Le Merrer <pascal.lemerrer@orange.com> 1484956675 +0100	commit (initial): Initial commit
29b7849e11271b28d63d8dfeb4aa38ef521ef552 d0975ddbb049446b188661d6a35dcb6ce072428b Pascal Le Merrer <pascal.lemerrer@orange.com> 1484956723 +0100	commit: Add paddles
d0975ddbb049446b188661d6a35dcb6ce072428b 85ceeef006843670a2e9839de64b5b77ce99dd5a Pascal Le Merrer <pascal.lemerrer@orange.com> 1484988928 +0100	pull origin master: Fast-forward
85ceeef006843670a2e9839de64b5b77ce99dd5a 02bf5868bf05519c8fb6aeb17c7ab61ad458dafc Pascal Le Merrer <pascal.lemerrer@orange.com> 1484990391 +0100	commit: Fix initial position of paddles
02bf5868bf05519c8fb6aeb17c7ab61ad458dafc 1f16b2d911a058e23eb178c57aa05b715b901740 Pascal Le Merrer <pascal.lemerrer@orange.com> 1484991861 +0100	commit: Prevent paddles to exit arena
1f16b2d911a058e23eb178c57aa05b715b901740 9ea8872d600b0b76b352b2b16f6ab9521dff2c77 Pascal Le Merrer <pascal.lemerrer@orange.com> 1484994548 +0100	commit: Add ball factory
9ea8872d600b0b76b352b2b16f6ab9521dff2c77 6a6497c0601a4522c36c23618bb7139a135886ee Pascal Le Merrer <pascal.lemerrer@orange.com> 1484994799 +0100	commit: Extract scripts from scenes
6a6497c0601a4522c36c23618bb7139a135886ee c1ecbbe03dbd0ca92a1106ab21d4b645eb9e7d8c Pascal Le Merrer <pascal.lemerrer@orange.com> 1484996895 +0100	commit: Add ball factory
c1ecbbe03dbd0ca92a1106ab21d4b645eb9e7d8c dd62832c5298bab117b44ba2008e5d66b034f88c Pascal Le Merrer <pascal.lemerrer@orange.com> 1484997870 +0100	commit: Delete unused file
dd62832c5298bab117b44ba2008e5d66b034f88c df68450a6337b94c783fea81994548e3dd9ca8ae Pascal Le Merrer <pascal.lemerrer@orange.com> 1484997905 +0100	commit: Change game size to 1440x900 pixels
df68450a6337b94c783fea81994548e3dd9ca8ae 56d85085ffd6786b7f3dc25c1d4dd7f8a4aea885 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485006213 +0100	commit: Add goals and detection of collision with ball
56d85085ffd6786b7f3dc25c1d4dd7f8a4aea885 2b2f841df9b7b4c70a5ab847f011ff8e57c4e0d2 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485007780 +0100	commit: Clean ball script
2b2f841df9b7b4c70a5ab847f011ff8e57c4e0d2 979cadc792b742bf49dbefdda1a81870cfc96430 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485007808 +0100	commit: Add Hud
979cadc792b742bf49dbefdda1a81870cfc96430 4209ce9ec535ba187a89e310f4ebfac3e67ba07a Pascal Le Merrer <pascal.lemerrer@orange.com> 1485008181 +0100	pull origin master: Fast-forward
4209ce9ec535ba187a89e310f4ebfac3e67ba07a 35965fd88930a55a4751ee1bd3e2b6acafa6e842 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485009232 +0100	pull origin master: Fast-forward
35965fd88930a55a4751ee1bd3e2b6acafa6e842 a8007bd785e61b74f7719c235d2d7874d3065ae6 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485012986 +0100	commit: Add score
a8007bd785e61b74f7719c235d2d7874d3065ae6 f2153d0ce0a7b90907d86ef102b4635a1c8b8f77 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485015812 +0100	commit: Reset game when escape key is pressed
f2153d0ce0a7b90907d86ef102b4635a1c8b8f77 67d88521885fcf450f11421d5efd26552865ddf0 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485016029 +0100	checkout: moving from master to origin/collide_bug
67d88521885fcf450f11421d5efd26552865ddf0 f2153d0ce0a7b90907d86ef102b4635a1c8b8f77 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485016558 +0100	checkout: moving from 67d88521885fcf450f11421d5efd26552865ddf0 to master
f2153d0ce0a7b90907d86ef102b4635a1c8b8f77 abff0a29996c117804b360218990f198de9815c8 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485017877 +0100	commit: Remove debug features
abff0a29996c117804b360218990f198de9815c8 3e94c6641d6821a9698e230df5aa9e4be0dee383 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485017912 +0100	commit: Fix ball collision with left goal
3e94c6641d6821a9698e230df5aa9e4be0dee383 67d88521885fcf450f11421d5efd26552865ddf0 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485018884 +0100	checkout: moving from master to origin/collide_bug
67d88521885fcf450f11421d5efd26552865ddf0 3e94c6641d6821a9698e230df5aa9e4be0dee383 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485018953 +0100	checkout: moving from 67d88521885fcf450f11421d5efd26552865ddf0 to master
3e94c6641d6821a9698e230df5aa9e4be0dee383 67d88521885fcf450f11421d5efd26552865ddf0 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485019308 +0100	checkout: moving from master to 67d88521885fcf450f11421d5efd26552865ddf0
67d88521885fcf450f11421d5efd26552865ddf0 3e94c6641d6821a9698e230df5aa9e4be0dee383 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485019360 +0100	checkout: moving from 67d88521885fcf450f11421d5efd26552865ddf0 to master
3e94c6641d6821a9698e230df5aa9e4be0dee383 885cf6a1c2d980a1f3656d0b04cd4eb8481f2586 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485022321 +0100	commit: Add ball damping
885cf6a1c2d980a1f3656d0b04cd4eb8481f2586 6a63d40635e3299d419da15425e74c271c52b196 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485022344 +0100	commit: Remove comment
6a63d40635e3299d419da15425e74c271c52b196 8b12b8e157e431d7594c7c2f9b6dce58175b7a9a Pascal Le Merrer <pascal.lemerrer@orange.com> 1485022360 +0100	commit: Increase speed of paddle
8b12b8e157e431d7594c7c2f9b6dce58175b7a9a 1f84e1bdd59e2e2ca5b6c0b8e28065a381369ba3 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485024728 +0100	commit: Add ball spawn
1f84e1bdd59e2e2ca5b6c0b8e28065a381369ba3 916bb5724520a63a00def053fff7da8178cf0ab5 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485024740 +0100	pull --rebase origin master: checkout 916bb5724520a63a00def053fff7da8178cf0ab5
916bb5724520a63a00def053fff7da8178cf0ab5 18a8ab581f995313b250f18c507c97e976c91180 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485024740 +0100	pull --rebase origin master: Add ball damping
18a8ab581f995313b250f18c507c97e976c91180 4a5e020e02c1c48262fbf9d91d129e391ed9e407 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485024740 +0100	pull --rebase origin master: Remove comment
4a5e020e02c1c48262fbf9d91d129e391ed9e407 953eb0d9b039be66f39ca18fe284cc700fdb4dbd Pascal Le Merrer <pascal.lemerrer@orange.com> 1485024740 +0100	pull --rebase origin master: Increase speed of paddle
953eb0d9b039be66f39ca18fe284cc700fdb4dbd 6f79f7e07a88162d41a40477f57e29eadb6d9396 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485024972 +0100	commit: Solve conflicts
6f79f7e07a88162d41a40477f57e29eadb6d9396 6f79f7e07a88162d41a40477f57e29eadb6d9396 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485025142 +0100	rebase finished: returning to refs/heads/master
6f79f7e07a88162d41a40477f57e29eadb6d9396 0966545d991266d16dea19a402ce1345bda23fc8 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485026453 +0100	commit: Reset paddle position when spawning a ball
0966545d991266d16dea19a402ce1345bda23fc8 bec59ab06bde9c2edcbd1577a22118488318caf7 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485026476 +0100	pull --rebase origin master: checkout bec59ab06bde9c2edcbd1577a22118488318caf7
bec59ab06bde9c2edcbd1577a22118488318caf7 0df5677dae31fef3cf7c04f9aa19e566f87fe5d8 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485026476 +0100	pull --rebase origin master: Add ball damping
0df5677dae31fef3cf7c04f9aa19e566f87fe5d8 e59b670feb032f5ee964c13fb5c87f4a1fa480eb Pascal Le Merrer <pascal.lemerrer@orange.com> 1485026476 +0100	pull --rebase origin master: Remove comment
e59b670feb032f5ee964c13fb5c87f4a1fa480eb 41521af296604dde5e30d960134d9406e3c08ff7 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485026476 +0100	pull --rebase origin master: Increase speed of paddle
41521af296604dde5e30d960134d9406e3c08ff7 264330fd1fe4e90ee000752e1c55a462ecdbdb77 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485026476 +0100	pull --rebase origin master: Solve conflicts
264330fd1fe4e90ee000752e1c55a462ecdbdb77 2f15935b7e0d500be464be654fb0395345dd5e2c Pascal Le Merrer <pascal.lemerrer@orange.com> 1485026476 +0100	pull --rebase origin master: Reset paddle position when spawning a ball
2f15935b7e0d500be464be654fb0395345dd5e2c 2f15935b7e0d500be464be654fb0395345dd5e2c Pascal Le Merrer <pascal.lemerrer@orange.com> 1485026476 +0100	rebase finished: returning to refs/heads/master
2f15935b7e0d500be464be654fb0395345dd5e2c 53356c1bb27fad900bc3797f342bb54f4300643f Pascal Le Merrer <pascal.lemerrer@orange.com> 1485026538 +0100	commit: Limit number of balls
53356c1bb27fad900bc3797f342bb54f4300643f fbac36985c22f584fb9fc88b141fec6092a38c83 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485026560 +0100	commit: Paddle extends KinematicBody2D
fbac36985c22f584fb9fc88b141fec6092a38c83 36336ff8140a1f498525c727ca7c1cf0876b2ba0 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485026573 +0100	commit: Remove friction on ball
36336ff8140a1f498525c727ca7c1cf0876b2ba0 ecafa623e2ea93e3e4d8222de96d0ec86aebcb80 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485026628 +0100	commit: Change ball spawning position when a ball gets idle
ecafa623e2ea93e3e4d8222de96d0ec86aebcb80 8729a278e3f2696c9f6f529e4fd02ada55ed8a98 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485033102 +0100	commit: Refactor end of game
8729a278e3f2696c9f6f529e4fd02ada55ed8a98 c1b1f3798d9f9fdcac210d8496b7c1f94cec1a80 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485033121 +0100	commit: Remove reset of paddles when spawning a ball
c1b1f3798d9f9fdcac210d8496b7c1f94cec1a80 330f62bf87c94a56451e994ce9e5ffe1d52d3828 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485033175 +0100	commit: Update Hud position in Game Scene
330f62bf87c94a56451e994ce9e5ffe1d52d3828 aa167e2851761d385868339d51ca51c273ef499d Pascal Le Merrer <pascal.lemerrer@orange.com> 1485033222 +0100	commit: Fix moving ball when spawning
aa167e2851761d385868339d51ca51c273ef499d 900e4c698fabc4d1cbb8aa9552777f39fcda7967 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485033246 +0100	commit: Fix ball spawning issues
900e4c698fabc4d1cbb8aa9552777f39fcda7967 6affd9ae3cc74914761eb9add8fc5ea76d127cf6 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485033265 +0100	commit: Add debug text
6affd9ae3cc74914761eb9add8fc5ea76d127cf6 bcc75d4fe434c4bae8a261b80b8773623b128543 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485037952 +0100	commit: Add random color to paddle
bcc75d4fe434c4bae8a261b80b8773623b128543 cc72d62707e67c5359bafe5f52b959fbd7e6253a Pascal Le Merrer <pascal.lemerrer@orange.com> 1485038353 +0100	checkout: moving from master to develop
cc72d62707e67c5359bafe5f52b959fbd7e6253a 73a04390fed35fe0b909d96780f772e85fd3addc Pascal Le Merrer <pascal.lemerrer@orange.com> 1485040860 +0100	commit: Fix goal position
73a04390fed35fe0b909d96780f772e85fd3addc fd7bcfcd0b3ad141e5bf9e74778d9c01053f1bc9 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485040866 +0100	commit (amend): Fix goal position
fd7bcfcd0b3ad141e5bf9e74778d9c01053f1bc9 19cd615c375fa6baadc20de073842652f53e2f5d Pascal Le Merrer <pascal.lemerrer@orange.com> 1485040875 +0100	commit: Fix hud visibility
19cd615c375fa6baadc20de073842652f53e2f5d 505663bffc22ba2b46019212a553a6d5fbb660d2 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485040892 +0100	commit: Add color selection for paddles
505663bffc22ba2b46019212a553a6d5fbb660d2 89bcae1956a055ee4dab7fa1bb940d55b861e63d Pascal Le Merrer <pascal.lemerrer@orange.com> 1485041305 +0100	commit: Change ball color when colliding with a pad
89bcae1956a055ee4dab7fa1bb940d55b861e63d f444c15503513f99cc8b37d90f4196b5064db932 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485042351 +0100	commit: Delete debug trace
f444c15503513f99cc8b37d90f4196b5064db932 f75a53ddb32f1924e61cb4766952dca849b5001a Pascal Le Merrer <pascal.lemerrer@orange.com> 1485042764 +0100	commit: Delete ball parents when destroying a ball
f75a53ddb32f1924e61cb4766952dca849b5001a ec470b3a8b1fc35498e7d361a172b07803d060f2 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485075833 +0100	pull origin develop: Fast-forward
ec470b3a8b1fc35498e7d361a172b07803d060f2 a2747fac3d5c81e7af563f869c55805297c351c0 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485077083 +0100	commit: Homogenise initial scores display
a2747fac3d5c81e7af563f869c55805297c351c0 6db0378bebcbef988e5ec294d558318206948340 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485077107 +0100	commit: Refactor timer clearing at game end
6db0378bebcbef988e5ec294d558318206948340 99ad183eccd829f36cb72983c2ba2551e87794c9 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485077147 +0100	commit: Set victory condition to 30
99ad183eccd829f36cb72983c2ba2551e87794c9 28b403eebc02ba63d65b3c914a897c550fd95791 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485077764 +0100	commit: Fix black screen on end of game
28b403eebc02ba63d65b3c914a897c550fd95791 d1e16c970d9d189e7e7c2084d0eb9bb1e02aa9ee Pascal Le Merrer <pascal.lemerrer@orange.com> 1485077989 +0100	commit: Fix end message
d1e16c970d9d189e7e7c2084d0eb9bb1e02aa9ee 4777fa54ec2958a17e25d7991960df97999f6f41 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485083778 +0100	commit: Change color set
4777fa54ec2958a17e25d7991960df97999f6f41 3bfe1f843c60ff0857ec905bc4cedbe6fdcc0992 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485083993 +0100	commit: Fix timer discarding
3bfe1f843c60ff0857ec905bc4cedbe6fdcc0992 3ba2edb1237fffc46a1ead7d06284da53362cb7c Pascal Le Merrer <pascal.lemerrer@orange.com> 1485084009 +0100	commit: Change color Set
3ba2edb1237fffc46a1ead7d06284da53362cb7c 35653125ba11fcbf481efd7b13e7f8cbe18e934e Pascal Le Merrer <pascal.lemerrer@orange.com> 1485084256 +0100	commit: Refactor
35653125ba11fcbf481efd7b13e7f8cbe18e934e 7b37ebe4d20dc4fddc7c0c0de227fd458f645302 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485084417 +0100	commit: Change ball size hen colliding a border
7b37ebe4d20dc4fddc7c0c0de227fd458f645302 7827d201dfe0e6c841f7d2d46c26a861a2e8fd9d Pascal Le Merrer <pascal.lemerrer@orange.com> 1485084449 +0100	commit: Do not pop new balls on paddle location
7827d201dfe0e6c841f7d2d46c26a861a2e8fd9d 08353fda22203577718053b0e5d28a5b6f82b3fb Pascal Le Merrer <pascal.lemerrer@orange.com> 1485084496 +0100	commit: Make destroy_ball method more robust
08353fda22203577718053b0e5d28a5b6f82b3fb 04c7a647680781fcb4e278335a37157f5f530e1d Pascal Le Merrer <pascal.lemerrer@orange.com> 1485085839 +0100	commit: Change color Set
04c7a647680781fcb4e278335a37157f5f530e1d 0f7c848452acb605d14af1974630628d6aee1b34 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485085859 +0100	commit: Remove default debug text and move debug label
0f7c848452acb605d14af1974630628d6aee1b34 efef642df515013931184383ed0e3a33f24cd112 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485086094 +0100	commit: Refactor ball.gd
efef642df515013931184383ed0e3a33f24cd112 bcc75d4fe434c4bae8a261b80b8773623b128543 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485086142 +0100	checkout: moving from develop to master
bcc75d4fe434c4bae8a261b80b8773623b128543 efef642df515013931184383ed0e3a33f24cd112 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485086152 +0100	merge develop: Fast-forward
efef642df515013931184383ed0e3a33f24cd112 eea0d6c35574190ac350ef7da53f28c5f8d42763 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485086584 +0100	commit: Accelerate ball when colliding with border of the same color
eea0d6c35574190ac350ef7da53f28c5f8d42763 efef642df515013931184383ed0e3a33f24cd112 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485086628 +0100	checkout: moving from master to develop
efef642df515013931184383ed0e3a33f24cd112 eea0d6c35574190ac350ef7da53f28c5f8d42763 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485086632 +0100	merge master: Fast-forward
eea0d6c35574190ac350ef7da53f28c5f8d42763 a0eee0d209e1377920e7fa40f193ded912287e82 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485097466 +0100	commit: Add waveballs
a0eee0d209e1377920e7fa40f193ded912287e82 92f509d8af69a0663f6053a2b85f0a96785861c3 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485098521 +0100	commit: Add cooldown between powers
92f509d8af69a0663f6053a2b85f0a96785861c3 752b3ee900e42a9a512d0a7019f150855839a777 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485099416 +0100	commit: Remove victory music
752b3ee900e42a9a512d0a7019f150855839a777 4bd149af95389bd56531fcd921788da068b89b70 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485099456 +0100	pull origin: Merge made by the 'recursive' strategy.
4bd149af95389bd56531fcd921788da068b89b70 eea0d6c35574190ac350ef7da53f28c5f8d42763 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485099487 +0100	checkout: moving from develop to master
eea0d6c35574190ac350ef7da53f28c5f8d42763 4bd149af95389bd56531fcd921788da068b89b70 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485099496 +0100	merge develop: Fast-forward
4bd149af95389bd56531fcd921788da068b89b70 e15eb08b13c7acf045f57735381ca5a9f0fb5d6f Pascal Le Merrer <pascal.lemerrer@orange.com> 1485099624 +0100	commit: remove unused images
