Merge resolution des conflicts
Showing
- README.md 12 additions, 1 deletionREADME.md
- src/.import/fond_rapport.png-29725c4d386bef2d30982ca8b611ac43.md5 3 additions, 0 deletions...ort/fond_rapport.png-29725c4d386bef2d30982ca8b611ac43.md5
- src/.import/fond_rapport.png-29725c4d386bef2d30982ca8b611ac43.stex 0 additions, 0 deletions...rt/fond_rapport.png-29725c4d386bef2d30982ca8b611ac43.stex
- src/menus/fin/Fin.gd 5 additions, 0 deletionssrc/menus/fin/Fin.gd
- src/menus/fin/Fin.tscn 25 additions, 1 deletionsrc/menus/fin/Fin.tscn
- src/menus/principal/Principal.tscn 4 additions, 0 deletionssrc/menus/principal/Principal.tscn
- src/menus/scripts/edit_name.gd 5 additions, 0 deletionssrc/menus/scripts/edit_name.gd
- src/project.godot 4 additions, 0 deletionssrc/project.godot
- src/scenes/scene2/Panel.gd 1 addition, 0 deletionssrc/scenes/scene2/Panel.gd
- src/scenes/scene2/scene2.tscn 35 additions, 39 deletionssrc/scenes/scene2/scene2.tscn
- src/scenes/scene2/textures/fond_rapport.png 0 additions, 0 deletionssrc/scenes/scene2/textures/fond_rapport.png
- src/scenes/scene2/textures/fond_rapport.png.import 34 additions, 0 deletionssrc/scenes/scene2/textures/fond_rapport.png.import
Please register or sign in to comment