0000000000000000000000000000000000000000 e29bb1606fe8eb2fb0472226e29552b5849d39c5 Cas Janse <cas.janse97@gmail.com> 1516971237 +0100	clone: from git@gitlab.fdmci.hva.nl:ruiterd1/GlobalGameJam2018.git
e29bb1606fe8eb2fb0472226e29552b5849d39c5 380c4f81fcc4348abeed0552570dfb0c750f5737 Cas Janse <cas.janse97@gmail.com> 1516984123 +0100	pull --no-commit origin master: Fast-forward
380c4f81fcc4348abeed0552570dfb0c750f5737 4ffc732ab168116bc34316bd65e9a78053ffae7b Cas Janse <cas.janse97@gmail.com> 1516996668 +0100	pull --no-commit origin master: Fast-forward
4ffc732ab168116bc34316bd65e9a78053ffae7b 630b08d1f70aea8624d7962d1e270b85fd94019b Cas Janse <cas.janse97@gmail.com> 1516997459 +0100	pull --no-commit origin master: Fast-forward
630b08d1f70aea8624d7962d1e270b85fd94019b 630b08d1f70aea8624d7962d1e270b85fd94019b Cas Janse <cas.janse97@gmail.com> 1516997592 +0100	checkout: moving from master to Growth
630b08d1f70aea8624d7962d1e270b85fd94019b d7f0b585f820fc3d693bb4a58b5204c1f8a108f7 Cas Janse <cas.janse97@gmail.com> 1516998547 +0100	commit: Added: Growth script that enlarges the object by a certain amount.
d7f0b585f820fc3d693bb4a58b5204c1f8a108f7 630b08d1f70aea8624d7962d1e270b85fd94019b Cas Janse <cas.janse97@gmail.com> 1516998902 +0100	checkout: moving from Growth to master
630b08d1f70aea8624d7962d1e270b85fd94019b 439449e77026b4fe95a4d9ca61bedc0ce9cd4047 Cas Janse <cas.janse97@gmail.com> 1516999381 +0100	merge Growth: Merge made by the 'recursive' strategy.
439449e77026b4fe95a4d9ca61bedc0ce9cd4047 439449e77026b4fe95a4d9ca61bedc0ce9cd4047 Cas Janse <cas.janse97@gmail.com> 1516999461 +0100	checkout: moving from master to Teams
439449e77026b4fe95a4d9ca61bedc0ce9cd4047 2766966d66717001d55f1625e68768fea9b4185e Cas Janse <cas.janse97@gmail.com> 1517000892 +0100	commit: Added: Team script that is used to set the team an object belongs to.
2766966d66717001d55f1625e68768fea9b4185e 439449e77026b4fe95a4d9ca61bedc0ce9cd4047 Cas Janse <cas.janse97@gmail.com> 1517000904 +0100	checkout: moving from Teams to master
439449e77026b4fe95a4d9ca61bedc0ce9cd4047 924dda47315a69bff30eb80a60b6c705e61ff163 Cas Janse <cas.janse97@gmail.com> 1517000920 +0100	merge Teams: Merge made by the 'recursive' strategy.
924dda47315a69bff30eb80a60b6c705e61ff163 610f325d8b015b5839304bd0ee4b72a1d622ac73 Cas Janse <cas.janse97@gmail.com> 1517002474 +0100	pull --no-commit origin master: Fast-forward
610f325d8b015b5839304bd0ee4b72a1d622ac73 610f325d8b015b5839304bd0ee4b72a1d622ac73 Cas Janse <cas.janse97@gmail.com> 1517002820 +0100	checkout: moving from master to Boundary_Scripts
610f325d8b015b5839304bd0ee4b72a1d622ac73 44c74559f012159fc627b9f2a08fdb6f41e23deb Cas Janse <cas.janse97@gmail.com> 1517004715 +0100	commit: Added: Boundary script that holds objects within the screen limits
44c74559f012159fc627b9f2a08fdb6f41e23deb 610f325d8b015b5839304bd0ee4b72a1d622ac73 Cas Janse <cas.janse97@gmail.com> 1517005587 +0100	checkout: moving from Boundary_Scripts to master
610f325d8b015b5839304bd0ee4b72a1d622ac73 23b8affde54d93860620682db9346abf8b9bbbb8 Cas Janse <cas.janse97@gmail.com> 1517005594 +0100	pull --no-commit origin master: Fast-forward
23b8affde54d93860620682db9346abf8b9bbbb8 44c74559f012159fc627b9f2a08fdb6f41e23deb Cas Janse <cas.janse97@gmail.com> 1517005731 +0100	checkout: moving from master to Boundary_Scripts
44c74559f012159fc627b9f2a08fdb6f41e23deb e357f1e26c46851bb9d9a972d7d815ac9d23a31c Cas Janse <cas.janse97@gmail.com> 1517007680 +0100	commit: Added: OutOfBounds script that destroys an object when it leaves the screen.
e357f1e26c46851bb9d9a972d7d815ac9d23a31c 23b8affde54d93860620682db9346abf8b9bbbb8 Cas Janse <cas.janse97@gmail.com> 1517007887 +0100	checkout: moving from Boundary_Scripts to master
23b8affde54d93860620682db9346abf8b9bbbb8 518b689369b91d7d62e24a6ad11504d9a2b89d99 Cas Janse <cas.janse97@gmail.com> 1517007950 +0100	commit (merge): Merge branch 'Boundary_Scripts'
518b689369b91d7d62e24a6ad11504d9a2b89d99 518b689369b91d7d62e24a6ad11504d9a2b89d99 Cas Janse <cas.janse97@gmail.com> 1517008479 +0100	checkout: moving from master to Scrolling_Background
518b689369b91d7d62e24a6ad11504d9a2b89d99 afb344f0447d68ae3690c57ec0816100fb049383 Cas Janse <cas.janse97@gmail.com> 1517011805 +0100	commit: Added: Background now moves to the left of the screen and keeps looping.
afb344f0447d68ae3690c57ec0816100fb049383 518b689369b91d7d62e24a6ad11504d9a2b89d99 Cas Janse <cas.janse97@gmail.com> 1517011815 +0100	checkout: moving from Scrolling_Background to master
518b689369b91d7d62e24a6ad11504d9a2b89d99 d638a842d84d00e322654b0ac0e5bf460705952f Cas Janse <cas.janse97@gmail.com> 1517011826 +0100	pull --no-commit origin master: Fast-forward
d638a842d84d00e322654b0ac0e5bf460705952f 0c87aad8e4d40369eb6ce28fea52f6aa789aec1d Cas Janse <cas.janse97@gmail.com> 1517011866 +0100	commit (merge): Merge branch 'Scrolling_Background'
0c87aad8e4d40369eb6ce28fea52f6aa789aec1d a33a157504d934f13820803195bb8b76fbaea6c5 Cas Janse <cas.janse97@gmail.com> 1517012744 +0100	pull --no-commit origin master: Fast-forward
a33a157504d934f13820803195bb8b76fbaea6c5 c11be7101fb6351fbcedc8edabe9544caa1e68d8 Cas Janse <cas.janse97@gmail.com> 1517015744 +0100	pull --no-commit origin master: Fast-forward
c11be7101fb6351fbcedc8edabe9544caa1e68d8 fb346a0498904d452a1ecc956bb6f1e573b7234a Cas Janse <cas.janse97@gmail.com> 1517017958 +0100	pull --no-commit origin master: Fast-forward
fb346a0498904d452a1ecc956bb6f1e573b7234a fb346a0498904d452a1ecc956bb6f1e573b7234a Cas Janse <cas.janse97@gmail.com> 1517018021 +0100	checkout: moving from master to Demo_Scene
fb346a0498904d452a1ecc956bb6f1e573b7234a e6a448de22c15ee1276989a89891a5acea9f318a Cas Janse <cas.janse97@gmail.com> 1517020829 +0100	commit: Added: Demo stage with looping background and throwable pizza
e6a448de22c15ee1276989a89891a5acea9f318a ec2ed393e809770b612826f06613326bbabfcfdc Cas Janse <cas.janse97@gmail.com> 1517020874 +0100	merge origin/master: Merge made by the 'recursive' strategy.
ec2ed393e809770b612826f06613326bbabfcfdc 00a26798a087f80dde11863a2c22558c1e2a018b Cas Janse <cas.janse97@gmail.com> 1517021770 +0100	commit: Added: New pizza sprite now works in demo scene and the pizza properly scales and (almost) properly spins.
00a26798a087f80dde11863a2c22558c1e2a018b fb346a0498904d452a1ecc956bb6f1e573b7234a Cas Janse <cas.janse97@gmail.com> 1517021776 +0100	checkout: moving from Demo_Scene to master
fb346a0498904d452a1ecc956bb6f1e573b7234a e4a18ea183298cf381c1ba5134501af70bbebab4 Cas Janse <cas.janse97@gmail.com> 1517021780 +0100	pull --no-commit origin master: Fast-forward
e4a18ea183298cf381c1ba5134501af70bbebab4 cf3f6d6eb6f2f7b98715b44d6532fdf36ed50db0 Cas Janse <cas.janse97@gmail.com> 1517021801 +0100	merge Demo_Scene: Merge made by the 'recursive' strategy.
cf3f6d6eb6f2f7b98715b44d6532fdf36ed50db0 1e52a8dda0d03d89fab6018a8b9f0115adae0518 Cas Janse <cas.janse97@gmail.com> 1517037982 +0100	pull --no-commit origin master: Fast-forward
1e52a8dda0d03d89fab6018a8b9f0115adae0518 1e52a8dda0d03d89fab6018a8b9f0115adae0518 Cas Janse <cas.janse97@gmail.com> 1517041709 +0100	checkout: moving from master to Pizza_Opbouwen
1e52a8dda0d03d89fab6018a8b9f0115adae0518 9dcd26cb3c8483749a28c35ccd039b20cf7e91d9 Cas Janse <cas.janse97@gmail.com> 1517048895 +0100	commit: Added: Pizza can now gather ingredients that have the Ingredient script tag and script on them.
9dcd26cb3c8483749a28c35ccd039b20cf7e91d9 1e52a8dda0d03d89fab6018a8b9f0115adae0518 Cas Janse <cas.janse97@gmail.com> 1517048902 +0100	checkout: moving from Pizza_Opbouwen to master
1e52a8dda0d03d89fab6018a8b9f0115adae0518 86303454b7263938317a4c716fc5a8e7502b62b2 Cas Janse <cas.janse97@gmail.com> 1517048919 +0100	pull --no-commit origin master: Fast-forward
86303454b7263938317a4c716fc5a8e7502b62b2 2ffd48ce4c0dbefd34164290fce78b754eb120be Cas Janse <cas.janse97@gmail.com> 1517049022 +0100	commit (merge): Merge branch 'Pizza_Opbouwen'
2ffd48ce4c0dbefd34164290fce78b754eb120be a05964c2747ed8a50d3f9c2fe92950939af37702 Cas Janse <cas.janse97@gmail.com> 1517049136 +0100	commit: Script merge bugfixing
a05964c2747ed8a50d3f9c2fe92950939af37702 f18c8e7987f3a6d4bd5d8f24fdc4c23ffa8ef2a2 Cas Janse <cas.janse97@gmail.com> 1517049332 +0100	pull --no-commit origin master: Fast-forward
f18c8e7987f3a6d4bd5d8f24fdc4c23ffa8ef2a2 f18c8e7987f3a6d4bd5d8f24fdc4c23ffa8ef2a2 Cas Janse <cas.janse97@gmail.com> 1517049485 +0100	checkout: moving from master to Pizza_Inleveren
f18c8e7987f3a6d4bd5d8f24fdc4c23ffa8ef2a2 f18c8e7987f3a6d4bd5d8f24fdc4c23ffa8ef2a2 Cas Janse <cas.janse97@gmail.com> 1517053019 +0100	checkout: moving from Pizza_Inleveren to master
f18c8e7987f3a6d4bd5d8f24fdc4c23ffa8ef2a2 7f3123a99f7737420ae82e72b163d96e3f2d2881 Cas Janse <cas.janse97@gmail.com> 1517053076 +0100	pull --no-commit origin master: Fast-forward
7f3123a99f7737420ae82e72b163d96e3f2d2881 f18c8e7987f3a6d4bd5d8f24fdc4c23ffa8ef2a2 Cas Janse <cas.janse97@gmail.com> 1517053108 +0100	checkout: moving from master to Pizza_Inleveren
f18c8e7987f3a6d4bd5d8f24fdc4c23ffa8ef2a2 3e8af834304cf75018872a35b8899d7f42af2d2a Cas Janse <cas.janse97@gmail.com> 1517053119 +0100	merge master: Merge made by the 'recursive' strategy.
3e8af834304cf75018872a35b8899d7f42af2d2a 71e2d244c7fb10abcea865bab392b5cba1167c81 Cas Janse <cas.janse97@gmail.com> 1517057425 +0100	commit: Nood commit die goed werkt
71e2d244c7fb10abcea865bab392b5cba1167c81 7f3123a99f7737420ae82e72b163d96e3f2d2881 Cas Janse <cas.janse97@gmail.com> 1517057428 +0100	checkout: moving from Pizza_Inleveren to master
7f3123a99f7737420ae82e72b163d96e3f2d2881 ecea71b3e22fd05a16c0a72e7163819063cfdfc7 Cas Janse <cas.janse97@gmail.com> 1517057437 +0100	pull --no-commit origin master: Fast-forward
ecea71b3e22fd05a16c0a72e7163819063cfdfc7 a18b305d9d6da6a3d6f813208e9184e91d84f161 Cas Janse <cas.janse97@gmail.com> 1517057574 +0100	merge Pizza_Inleveren: Merge made by the 'recursive' strategy.
a18b305d9d6da6a3d6f813208e9184e91d84f161 e310672d952451189b196c5599919c9e334c8673 Cas Janse <cas.janse97@gmail.com> 1517058291 +0100	commit: Fixed: Pizza now hangs in the direction of where it's going to be thrown
e310672d952451189b196c5599919c9e334c8673 e310672d952451189b196c5599919c9e334c8673 Cas Janse <cas.janse97@gmail.com> 1517058407 +0100	checkout: moving from master to Pizza_Inleveren_Tweede_Poging
e310672d952451189b196c5599919c9e334c8673 f1bdf95cffd1e3b75c65b3be43d97c5b79ff79df Cas Janse <cas.janse97@gmail.com> 1517065459 +0100	commit: Fixed: Pizza now spins properly, Pizza now falls on the floor and moves backward properly, Pizza doesn't grow when laying still on the ground anymore.
f1bdf95cffd1e3b75c65b3be43d97c5b79ff79df e310672d952451189b196c5599919c9e334c8673 Cas Janse <cas.janse97@gmail.com> 1517065462 +0100	checkout: moving from Pizza_Inleveren_Tweede_Poging to master
e310672d952451189b196c5599919c9e334c8673 4b95dbee95bd8ea6050b19bf08daee9e3298fb01 Cas Janse <cas.janse97@gmail.com> 1517065468 +0100	pull --no-commit origin master: Fast-forward
4b95dbee95bd8ea6050b19bf08daee9e3298fb01 35972993518bacd27f621b4a6fe3ec49ff552241 Cas Janse <cas.janse97@gmail.com> 1517065481 +0100	merge Pizza_Inleveren_Tweede_Poging: Merge made by the 'recursive' strategy.
35972993518bacd27f621b4a6fe3ec49ff552241 35972993518bacd27f621b4a6fe3ec49ff552241 Cas Janse <cas.janse97@gmail.com> 1517065697 +0100	checkout: moving from master to Foute_Pizza_Audio
35972993518bacd27f621b4a6fe3ec49ff552241 91384f1d4beeb47d3c34e15dede313837da5aaf6 Cas Janse <cas.janse97@gmail.com> 1517078502 +0100	commit: Added: Scripts to get and count the ingredients from the pizza's.
91384f1d4beeb47d3c34e15dede313837da5aaf6 35972993518bacd27f621b4a6fe3ec49ff552241 Cas Janse <cas.janse97@gmail.com> 1517078512 +0100	checkout: moving from Foute_Pizza_Audio to master
35972993518bacd27f621b4a6fe3ec49ff552241 8bd00f541c10c347aaa3c759c10e8e815662a06d Cas Janse <cas.janse97@gmail.com> 1517078539 +0100	pull --no-commit origin master: Fast-forward
8bd00f541c10c347aaa3c759c10e8e815662a06d d9817b8d4b11ad7dab14e0cf42b7179cc7c75b65 Cas Janse <cas.janse97@gmail.com> 1517078633 +0100	pull --no-commit origin master: Fast-forward
d9817b8d4b11ad7dab14e0cf42b7179cc7c75b65 48027019ae3f35f960b0805ba105b56b83e4ce8b Cas Janse <cas.janse97@gmail.com> 1517078790 +0100	commit (merge): Merge branch 'Foute_Pizza_Audio'
48027019ae3f35f960b0805ba105b56b83e4ce8b 48027019ae3f35f960b0805ba105b56b83e4ce8b Cas Janse <cas.janse97@gmail.com> 1517080404 +0100	checkout: moving from master to Foute_Pizza_Audio_V2
48027019ae3f35f960b0805ba105b56b83e4ce8b 48027019ae3f35f960b0805ba105b56b83e4ce8b Cas Janse <cas.janse97@gmail.com> 1517083665 +0100	checkout: moving from Foute_Pizza_Audio_V2 to master
48027019ae3f35f960b0805ba105b56b83e4ce8b f4ee919e20dd168c2dcc0cca6a10b0a1dab70c57 Cas Janse <cas.janse97@gmail.com> 1517083739 +0100	pull --no-commit origin master: Fast-forward
f4ee919e20dd168c2dcc0cca6a10b0a1dab70c57 f4ee919e20dd168c2dcc0cca6a10b0a1dab70c57 Cas Janse <cas.janse97@gmail.com> 1517083945 +0100	reset: moving to HEAD
f4ee919e20dd168c2dcc0cca6a10b0a1dab70c57 65c505897dd24fc5e455133405d3f16178a27a28 Cas Janse <cas.janse97@gmail.com> 1517083945 +0100	checkout: moving from master to 65c505897dd24fc5e455133405d3f16178a27a28
65c505897dd24fc5e455133405d3f16178a27a28 8ad7c6eeb9025727b93c8312ef7bcc40e6832433 Cas Janse <cas.janse97@gmail.com> 1517084221 +0100	checkout: moving from 65c505897dd24fc5e455133405d3f16178a27a28 to 8ad7c6eeb9025727b93c8312ef7bcc40e6832433
8ad7c6eeb9025727b93c8312ef7bcc40e6832433 1b36c78747227a580c91c15189dfb4de506733e4 Cas Janse <cas.janse97@gmail.com> 1517084321 +0100	checkout: moving from 8ad7c6eeb9025727b93c8312ef7bcc40e6832433 to 1b36c78747227a580c91c15189dfb4de506733e4
1b36c78747227a580c91c15189dfb4de506733e4 f4ee919e20dd168c2dcc0cca6a10b0a1dab70c57 Cas Janse <cas.janse97@gmail.com> 1517084393 +0100	checkout: moving from 1b36c78747227a580c91c15189dfb4de506733e4 to master
f4ee919e20dd168c2dcc0cca6a10b0a1dab70c57 c44140e72a1070f07747ee5c9f2d94ec83d51beb Cas Janse <cas.janse97@gmail.com> 1517085763 +0100	checkout: moving from master to Merge_Fix
c44140e72a1070f07747ee5c9f2d94ec83d51beb e4587b8d374f80a41d76fe57df43ca591da9ff0b Cas Janse <cas.janse97@gmail.com> 1517086528 +0100	commit: THA WEA
e4587b8d374f80a41d76fe57df43ca591da9ff0b de208f250e6e14772728a9386fc194afa9990079 Cas Janse <cas.janse97@gmail.com> 1517095165 +0100	pull --no-commit origin Merge_Fix: Fast-forward
de208f250e6e14772728a9386fc194afa9990079 de208f250e6e14772728a9386fc194afa9990079 Cas Janse <cas.janse97@gmail.com> 1517095181 +0100	checkout: moving from Merge_Fix to Pizza_Inleveren_V2
de208f250e6e14772728a9386fc194afa9990079 767cb1e0efc286072f609a9cbb36d5bb50fb3f60 Cas Janse <cas.janse97@gmail.com> 1517095297 +0100	commit: Added: Pizza's can now be returned to the oven properly.
767cb1e0efc286072f609a9cbb36d5bb50fb3f60 de208f250e6e14772728a9386fc194afa9990079 Cas Janse <cas.janse97@gmail.com> 1517095303 +0100	checkout: moving from Pizza_Inleveren_V2 to Merge_Fix
de208f250e6e14772728a9386fc194afa9990079 c45636b9cd7ace3e15ee4ca18a3ba2110ec4c1ff Cas Janse <cas.janse97@gmail.com> 1517095310 +0100	merge Pizza_Inleveren_V2: Merge made by the 'recursive' strategy.
c45636b9cd7ace3e15ee4ca18a3ba2110ec4c1ff c45636b9cd7ace3e15ee4ca18a3ba2110ec4c1ff Cas Janse <cas.janse97@gmail.com> 1517095465 +0100	checkout: moving from Merge_Fix to Pizza_Collision_Toppings
c45636b9cd7ace3e15ee4ca18a3ba2110ec4c1ff cd102bc17c0604cc10380784097a917e9d8e33b4 Cas Janse <cas.janse97@gmail.com> 1517098105 +0100	commit: Added: Toppings can now be picked up by the pizza and get put in a list of entries.
cd102bc17c0604cc10380784097a917e9d8e33b4 c45636b9cd7ace3e15ee4ca18a3ba2110ec4c1ff Cas Janse <cas.janse97@gmail.com> 1517098108 +0100	checkout: moving from Pizza_Collision_Toppings to Merge_Fix
c45636b9cd7ace3e15ee4ca18a3ba2110ec4c1ff 2a2c979a229040d89aa56fbb258a13180740835b Cas Janse <cas.janse97@gmail.com> 1517098116 +0100	pull --no-commit origin Merge_Fix: Fast-forward
2a2c979a229040d89aa56fbb258a13180740835b 13c9ad9c711d3b25358a1384d9310eb4ee5ca4ee Cas Janse <cas.janse97@gmail.com> 1517098150 +0100	commit: Whoops
13c9ad9c711d3b25358a1384d9310eb4ee5ca4ee b207e59c1cfbfa72340beb8defb4591880b940f7 Cas Janse <cas.janse97@gmail.com> 1517098220 +0100	commit (merge): Merge branch 'Pizza_Collision_Toppings' into Merge_Fix
b207e59c1cfbfa72340beb8defb4591880b940f7 7f9b3e805128f74203152c6d1881a876100dc4a4 Cas Janse <cas.janse97@gmail.com> 1517102856 +0100	commit: Minor bugfixing
7f9b3e805128f74203152c6d1881a876100dc4a4 160cb747795da275662aacb8c3e27845168d69f4 Cas Janse <cas.janse97@gmail.com> 1517102882 +0100	commit (merge): Merge branch 'Merge_Fix' of gitlab.fdmci.hva.nl:ruiterd1/GlobalGameJam2018 into Merge_Fix
160cb747795da275662aacb8c3e27845168d69f4 d19508139264e5e93a6186d62ad22130e2449353 Cas Janse <cas.janse97@gmail.com> 1517104455 +0100	commit: Fixed: Layers
d19508139264e5e93a6186d62ad22130e2449353 ee948162f4ab8f65dc4b7e7917c03fb99e1a2836 Cas Janse <cas.janse97@gmail.com> 1517105594 +0100	pull --no-commit origin Merge_Fix: Fast-forward
ee948162f4ab8f65dc4b7e7917c03fb99e1a2836 f5429be68bd876667afdf81eb15ba8c777359580 Cas Janse <cas.janse97@gmail.com> 1517106242 +0100	pull --no-commit origin Merge_Fix: Fast-forward
f5429be68bd876667afdf81eb15ba8c777359580 f5429be68bd876667afdf81eb15ba8c777359580 Cas Janse <cas.janse97@gmail.com> 1517106392 +0100	checkout: moving from Merge_Fix to Pizza_Ingredient_Interaction
f5429be68bd876667afdf81eb15ba8c777359580 14881ddc3ef2327569e9ee464ff7a99e140264d4 Cas Janse <cas.janse97@gmail.com> 1517109758 +0100	commit: Fucking fixed the pizza hitbox thingy
14881ddc3ef2327569e9ee464ff7a99e140264d4 828dc24bb1865c38eca62d17a5d7ee03821de23d Cas Janse <cas.janse97@gmail.com> 1517110966 +0100	commit: Soort van werken
828dc24bb1865c38eca62d17a5d7ee03821de23d f5429be68bd876667afdf81eb15ba8c777359580 Cas Janse <cas.janse97@gmail.com> 1517110972 +0100	checkout: moving from Pizza_Ingredient_Interaction to Merge_Fix
f5429be68bd876667afdf81eb15ba8c777359580 f7aa70d2c957c3b4242365164ae6c6e1ec550815 Cas Janse <cas.janse97@gmail.com> 1517110983 +0100	pull --no-commit origin Merge_Fix: Fast-forward
f7aa70d2c957c3b4242365164ae6c6e1ec550815 effc415f986b76aa3054bf925773378363f1a7c8 Cas Janse <cas.janse97@gmail.com> 1517111069 +0100	commit (merge): Merge branch 'Pizza_Ingredient_Interaction' into Merge_Fix
effc415f986b76aa3054bf925773378363f1a7c8 1c732a7be8b191fb17030c01cf4b6e8b4d65952b Cas Janse <cas.janse97@gmail.com> 1517111418 +0100	pull --no-commit origin Merge_Fix: Fast-forward
1c732a7be8b191fb17030c01cf4b6e8b4d65952b 0d337105676c6410522e193f4273686e51d877c7 Cas Janse <cas.janse97@gmail.com> 1517111803 +0100	pull --no-commit origin Merge_Fix: Fast-forward
0d337105676c6410522e193f4273686e51d877c7 77b59d480c50b34a56833086b17e2c5b4fd33b92 Cas Janse <cas.janse97@gmail.com> 1517113142 +0100	commit: pizza pakt nu ingredienten op en bewaart ze op de pizza.
77b59d480c50b34a56833086b17e2c5b4fd33b92 9056dba7df48c36e7ad976091c7b0e4c84111a88 Cas Janse <cas.janse97@gmail.com> 1517123819 +0100	pull --no-commit origin Merge_Fix: Fast-forward
9056dba7df48c36e7ad976091c7b0e4c84111a88 99cbe8d5a12d682fc6f49e98278adc492dede758 Cas Janse <cas.janse97@gmail.com> 1517129284 +0100	pull --no-commit origin Merge_Fix: Fast-forward
99cbe8d5a12d682fc6f49e98278adc492dede758 99cbe8d5a12d682fc6f49e98278adc492dede758 Cas Janse <cas.janse97@gmail.com> 1517129340 +0100	checkout: moving from Merge_Fix to Pizza_Information_GameManager
99cbe8d5a12d682fc6f49e98278adc492dede758 b3987a2efdb064e821c3cf2a199729396f0e6ab1 Cas Janse <cas.janse97@gmail.com> 1517133239 +0100	commit: Fixed: Teamnames and contents of pizza's are now properly given to the GameManager to be used in the end screen.
b3987a2efdb064e821c3cf2a199729396f0e6ab1 99cbe8d5a12d682fc6f49e98278adc492dede758 Cas Janse <cas.janse97@gmail.com> 1517133286 +0100	checkout: moving from Pizza_Information_GameManager to Merge_Fix
99cbe8d5a12d682fc6f49e98278adc492dede758 4bbfd512e2cdbfdd48aa965903b6046d75067961 Cas Janse <cas.janse97@gmail.com> 1517133293 +0100	pull --no-commit origin Merge_Fix: Fast-forward
4bbfd512e2cdbfdd48aa965903b6046d75067961 c4d7131ebb7c88d563e2ab05a03bc64a984b180a Cas Janse <cas.janse97@gmail.com> 1517133337 +0100	merge Pizza_Information_GameManager: Merge made by the 'recursive' strategy.
c4d7131ebb7c88d563e2ab05a03bc64a984b180a c4d7131ebb7c88d563e2ab05a03bc64a984b180a Cas Janse <cas.janse97@gmail.com> 1517133854 +0100	checkout: moving from Merge_Fix to Individual_Pizza_Score
c4d7131ebb7c88d563e2ab05a03bc64a984b180a f6c8927e67286b45a5594bf12f41bcb93b3b9f62 Cas Janse <cas.janse97@gmail.com> 1517134498 +0100	commit: Added: Individual scores for each pizza are kept in a list for later use in the end screen.
f6c8927e67286b45a5594bf12f41bcb93b3b9f62 c4d7131ebb7c88d563e2ab05a03bc64a984b180a Cas Janse <cas.janse97@gmail.com> 1517134503 +0100	checkout: moving from Individual_Pizza_Score to Merge_Fix
c4d7131ebb7c88d563e2ab05a03bc64a984b180a 8c46edbcc1986b6a5bc4612def1142feda6e5006 Cas Janse <cas.janse97@gmail.com> 1517134525 +0100	merge Individual_Pizza_Score: Merge made by the 'recursive' strategy.
8c46edbcc1986b6a5bc4612def1142feda6e5006 0dee415af4ac05c44287158fd8e994c4e1884a53 Cas Janse <cas.janse97@gmail.com> 1517135846 +0100	pull --no-commit origin Merge_Fix: Fast-forward
0dee415af4ac05c44287158fd8e994c4e1884a53 301ad3cd7138bd76f85b7d366dec838082cf80b2 Cas Janse <cas.janse97@gmail.com> 1517137377 +0100	pull --no-commit origin Merge_Fix: Fast-forward
301ad3cd7138bd76f85b7d366dec838082cf80b2 219ce61fa34d69b108329904fb91bf5612c40acb Cas Janse <cas.janse97@gmail.com> 1517137718 +0100	pull --no-commit origin Merge_Fix: Fast-forward
219ce61fa34d69b108329904fb91bf5612c40acb 69abfa1aa593bb147fbb05229abc2384b816fab4 Cas Janse <cas.janse97@gmail.com> 1517140021 +0100	pull --no-commit origin Merge_Fix: Fast-forward
69abfa1aa593bb147fbb05229abc2384b816fab4 69abfa1aa593bb147fbb05229abc2384b816fab4 Cas Janse <cas.janse97@gmail.com> 1517140212 +0100	checkout: moving from Merge_Fix to Points_Fixing
69abfa1aa593bb147fbb05229abc2384b816fab4 69abfa1aa593bb147fbb05229abc2384b816fab4 Cas Janse <cas.janse97@gmail.com> 1517144176 +0100	reset: moving to HEAD
69abfa1aa593bb147fbb05229abc2384b816fab4 69abfa1aa593bb147fbb05229abc2384b816fab4 Cas Janse <cas.janse97@gmail.com> 1517144176 +0100	checkout: moving from Points_Fixing to Merge_Fix
69abfa1aa593bb147fbb05229abc2384b816fab4 951509a72a01041adc9bbcf4bfe3b1e127cef08a Cas Janse <cas.janse97@gmail.com> 1517144200 +0100	pull --no-commit origin Merge_Fix: Fast-forward
951509a72a01041adc9bbcf4bfe3b1e127cef08a db44bc1d08e33635190bc1df6c061a8317c9631f Cas Janse <cas.janse97@gmail.com> 1517145691 +0100	pull --no-commit origin Merge_Fix: Fast-forward
db44bc1d08e33635190bc1df6c061a8317c9631f 90a96cf4141c713e4118acfc48cf36e5f255251d Cas Janse <cas.janse97@gmail.com> 1517146853 +0100	pull --no-commit origin Merge_Fix: Fast-forward
