 Nathan VERDIER
|
1b693e584c
|
🔀 merging to get NavigationStack
|
10 months ago |
|
Nathan VERDIER
|
806840e84e
|
🚧 commit before merge
|
10 months ago |
 Rayhân HASSOU
|
4e691bfd5f
|
now historic are sort by date
|
10 months ago |
|
Rayhân HASSOU
|
2f8b6b92b9
|
fix button problem
|
10 months ago |
|
Rayhân HASSOU
|
d3884adda3
|
readd song
|
10 months ago |
|
Rayhân HASSOU
|
2927a0d285
|
solve merge conflict
|
10 months ago |
|
Rayhân HASSOU
|
f5428fdb18
|
Merge branch 'dev_vm_saveHistorique'
Conflicts:
DouShouQi_App/DouShouQi_App/Components/MainMenuButton.swift
DouShouQi_App/DouShouQi_App/Views/Game/GameView.swift
DouShouQi_App/DouShouQi_App/Views/Menu/MainMenuView.swift
DouShouQi_App/DouShouQi_App/Views/Player/SelectPlayerView.swift
|
10 months ago |
|
Rayhân HASSOU
|
86c4c79767
|
timer is save now
|
10 months ago |
 Rémi REGNAULT
|
76cf1d9145
|
✨ Go back on screen menu at the end of the game
|
10 months ago |
|
Rayhân HASSOU
|
a171478e2c
|
historic is well saved
|
10 months ago |
|
Rémi REGNAULT
|
36e5be8c4a
|
Merge branch 'dev_vm' of https://codefirst.iut.uca.fr/git/remi.regnault/DouShouQi_App into dev_vm
|
10 months ago |
|
Rémi REGNAULT
|
315d60bdf9
|
⚰️ removing dead code
|
10 months ago |
|
Rayhân HASSOU
|
dcdc6113d1
|
moove sounds
|
10 months ago |
|
Rayhân HASSOU
|
cf25c7e139
|
add musics
|
10 months ago |
|
Nathan VERDIER
|
631ae89c11
|
Merge branch 'dev_views_Game'
Conflicts:
DouShouQi_App/DouShouQi_App.xcodeproj/project.pbxproj
DouShouQi_App/DouShouQi_App/Views/Game/GameView.swift
DouShouQi_App/DouShouQi_App/Views/Player/SelectPlayerView.swift
|
10 months ago |
|
Nathan VERDIER
|
d4362cdf91
|
✨ Update: SelectPlayerView for create players
|
10 months ago |
|
Nathan VERDIER
|
1e6db55be4
|
✨ Add: EndGame view
|
10 months ago |
|
Nathan VERDIER
|
239782ec60
|
✨ Add: log for endgame
|
10 months ago |
|
Nathan VERDIER
|
7a18273be9
|
✨ Add: listener
|
10 months ago |
|
Nathan VERDIER
|
205c4723e4
|
💄 Add: new colors
|
10 months ago |
reregnault
|
73830f8ab2
|
🚧 resolving conflicts
|
10 months ago |
|
Rayhân HASSOU
|
10ac1a8a25
|
score board is done
|
10 months ago |
|
Rayhân HASSOU
|
d5baa35e50
|
now we can see rank of player
|
10 months ago |
|
reregnault
|
3e85b7d6d0
|
🚧 tp meeple back on invalid move
|
10 months ago |
|
Rayhân HASSOU
|
780488deac
|
change ui/ux select player
|
10 months ago |
|
reregnault
|
df25251a09
|
✨ adding colours of maple for P2
|
10 months ago |
|
Rayhân HASSOU
|
60711f4897
|
Merge branch 'dev_views_Game'
Conflicts:
DouShouQi_App/DouShouQi_App/Views/Player/SelectPlayerView.swift
|
10 months ago |
|
Nathan VERDIER
|
aa4236091f
|
💄 Update: style for button selection joueur
|
10 months ago |
|
Nathan VERDIER
|
3aa50d654b
|
💄 Update: style for button slection perso
|
10 months ago |
|
reregnault
|
1eba7c0638
|
✨ when you are playing a game, the name and last move change every turn
|
10 months ago |
|
Nathan VERDIER
|
4a440238cf
|
✨ Add: Creation for AI
|
10 months ago |
|
Nathan VERDIER
|
e12c7b4143
|
🐛 Fix: popup selectPlayer
|
10 months ago |
|
Rayhân HASSOU
|
81a6d20a10
|
Merge branch 'Ar_kit'
Conflicts:
DouShouQi_App/DouShouQi_App/Views/Menu/MainMenuView.swift
DouShouQi_App/DouShouQi_App/Views/Player/SelectPlayerView.swift
|
10 months ago |
|
étudiant
|
82a2129b4c
|
add some changes and add arkit project
|
10 months ago |
|
Rémi REGNAULT
|
e5b2109b23
|
✨ now, no invalid move
|
10 months ago |
|
Rémi REGNAULT
|
67b86d0085
|
Merge branch 'dev_views_Game' of https://codefirst.iut.uca.fr/git/remi.regnault/DouShouQi_App into dev_views_Game
|
10 months ago |
|
Rémi REGNAULT
|
588e1c1830
|
🚧
|
10 months ago |
|
étudiant
|
1fc38e8e28
|
merge
|
10 months ago |
|
Nathan VERDIER
|
33f66bcc8a
|
🐛 Fix: call SelectPlayerButtonView with PlayerVm
|
10 months ago |
|
étudiant
|
63650920d2
|
Merge branch 'dev_views_Game'
|
10 months ago |
|
Rayhân HASSOU
|
a95cb5a93a
|
Merge pull request 'dev_vm_Players' (#15) from dev_vm_Players into dev_vm
Reviewed-on: #15
|
10 months ago |
|
étudiant
|
4d7ca429f8
|
fix somes bug
|
10 months ago |
|
étudiant
|
3b7d4f410b
|
delete function work
|
10 months ago |
|
Nathan VERDIER
|
a93d4e26b2
|
🚧 Add: comment
|
11 months ago |
|
Nathan VERDIER
|
d28d25f150
|
🐛 Update: Binding to observableObject
|
11 months ago |
|
Nathan VERDIER
|
94b49e99cb
|
🚧 Add: comment
|
11 months ago |
|
Nathan VERDIER
|
3a569bea57
|
🐛 Update: Binding to Published
|
11 months ago |
|
Nathan VERDIER
|
86912bf1ff
|
✨ Update: Show button and affiche all player
|
11 months ago |
|
Nathan VERDIER
|
df0f29331e
|
🐛 Update: call ShowAllPlayer
|
11 months ago |
|
Nathan VERDIER
|
fb1a4e9466
|
✨ Update: AddPlayerView
|
11 months ago |
