0000000000000000000000000000000000000000 db5f5b3c48579faa07329637426dad916b3df78c Argann Bonneau <argann.b@hotmail.fr> 1484947715 +0100	initial pull
db5f5b3c48579faa07329637426dad916b3df78c 6ff62bf229a830a4935423166ce777aa6979d579 Argann Bonneau <argann.b@hotmail.fr> 1484947740 +0100	commit: Création du projet de base
6ff62bf229a830a4935423166ce777aa6979d579 6ff62bf229a830a4935423166ce777aa6979d579 Argann Bonneau <argann.b@hotmail.fr> 1484947753 +0100	checkout: moving from master to dev
6ff62bf229a830a4935423166ce777aa6979d579 6ff62bf229a830a4935423166ce777aa6979d579 Argann Bonneau <argann.b@hotmail.fr> 1484983831 +0100	checkout: moving from dev to feature/effetsTexte
6ff62bf229a830a4935423166ce777aa6979d579 40d0e8682a85d87fbd2a998096b421836fbd68dc Argann Bonneau <argann.b@hotmail.fr> 1484993776 +0100	commit: Ajout de la police, des transitions de texte, ainsi que du background
40d0e8682a85d87fbd2a998096b421836fbd68dc 6ff62bf229a830a4935423166ce777aa6979d579 Argann Bonneau <argann.b@hotmail.fr> 1484994118 +0100	checkout: moving from feature/effetsTexte to dev
6ff62bf229a830a4935423166ce777aa6979d579 e8f8083963338208638e2e3b8bcce4c9a506bd76 Argann Bonneau <argann.b@hotmail.fr> 1484994356 +0100	pull: Fast-forward
e8f8083963338208638e2e3b8bcce4c9a506bd76 e8f8083963338208638e2e3b8bcce4c9a506bd76 Argann Bonneau <argann.b@hotmail.fr> 1484994547 +0100	checkout: moving from dev to feature/transitionNiveaux
e8f8083963338208638e2e3b8bcce4c9a506bd76 a5e254308573643f0bc1f18525ff73ed11b61a53 Argann Bonneau <argann.b@hotmail.fr> 1484998134 +0100	commit: Ajout du système de transition de caméra par waypoints
a5e254308573643f0bc1f18525ff73ed11b61a53 e8f8083963338208638e2e3b8bcce4c9a506bd76 Argann Bonneau <argann.b@hotmail.fr> 1484998155 +0100	checkout: moving from feature/transitionNiveaux to dev
e8f8083963338208638e2e3b8bcce4c9a506bd76 45f5c944e6fdd18e754ba063c2da001e633e459f Argann Bonneau <argann.b@hotmail.fr> 1484998207 +0100	pull: Fast-forward
45f5c944e6fdd18e754ba063c2da001e633e459f 8bac0797fb2514dc80595d53d4415f4bcfcd2ce7 Argann Bonneau <argann.b@hotmail.fr> 1485006321 +0100	pull: Fast-forward
8bac0797fb2514dc80595d53d4415f4bcfcd2ce7 cef9cd11637ecd656b26a38662de01e4bd0e9b87 Argann Bonneau <argann.b@hotmail.fr> 1485013446 +0100	pull: Fast-forward
cef9cd11637ecd656b26a38662de01e4bd0e9b87 cef9cd11637ecd656b26a38662de01e4bd0e9b87 Argann Bonneau <argann.b@hotmail.fr> 1485013489 +0100	checkout: moving from dev to feature/GraphicalImprovement
cef9cd11637ecd656b26a38662de01e4bd0e9b87 b79a6ed04ab10cc30d36cee9a12378f92aeaa679 Argann Bonneau <argann.b@hotmail.fr> 1485019491 +0100	commit: Ajout des sons, Et de la démo de menu principal
b79a6ed04ab10cc30d36cee9a12378f92aeaa679 cef9cd11637ecd656b26a38662de01e4bd0e9b87 Argann Bonneau <argann.b@hotmail.fr> 1485019564 +0100	checkout: moving from feature/GraphicalImprovement to dev
cef9cd11637ecd656b26a38662de01e4bd0e9b87 b79a6ed04ab10cc30d36cee9a12378f92aeaa679 Argann Bonneau <argann.b@hotmail.fr> 1485019572 +0100	merge feature/GraphicalImprovement: Fast-forward
b79a6ed04ab10cc30d36cee9a12378f92aeaa679 b79a6ed04ab10cc30d36cee9a12378f92aeaa679 Argann Bonneau <argann.b@hotmail.fr> 1485025238 +0100	checkout: moving from dev to feature/addHeartSound
b79a6ed04ab10cc30d36cee9a12378f92aeaa679 9ffda4f5ff855cb43f8a1b074f0003f6e6f12fd2 Argann Bonneau <argann.b@hotmail.fr> 1485026700 +0100	commit: Ajout des sons + fin menu principal
9ffda4f5ff855cb43f8a1b074f0003f6e6f12fd2 b79a6ed04ab10cc30d36cee9a12378f92aeaa679 Argann Bonneau <argann.b@hotmail.fr> 1485026868 +0100	checkout: moving from feature/addHeartSound to dev
b79a6ed04ab10cc30d36cee9a12378f92aeaa679 d58f53718b931d2e7c277bdaadd97bbbd4521163 Argann Bonneau <argann.b@hotmail.fr> 1485026872 +0100	pull: Fast-forward
d58f53718b931d2e7c277bdaadd97bbbd4521163 9ffda4f5ff855cb43f8a1b074f0003f6e6f12fd2 Argann Bonneau <argann.b@hotmail.fr> 1485026927 +0100	checkout: moving from dev to feature/addHeartSound
9ffda4f5ff855cb43f8a1b074f0003f6e6f12fd2 3b970015ac0af7ae18825b10ac23486496c98785 Argann Bonneau <argann.b@hotmail.fr> 1485026996 +0100	commit (merge): Resolve merge conflict
3b970015ac0af7ae18825b10ac23486496c98785 d58f53718b931d2e7c277bdaadd97bbbd4521163 Argann Bonneau <argann.b@hotmail.fr> 1485027009 +0100	checkout: moving from feature/addHeartSound to dev
d58f53718b931d2e7c277bdaadd97bbbd4521163 3b970015ac0af7ae18825b10ac23486496c98785 Argann Bonneau <argann.b@hotmail.fr> 1485027015 +0100	merge feature/addHeartSound: Fast-forward
3b970015ac0af7ae18825b10ac23486496c98785 2862e383e169b5f61b34cf1d14976b9fe658588b Argann Bonneau <argann.b@hotmail.fr> 1485027154 +0100	commit: Yolo pateueyey
2862e383e169b5f61b34cf1d14976b9fe658588b 2862e383e169b5f61b34cf1d14976b9fe658588b Argann Bonneau <argann.b@hotmail.fr> 1485027299 +0100	checkout: moving from dev to feature/credits
2862e383e169b5f61b34cf1d14976b9fe658588b 16c03ce84de2f95d449d77b30c43bda5996c90cc Argann Bonneau <argann.b@hotmail.fr> 1485033830 +0100	commit: Fin des scènes début/fin
16c03ce84de2f95d449d77b30c43bda5996c90cc 2862e383e169b5f61b34cf1d14976b9fe658588b Argann Bonneau <argann.b@hotmail.fr> 1485033873 +0100	checkout: moving from feature/credits to dev
2862e383e169b5f61b34cf1d14976b9fe658588b 3a6ef022f33f4b1e14d1e656e19cec11d8a00a0f Argann Bonneau <argann.b@hotmail.fr> 1485033877 +0100	pull: Fast-forward
3a6ef022f33f4b1e14d1e656e19cec11d8a00a0f 16c03ce84de2f95d449d77b30c43bda5996c90cc Argann Bonneau <argann.b@hotmail.fr> 1485033888 +0100	checkout: moving from dev to feature/credits
16c03ce84de2f95d449d77b30c43bda5996c90cc 223da5e775578597a3ebd4f07564bbe08b1f6c00 Argann Bonneau <argann.b@hotmail.fr> 1485033890 +0100	merge dev: Merge made by the 'recursive' strategy.
223da5e775578597a3ebd4f07564bbe08b1f6c00 3a6ef022f33f4b1e14d1e656e19cec11d8a00a0f Argann Bonneau <argann.b@hotmail.fr> 1485033907 +0100	checkout: moving from feature/credits to dev
3a6ef022f33f4b1e14d1e656e19cec11d8a00a0f 223da5e775578597a3ebd4f07564bbe08b1f6c00 Argann Bonneau <argann.b@hotmail.fr> 1485033912 +0100	merge feature/credits: Fast-forward
223da5e775578597a3ebd4f07564bbe08b1f6c00 1c193a83fb93fb90b996f98180614387beeee8e0 Argann Bonneau <argann.b@hotmail.fr> 1485073787 +0100	pull: Fast-forward
1c193a83fb93fb90b996f98180614387beeee8e0 c2579442a7454b4ed65a7a0da7a6b66b7502d74f Argann Bonneau <argann.b@hotmail.fr> 1485077555 +0100	pull: Fast-forward
c2579442a7454b4ed65a7a0da7a6b66b7502d74f c2579442a7454b4ed65a7a0da7a6b66b7502d74f Argann Bonneau <argann.b@hotmail.fr> 1485077704 +0100	checkout: moving from dev to feature/LinkScenes
c2579442a7454b4ed65a7a0da7a6b66b7502d74f ae3976509ee8dca260edf1dac5545d78c359bad0 Argann Bonneau <argann.b@hotmail.fr> 1485079762 +0100	commit: Ajout des transitions entre scènes
ae3976509ee8dca260edf1dac5545d78c359bad0 c2579442a7454b4ed65a7a0da7a6b66b7502d74f Argann Bonneau <argann.b@hotmail.fr> 1485079781 +0100	checkout: moving from feature/LinkScenes to dev
c2579442a7454b4ed65a7a0da7a6b66b7502d74f ae3976509ee8dca260edf1dac5545d78c359bad0 Argann Bonneau <argann.b@hotmail.fr> 1485079793 +0100	checkout: moving from dev to feature/LinkScenes
ae3976509ee8dca260edf1dac5545d78c359bad0 c2579442a7454b4ed65a7a0da7a6b66b7502d74f Argann Bonneau <argann.b@hotmail.fr> 1485079800 +0100	checkout: moving from feature/LinkScenes to dev
c2579442a7454b4ed65a7a0da7a6b66b7502d74f ae3976509ee8dca260edf1dac5545d78c359bad0 Argann Bonneau <argann.b@hotmail.fr> 1485079808 +0100	merge feature/LinkScenes: Fast-forward
ae3976509ee8dca260edf1dac5545d78c359bad0 ae3976509ee8dca260edf1dac5545d78c359bad0 Argann Bonneau <argann.b@hotmail.fr> 1485079872 +0100	checkout: moving from dev to feature/ChangeFont
ae3976509ee8dca260edf1dac5545d78c359bad0 c2dfcaea09d350feefa95d247a76f8c8d195e3a2 Argann Bonneau <argann.b@hotmail.fr> 1485083130 +0100	commit: Ajout beep final levels
c2dfcaea09d350feefa95d247a76f8c8d195e3a2 ae3976509ee8dca260edf1dac5545d78c359bad0 Argann Bonneau <argann.b@hotmail.fr> 1485083149 +0100	checkout: moving from feature/ChangeFont to dev
ae3976509ee8dca260edf1dac5545d78c359bad0 0aa36b186e4ca21b77751d85efcd8110bf21bfdc Argann Bonneau <argann.b@hotmail.fr> 1485083155 +0100	pull: Fast-forward
0aa36b186e4ca21b77751d85efcd8110bf21bfdc c2dfcaea09d350feefa95d247a76f8c8d195e3a2 Argann Bonneau <argann.b@hotmail.fr> 1485083161 +0100	checkout: moving from dev to feature/ChangeFont
c2dfcaea09d350feefa95d247a76f8c8d195e3a2 c5f45410509dc3e3e7947eb33b1544eed58611b3 Argann Bonneau <argann.b@hotmail.fr> 1485083562 +0100	commit (merge): Resolve merge conflict
c5f45410509dc3e3e7947eb33b1544eed58611b3 0aa36b186e4ca21b77751d85efcd8110bf21bfdc Argann Bonneau <argann.b@hotmail.fr> 1485083577 +0100	checkout: moving from feature/ChangeFont to dev
0aa36b186e4ca21b77751d85efcd8110bf21bfdc c5f45410509dc3e3e7947eb33b1544eed58611b3 Argann Bonneau <argann.b@hotmail.fr> 1485083583 +0100	merge feature/ChangeFont: Fast-forward
c5f45410509dc3e3e7947eb33b1544eed58611b3 c5f45410509dc3e3e7947eb33b1544eed58611b3 Argann Bonneau <argann.b@hotmail.fr> 1485083618 +0100	checkout: moving from dev to feature/ChangeFont
c5f45410509dc3e3e7947eb33b1544eed58611b3 d9eb83c39c73eb24828f763b3c6d4ab53cae0a0a Argann Bonneau <argann.b@hotmail.fr> 1485084437 +0100	commit: Change fonts letters
d9eb83c39c73eb24828f763b3c6d4ab53cae0a0a c5f45410509dc3e3e7947eb33b1544eed58611b3 Argann Bonneau <argann.b@hotmail.fr> 1485084462 +0100	checkout: moving from feature/ChangeFont to dev
c5f45410509dc3e3e7947eb33b1544eed58611b3 bed5a8754a8a4f0e6dfcd5e687f56151e1fc0e63 Argann Bonneau <argann.b@hotmail.fr> 1485084466 +0100	pull: Fast-forward
bed5a8754a8a4f0e6dfcd5e687f56151e1fc0e63 d9eb83c39c73eb24828f763b3c6d4ab53cae0a0a Argann Bonneau <argann.b@hotmail.fr> 1485084476 +0100	checkout: moving from dev to feature/ChangeFont
d9eb83c39c73eb24828f763b3c6d4ab53cae0a0a 517b164fb55797ae4a19e490dc1b16e6b26eb6b2 Argann Bonneau <argann.b@hotmail.fr> 1485084477 +0100	merge dev: Merge made by the 'recursive' strategy.
517b164fb55797ae4a19e490dc1b16e6b26eb6b2 bed5a8754a8a4f0e6dfcd5e687f56151e1fc0e63 Argann Bonneau <argann.b@hotmail.fr> 1485084486 +0100	checkout: moving from feature/ChangeFont to dev
bed5a8754a8a4f0e6dfcd5e687f56151e1fc0e63 517b164fb55797ae4a19e490dc1b16e6b26eb6b2 Argann Bonneau <argann.b@hotmail.fr> 1485084491 +0100	merge feature/ChangeFont: Fast-forward
517b164fb55797ae4a19e490dc1b16e6b26eb6b2 517b164fb55797ae4a19e490dc1b16e6b26eb6b2 Argann Bonneau <argann.b@hotmail.fr> 1485084559 +0100	checkout: moving from dev to feature/FinalSoundsMusic
517b164fb55797ae4a19e490dc1b16e6b26eb6b2 1e0ffb1abe06b0382bc45dad1bd7ddca45cd2fbb Argann Bonneau <argann.b@hotmail.fr> 1485084907 +0100	commit: Diminution du volume du beep
1e0ffb1abe06b0382bc45dad1bd7ddca45cd2fbb 517b164fb55797ae4a19e490dc1b16e6b26eb6b2 Argann Bonneau <argann.b@hotmail.fr> 1485084953 +0100	checkout: moving from feature/FinalSoundsMusic to dev
517b164fb55797ae4a19e490dc1b16e6b26eb6b2 1e0ffb1abe06b0382bc45dad1bd7ddca45cd2fbb Argann Bonneau <argann.b@hotmail.fr> 1485084961 +0100	checkout: moving from dev to feature/FinalSoundsMusic
1e0ffb1abe06b0382bc45dad1bd7ddca45cd2fbb 517b164fb55797ae4a19e490dc1b16e6b26eb6b2 Argann Bonneau <argann.b@hotmail.fr> 1485084965 +0100	checkout: moving from feature/FinalSoundsMusic to dev
517b164fb55797ae4a19e490dc1b16e6b26eb6b2 1e0ffb1abe06b0382bc45dad1bd7ddca45cd2fbb Argann Bonneau <argann.b@hotmail.fr> 1485084970 +0100	merge feature/FinalSoundsMusic: Fast-forward
1e0ffb1abe06b0382bc45dad1bd7ddca45cd2fbb f3c01b29060a4af812d826ca5a545162782be8bf Argann Bonneau <argann.b@hotmail.fr> 1485086459 +0100	pull: Fast-forward
