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 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 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 6f79f7e07a88162d41a40477f57e29eadb6d9396 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485025142 +0100	rebase finished: refs/heads/master onto 916bb5724520a63a00def053fff7da8178cf0ab5
6f79f7e07a88162d41a40477f57e29eadb6d9396 0966545d991266d16dea19a402ce1345bda23fc8 Pascal Le Merrer <pascal.lemerrer@orange.com> 1485026453 +0100	commit: Reset paddle position when spawning a ball
0966545d991266d16dea19a402ce1345bda23fc8 2f15935b7e0d500be464be654fb0395345dd5e2c Pascal Le Merrer <pascal.lemerrer@orange.com> 1485026476 +0100	rebase finished: refs/heads/master onto bec59ab06bde9c2edcbd1577a22118488318caf7
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 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 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
