Merge branch 'main' of https://git.unistra.fr/T3GoodDoc/t3GoodDoc
Conflicts: .idea/.idea.T 3 Projet/.idea/dataSources.local.xml .idea/.idea.T 3 Projet/.idea/workspace.xml
Showing
- .idea/.idea.T 3 Projet/.idea/dataSources.local.xml 0 additions, 42 deletions.idea/.idea.T 3 Projet/.idea/dataSources.local.xml
- .idea/.idea.T 3 Projet/.idea/workspace.xml 38 additions, 17 deletions.idea/.idea.T 3 Projet/.idea/workspace.xml
- Config/exemple.cfg 22 additions, 0 deletionsConfig/exemple.cfg
- Config/gameconfig.cfg 6 additions, 4 deletionsConfig/gameconfig.cfg
- GameCinematics/PasseButton.cs 4 additions, 0 deletionsGameCinematics/PasseButton.cs
- GameCinematics/Video.cs 5 additions, 0 deletionsGameCinematics/Video.cs
- GamePlay.cs 153 additions, 48 deletionsGamePlay.cs
- GamePlay.tscn 146 additions, 107 deletionsGamePlay.tscn
- PicturesPatients/Default.png 0 additions, 0 deletionsPicturesPatients/Default.png
- PicturesPatients/Default.png.import 3 additions, 3 deletionsPicturesPatients/Default.png.import
- PicturesPatients/personnage1.png 0 additions, 0 deletionsPicturesPatients/personnage1.png
- PicturesPatients/personnage1.png.import 3 additions, 3 deletionsPicturesPatients/personnage1.png.import
- PicturesPatients/personnage1_triste.png 0 additions, 0 deletionsPicturesPatients/personnage1_triste.png
- PicturesPatients/personnage1_triste.png.import 3 additions, 3 deletionsPicturesPatients/personnage1_triste.png.import
- PicturesPatients/personnage2.png 0 additions, 0 deletionsPicturesPatients/personnage2.png
- PicturesPatients/personnage2.png.import 3 additions, 3 deletionsPicturesPatients/personnage2.png.import
- PicturesPatients/personnage3.png 0 additions, 0 deletionsPicturesPatients/personnage3.png
- PicturesPatients/personnage3.png.import 3 additions, 3 deletionsPicturesPatients/personnage3.png.import
- PicturesPatients/personnage4.png 0 additions, 0 deletionsPicturesPatients/personnage4.png
- PicturesPatients/personnage4.png.import 3 additions, 3 deletionsPicturesPatients/personnage4.png.import
Please register or sign in to comment