 Nathan VERDIER
|
806840e84e
|
🚧 commit before merge
|
10 months ago |
 Rémi REGNAULT
|
16261de6e7
|
Merge remote-tracking branch 'refs/remotes/origin/dev_views_Game'
Conflicts:
DouShouQi_App/DouShouQi_App.xcodeproj/project.pbxproj
|
11 months ago |
 Rayhân HASSOU
|
049d2a0703
|
Merge pull request 'dev_views_stats' (#13) from dev_views_stats into dev_views
Reviewed-on: #13
|
11 months ago |
|
Nathan VERDIER
|
3c3be0b548
|
🔀 Merge: dev_views
|
11 months ago |
|
Nathan VERDIER
|
89dd5450ba
|
Merge branch 'dev_views'
Conflicts:
DouShouQi_App/DouShouQi_App.xcodeproj/project.pbxproj
DouShouQi_App/DouShouQi_App/Assets/Images/AppImages.swift
|
11 months ago |
|
Rémi REGNAULT
|
f3ed7c87aa
|
🔀 merging
|
11 months ago |
|
Rayhân HASSOU
|
3c42f5c42a
|
add stat for players
|
11 months ago |
|
Rémi REGNAULT
|
12a36f10b0
|
Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
DouShouQi_App/DouShouQi_App.xcodeproj/project.pbxproj
|
11 months ago |
|
Rémi REGNAULT
|
7163a17723
|
🔀 merging
|
11 months ago |
|
Rémi REGNAULT
|
b8cbcc1826
|
Merge remote-tracking branch 'refs/remotes/origin/dev_views_SelectPlayer'
Conflicts:
DouShouQi_App/DouShouQi_App.xcodeproj/project.pbxproj
|
11 months ago |
|
Rémi REGNAULT
|
095c1a5305
|
🔀 merging
|
11 months ago |
|
Nathan VERDIER
|
151847ddd7
|
🔧 Update: project
|
11 months ago |
|
Nathan VERDIER
|
371ee648ae
|
🔧 Update: project
|
11 months ago |
|
Nathan VERDIER
|
bbc2de1e78
|
🔧 Update: project
|
11 months ago |
|
Nathan VERDIER
|
c00184c8d2
|
🔀 Merge: dev_views
|
11 months ago |
|
Rémi REGNAULT
|
0a97b86a92
|
🔧 working on dependencies
|
11 months ago |
|
Rémi REGNAULT
|
8739f6017e
|
🔀 merging
|
11 months ago |
|
Rémi REGNAULT
|
18803a7114
|
🐛 missing proj file in previous push
|
11 months ago |
|
Rayhân HASSOU
|
766b4683fc
|
now we can add pictures fr player ✨
|
11 months ago |
|
Nathan VERDIER
|
b5a5a66467
|
🔧
|
11 months ago |
étudiant
|
0b964c92cf
|
add players pop up is done ✨
|
11 months ago |
|
Rémi REGNAULT
|
17983a43d4
|
🚧 working on settings page
|
11 months ago |
|
Rémi REGNAULT
|
847cfdd96f
|
⬆️ Upgrade dependency to DouShouQiModel
|
11 months ago |
|
Nathan VERDIER
|
a03d069197
|
🔀 merging to get main button
|
11 months ago |
|
Rayhân HASSOU
|
897077d4c5
|
Merge pull request 'splash screen work ✨' (#8) from dev_views_SplashScreen into dev_views
Reviewed-on: #8
|
11 months ago |
|
étudiant
|
c9f455bcfa
|
splash screen work ✨
|
11 months ago |
|
Rémi REGNAULT
|
1efb014ec7
|
✨ adding a custom font for the title page
|
11 months ago |
|
Nathan VERDIER
|
d1488a7dac
|
🚧 Add: SpriteMeeple
|
11 months ago |
|
Rémi REGNAULT
|
aa2fc70d96
|
🔀 Merging branch to add MainMenuButton parameters
|
11 months ago |
|
étudiant
|
537f8527e6
|
add music and button sounds on main page
|
11 months ago |
|
Nathan VERDIER
|
0052bef358
|
🚧 Add: TopGameBoard
|
11 months ago |
|
étudiant
|
bb28ef5531
|
add menu button composant 🚧; main menu page is over :sparkles; add assets 🍱
|
11 months ago |
|
Rémi REGNAULT
|
a8194b5ace
|
🚧 adding PlayerResumeFrame
|
12 months ago |
|
Rémi REGNAULT
|
819f707d6f
|
🚧 adding HistoricView
|
12 months ago |
|
Rémi REGNAULT
|
74f9d011e4
|
🚧 adding GameResumeFrame
|
12 months ago |
|
Rémi REGNAULT
|
38b104d059
|
🚧 adding ScoreBoardView
|
12 months ago |
|
Rémi REGNAULT
|
987b73ee5a
|
🚧 adding PlayerResumeFrame
|
12 months ago |
|
Rémi REGNAULT
|
da8c17627c
|
🚧 working on title view
|
12 months ago |
|
Rémi REGNAULT
|
2799b702a6
|
🧱 starting the project with files and repertories
|
12 months ago |
|
Rémi REGNAULT
|
339abb1ff3
|
🔧 modifying PROJECT_BUNDLE_IDENTIFIER from NVRHRR to fr.uca.iut
|
12 months ago |
|
Rémi REGNAULT
|
49da9ec008
|
🔧 adding dependency to doushouqi model
|
12 months ago |
|
Rémi REGNAULT
|
499b036873
|
🎉
|
12 months ago |
