Commit Graph
19 Commits
Author SHA1 Message Date
tonitch bc2feee03c Merge branch 'master' into Shape_Piece_Map
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2023-03-21 23:07:32 +01:00
tonitch 1ef428962f Merge branch 'master' into Shape_Piece_Map
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2023-03-21 21:28:23 +01:00
tonitch df457b830a Merge branch 'master' into Shape_Piece_Map
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2023-03-21 14:30:53 +01:00
tonitch 1740ad2e13 Merge pull request 'deplacement du fichier texte de l'histoire' (#21) from Story into master
continuous-integration/drone/push Build is passing
Reviewed-on: #21
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
2023-03-17 15:07:48 +01:00
tonitch dfc6056767 Merge pull request 'story' (#20) from undefined_name/School_Project#8 into master
continuous-integration/drone/push Build is passing
Reviewed-on: #20
2023-03-17 14:53:46 +01:00
tonitch 1837d976aa Merge branch 'master' into undefined_name/School_Project#8
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-03-17 13:40:48 +01:00
tonitch aafb5f5c66 Update 'README.md'
continuous-integration/drone/push Build encountered an error
2023-03-04 16:15:42 +01:00
tonitch 2ef6bdb9ed Merge pull request 'pre-commit script for linux' (#17) from pre-commit-linux-script into master
Reviewed-on: #17
2023-03-04 10:50:39 +01:00
tonitch acd786744b Merge pull request 'cleaning up some stuff don't worry' (#16) from test into master
Reviewed-on: #16
2023-03-01 23:58:50 +01:00
tonitch 15fe864d5a Merge pull request 'Adding idea and pref to .gitignore' (#12) from idea_to_gitignore into master
Reviewed-on: #12
2023-02-24 13:59:28 +01:00
tonitch cf83036c99 Merge branch 'master' into idea_to_gitignore 2023-02-24 13:59:12 +01:00
tonitch 93b3a946cb Merge pull request 'ProtoBrad' (#11) from ProtoBrad into master
Reviewed-on: #11
Reviewed-by: Mat_02 <diletomatteo@gmail.com>
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
2023-02-24 13:35:10 +01:00
tonitch 424da00791 Adding meeting to the summary
This is the file for the menu on the right of the screen.

Signed-off-by: Debucquoy Anthony <d.tonitch@gmail.com>
2023-02-21 21:54:37 +01:00
tonitch 55198d04e6 Merge pull request 'gradle_implementation' (#5) from gradle_implementation into master
Reviewed-on: #5
2023-02-20 15:24:28 +01:00
tonitch 0df803c50a Merge branch 'master' into gradle_implementation 2023-02-20 15:22:01 +01:00
tonitch 0159ba196d Merge branch 'master' into prototype_saves 2023-02-20 12:39:14 +01:00
tonitch 49904f8e17 Merge pull request 'Journal de bord pour ce lundi' (#3) from JDB into master
Reviewed-on: #3
Reviewed-by: Mat_02 <diletomatteo@gmail.com>
Reviewed-by: BrokenBrad <eddyjiofak@gmail.com>
2023-02-14 18:31:28 +01:00
tonitch 7af26415f0 chapt2 2023-02-13 15:51:48 +01:00
tonitch a3fcbdee3c Initial commit 2023-02-09 17:08:22 +01:00