Jolys Enzo
|
8f9654fcc2
|
Merge remote-tracking branch 'origin/Enzo' into Enzo
# Conflicts:
# Tetris/app/build.gradle
# Tetris/app/src/main/AndroidManifest.xml
# Tetris/app/src/main/java/activity/Game.kt
# Tetris/app/src/main/java/modele/Draw.kt
# Tetris/app/src/main/res/layout/activity_game.xml
# Tetris/build.gradle
|
2 years ago |
|
Jolys Enzo
|
cbbd4094d8
|
Ajout d'un canva avec un paint ( faut ajouter de bitmap pour crée les pieces
|
2 years ago |
|
Jolys Enzo
|
c9919afa5c
|
création des activity menu, game et des layouts
|
2 years ago |
|
Jolys Enzo
|
777a426b1a
|
activity option
|
2 years ago |
 Enzo JOLYS
|
de8272a66f
|
Transférer les fichiers vers ''
|
2 years ago |
 Alexis CARREAU
|
cac68fc160
|
Merge pull request 'Alexis' (#2) from Alexis into master
Reviewed-on: #2
|
2 years ago |
|
Alexis1663
|
1dcc88316d
|
correction bug bouton start + ajout des ressources drawalable + debut du dev de la grid du jeu
|
2 years ago |
|
Alexis1663
|
8479d273d4
|
ajout rectange + basculement de vue avec le bouton start
|
2 years ago |
|
Jolys Enzo
|
6b16e19a71
|
création des activity menu, game et des layouts
|
2 years ago |
|
Jolys Enzo
|
c36a6578e9
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
Jolys Enzo
|
1b02d3fadf
|
menu
|
2 years ago |
|
Enzo JOLYS
|
3e542abf7e
|
Mise à jour de 'README.md'
|
2 years ago |
|
Jolys Enzo
|
ffb3ebd77a
|
first
|
2 years ago |
