0000000000000000000000000000000000000000 16823ba15daaf271cc18cf57016e538d68b2c250 Bminervini <baptiste.minervini@outlook.fr> 1548438124 +0100	clone: from git@gitlab.com:fap_guys_studio/ggj2019.git
16823ba15daaf271cc18cf57016e538d68b2c250 e69fe2ef4989d2ec54f74fc2911c6f0c997966b3 Bminervini <baptiste.minervini@outlook.fr> 1548438185 +0100	pull: Fast-forward
e69fe2ef4989d2ec54f74fc2911c6f0c997966b3 828b8035a6f336fdea1a32a584c7b871f999aa9b Bminervini <baptiste.minervini@outlook.fr> 1548494250 +0100	pull: Fast-forward
828b8035a6f336fdea1a32a584c7b871f999aa9b 828b8035a6f336fdea1a32a584c7b871f999aa9b Bminervini <baptiste.minervini@outlook.fr> 1548494710 +0100	checkout: moving from master to 4-events
828b8035a6f336fdea1a32a584c7b871f999aa9b 8a0cfa1ccdb126322f824b2fe0db544c1c394b9e Bminervini <baptiste.minervini@outlook.fr> 1548499725 +0100	commit: event manager and game manager
8a0cfa1ccdb126322f824b2fe0db544c1c394b9e 6afd1fb9f52850edc92a9e87ab336967aa83ef57 Bminervini <baptiste.minervini@outlook.fr> 1548499743 +0100	pull: Merge made by the 'recursive' strategy.
6afd1fb9f52850edc92a9e87ab336967aa83ef57 5378784237a4698e55dd4adb3ba7772da8bcc2ea Bminervini <baptiste.minervini@outlook.fr> 1548501367 +0100	commit: game manager working and event manager fixed
5378784237a4698e55dd4adb3ba7772da8bcc2ea 5b01ba7a078deb2a20a8dd60b6beba2bcbe8ff96 Bminervini <baptiste.minervini@outlook.fr> 1548501382 +0100	pull: Merge made by the 'recursive' strategy.
5b01ba7a078deb2a20a8dd60b6beba2bcbe8ff96 828b8035a6f336fdea1a32a584c7b871f999aa9b Bminervini <baptiste.minervini@outlook.fr> 1548536518 +0100	checkout: moving from 4-events to master
828b8035a6f336fdea1a32a584c7b871f999aa9b dd5f1bc64b3d46375e77d581c8b260e5ed04a72e Bminervini <baptiste.minervini@outlook.fr> 1548536524 +0100	pull: Fast-forward
dd5f1bc64b3d46375e77d581c8b260e5ed04a72e 618ceb9f7018dba971248ba7654b2616e308b8e8 Bminervini <baptiste.minervini@outlook.fr> 1548579294 +0100	pull: Fast-forward
618ceb9f7018dba971248ba7654b2616e308b8e8 618ceb9f7018dba971248ba7654b2616e308b8e8 Bminervini <baptiste.minervini@outlook.fr> 1548579352 +0100	reset: moving to HEAD
618ceb9f7018dba971248ba7654b2616e308b8e8 175277690f9312944fdd2d676450ef14a4ef7884 Bminervini <baptiste.minervini@outlook.fr> 1548579356 +0100	pull: Fast-forward
175277690f9312944fdd2d676450ef14a4ef7884 175277690f9312944fdd2d676450ef14a4ef7884 Bminervini <baptiste.minervini@outlook.fr> 1548580018 +0100	checkout: moving from master to player-turn
175277690f9312944fdd2d676450ef14a4ef7884 f5d8a85d957a9c7fc3d60aaa66e780511c1d804c Bminervini <baptiste.minervini@outlook.fr> 1548583335 +0100	commit: player turn setted up
f5d8a85d957a9c7fc3d60aaa66e780511c1d804c 175277690f9312944fdd2d676450ef14a4ef7884 Bminervini <baptiste.minervini@outlook.fr> 1548583365 +0100	checkout: moving from player-turn to master
175277690f9312944fdd2d676450ef14a4ef7884 cfaaf66b2005babb086aae7be4d7471a3ed7aad2 Bminervini <baptiste.minervini@outlook.fr> 1548583373 +0100	pull: Fast-forward
cfaaf66b2005babb086aae7be4d7471a3ed7aad2 f5d8a85d957a9c7fc3d60aaa66e780511c1d804c Bminervini <baptiste.minervini@outlook.fr> 1548583387 +0100	checkout: moving from master to player-turn
f5d8a85d957a9c7fc3d60aaa66e780511c1d804c aca45e6a57c4ee115e3a446231943ccb846d1d35 Bminervini <baptiste.minervini@outlook.fr> 1548583553 +0100	commit (merge): fusion conflict resolved on game manager
aca45e6a57c4ee115e3a446231943ccb846d1d35 d02ea120837a79a997d949bd631cb8b80184c43b Bminervini <baptiste.minervini@outlook.fr> 1548583917 +0100	commit: gm update
d02ea120837a79a997d949bd631cb8b80184c43b 2b88a30f4dfa226c582958c66d6230cb5b81dc5d Bminervini <baptiste.minervini@outlook.fr> 1548591060 +0100	commit: event as tiles and better display
2b88a30f4dfa226c582958c66d6230cb5b81dc5d cfaaf66b2005babb086aae7be4d7471a3ed7aad2 Bminervini <baptiste.minervini@outlook.fr> 1548591075 +0100	checkout: moving from player-turn to master
cfaaf66b2005babb086aae7be4d7471a3ed7aad2 2b88a30f4dfa226c582958c66d6230cb5b81dc5d Bminervini <baptiste.minervini@outlook.fr> 1548591081 +0100	merge player-turn: Fast-forward
2b88a30f4dfa226c582958c66d6230cb5b81dc5d dda52d43504cb5badbec001a939cd0e82f103663 Bminervini <baptiste.minervini@outlook.fr> 1548593267 +0100	commit (merge): merge fusion with palyer-turn
dda52d43504cb5badbec001a939cd0e82f103663 99fa5c15b8c5223b99d01082d8b7be87e760b564 Bminervini <baptiste.minervini@outlook.fr> 1548594147 +0100	commit (merge): OUYIGHGISGKFHJHSJFKPJSGFHQKLJFNJ : merge (bordel de cul)
99fa5c15b8c5223b99d01082d8b7be87e760b564 5b01ba7a078deb2a20a8dd60b6beba2bcbe8ff96 Bminervini <baptiste.minervini@outlook.fr> 1548594171 +0100	checkout: moving from master to 4-events
5b01ba7a078deb2a20a8dd60b6beba2bcbe8ff96 d772ed986b4fc9d4e45c26e9df9a6132dc29db95 Bminervini <baptiste.minervini@outlook.fr> 1548594175 +0100	pull: Fast-forward
d772ed986b4fc9d4e45c26e9df9a6132dc29db95 99fa5c15b8c5223b99d01082d8b7be87e760b564 Bminervini <baptiste.minervini@outlook.fr> 1548594256 +0100	checkout: moving from 4-events to master
99fa5c15b8c5223b99d01082d8b7be87e760b564 a8cf3f9f05873291781f76691eae1a2730142daa Bminervini <baptiste.minervini@outlook.fr> 1548594273 +0100	merge 4-events: Merge made by the 'recursive' strategy.
a8cf3f9f05873291781f76691eae1a2730142daa c6919b403a0c08803857558b75c9645b0b855a2a Bminervini <baptiste.minervini@outlook.fr> 1548594779 +0100	commit: tiled reset
c6919b403a0c08803857558b75c9645b0b855a2a ab28703b6fadd7ca8002e563c7052e91ab0fd854 Bminervini <baptiste.minervini@outlook.fr> 1548595305 +0100	pull: Fast-forward
ab28703b6fadd7ca8002e563c7052e91ab0fd854 62141ddb56559150adbebbb068eef4c9ac54fae3 Bminervini <baptiste.minervini@outlook.fr> 1548595949 +0100	pull: Fast-forward
62141ddb56559150adbebbb068eef4c9ac54fae3 467bed0c7546ef2095c52034dfc2b7a77904564a Bminervini <baptiste.minervini@outlook.fr> 1548596296 +0100	commit: better hud bg ichwkjhglfsvkjbhljfb
467bed0c7546ef2095c52034dfc2b7a77904564a 08ea3677113f542bcd20f85a9d4f4ce93d2b8910 Bminervini <baptiste.minervini@outlook.fr> 1548596301 +0100	pull: Merge made by the 'recursive' strategy.
08ea3677113f542bcd20f85a9d4f4ce93d2b8910 8c8bd167968e9f53e4510697d51256cfc2d93a66 Bminervini <baptiste.minervini@outlook.fr> 1548598021 +0100	commit: iutooituh rthiurho uthg
8c8bd167968e9f53e4510697d51256cfc2d93a66 1b5ddff69ee32d86b7688c4467b6ecac1a44c7ab Bminervini <baptiste.minervini@outlook.fr> 1548598131 +0100	commit (merge): GNÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉÉ
1b5ddff69ee32d86b7688c4467b6ecac1a44c7ab 6868156ac99cfa9ea7dd369a719aba3146deb883 Bminervini <baptiste.minervini@outlook.fr> 1548599806 +0100	pull: Fast-forward
6868156ac99cfa9ea7dd369a719aba3146deb883 e976c31e79dfd27ee3f91abfc3fd55266994ecd6 Bminervini <baptiste.minervini@outlook.fr> 1548600335 +0100	commit: music
e976c31e79dfd27ee3f91abfc3fd55266994ecd6 785d5307ae896ec29d28150bf4da47679c311583 Bminervini <baptiste.minervini@outlook.fr> 1548600391 +0100	checkout: moving from master to 2-menu
785d5307ae896ec29d28150bf4da47679c311583 e976c31e79dfd27ee3f91abfc3fd55266994ecd6 Bminervini <baptiste.minervini@outlook.fr> 1548600464 +0100	checkout: moving from 2-menu to master
e976c31e79dfd27ee3f91abfc3fd55266994ecd6 416acbc63eab089e4215264c561868baf0bfc62e Bminervini <baptiste.minervini@outlook.fr> 1548600614 +0100	commit (merge): merge
