 Rémi REGNAULT
|
095c1a5305
|
🔀 merging
|
11 months ago |
|
Rémi REGNAULT
|
2e84bc3d23
|
Merge remote-tracking branch 'refs/remotes/origin/dev_views_MainPage'
Conflicts:
DouShouQi_App/DouShouQi_App/Views/Menu/MainMenuView.swift
|
11 months ago |
|
Rémi REGNAULT
|
0eb0a5d128
|
Merge remote-tracking branch 'refs/remotes/origin/dev_views_Historic'
|
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
|
b9dfd8f0bf
|
Merge pull request 'dev_views_Players' (#10) from dev_views_Players into dev_views
Reviewed-on: #10
|
11 months ago |
|
Rayhân HASSOU
|
766b4683fc
|
now we can add pictures fr player ✨
|
11 months ago |
|
Rémi REGNAULT
|
4bc2b427aa
|
✨ adding SystemIcons struct to contains name of system images
|
11 months ago |
|
Rémi REGNAULT
|
63eeb921e3
|
✨ CustomSwitchButton is now using system image name
|
11 months ago |
|
Rémi REGNAULT
|
039fa0550a
|
🚧 changing preview code in SettingsView
|
11 months ago |
|
Rémi REGNAULT
|
aabe88fbc8
|
🚧 removing preview on CustomSwitchButton (can not declare @state in preview)
|
11 months ago |
étudiant
|
0b964c92cf
|
add players pop up is done ✨
|
11 months ago |
|
étudiant
|
f11218e90e
|
change corner of button 💄
|
11 months ago |
|
étudiant
|
ad9c5078d2
|
change color of icons 💄
|
11 months ago |
|
Rayhân HASSOU
|
36a55cedda
|
Merge pull request 'dev_views' (#9) from dev_views into dev_views_Players
Reviewed-on: #9
|
11 months ago |
|
Rémi REGNAULT
|
17983a43d4
|
🚧 working on settings page
|
11 months ago |
|
Rémi REGNAULT
|
d594941ded
|
💄 main button top and bottom right corner are round
|
11 months ago |
|
Rémi REGNAULT
|
08d36596b1
|
Merge branch 'dev_views'
Conflicts:
DouShouQi_App/DouShouQi_App.xcodeproj/project.pbxproj
|
11 months ago |
|
Rémi REGNAULT
|
955ac8135d
|
⚰️ removing a useless file
|
11 months ago |
|
Rémi REGNAULT
|
6988a8f429
|
Merge branch 'dev_views_ViewTitle' into dev_views
|
11 months ago |
|
Rémi REGNAULT
|
9b732a71c4
|
✨ textStyle on SwiftUI.Text is now working
|
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 |
|
Rémi REGNAULT
|
aa2fc70d96
|
🔀 Merging branch to add MainMenuButton parameters
|
11 months ago |
|
Rayhân HASSOU
|
13ccc2b97a
|
Merge pull request 'add music and button sounds on main page' (#7) from dev_views_Players into dev_views
Reviewed-on: #7
|
11 months ago |
|
étudiant
|
537f8527e6
|
add music and button sounds on main page
|
11 months ago |
|
Rémi REGNAULT
|
0de2f7d46c
|
✨ Now we can have custom horizontal alignment and corner radius on MainMenuButton
|
11 months ago |
|
Rayhân HASSOU
|
97b93d5612
|
Merge pull request 'dev_views' (#6) from dev_views into dev_views_MainPage
Reviewed-on: #6
|
11 months ago |
|
Rayhân HASSOU
|
9147f0ae39
|
Merge pull request 'add navigation ✨' (#5) from dev_views_MainPage into dev_views
Reviewed-on: #5
|
11 months ago |
|
étudiant
|
4c7fb02071
|
add navigation ✨
|
11 months ago |
|
Rayhân HASSOU
|
bb0ffa76b6
|
Merge pull request 'add menu button composant 🚧; main menu page is over :sparkles; add assets 🍱' (#4) from dev_views_MainPage into dev_views
Reviewed-on: #4
|
11 months ago |
|
étudiant
|
bb28ef5531
|
add menu button composant 🚧; main menu page is over :sparkles; add assets 🍱
|
11 months ago |
|
Rémi REGNAULT
|
45c243708b
|
🍱 adding a directory containing all image files (.png, .svg, ...)
|
11 months ago |
|
Rémi REGNAULT
|
5d9007920e
|
Merge branch 'dev_views' into dev_views_ViewTitle
|
11 months ago |
|
Rémi REGNAULT
|
97d859bda0
|
🍱 transform png to sag for title image
|
11 months ago |
|
Rémi REGNAULT
|
856e3f57fa
|
🚧 modifying padding on content in HistoricView
|
11 months ago |
|
Rayhân HASSOU
|
da42d91aa8
|
Merge pull request 'master' (#3) from master into dev_views_Historic
Reviewed-on: #3
|
11 months ago |
|
Rayhân HASSOU
|
c22e30969f
|
Merge pull request 'readMe' (#2) from readMe into master
Reviewed-on: #2
|
11 months ago |
|
Rayhân HASSOU
|
ce9b12bd9c
|
Mise à jour de 'README.md'
|
11 months ago |
|
Rémi REGNAULT
|
a8194b5ace
|
🚧 adding PlayerResumeFrame
|
11 months ago |
|
Rémi REGNAULT
|
6e6e519fc3
|
♻️ rename PlayerResumeFrame into PlayerScoreResumeFrame
|
11 months ago |
|
Rémi REGNAULT
|
69f6342045
|
🚧 increasing padding left-right in HistoricView
|
11 months ago |
|
Rémi REGNAULT
|
0d8b08a61f
|
🚧 in file GameResumeFrame: decreased padding
|
11 months ago |
|
Rémi REGNAULT
|
819f707d6f
|
🚧 adding HistoricView
|
11 months ago |
|
Rémi REGNAULT
|
74f9d011e4
|
🚧 adding GameResumeFrame
|
11 months ago |
|
Rémi REGNAULT
|
38b104d059
|
🚧 adding ScoreBoardView
|
11 months ago |
|
Rémi REGNAULT
|
987b73ee5a
|
🚧 adding PlayerResumeFrame
|
11 months ago |
|
Rémi REGNAULT
|
3ebc81ad45
|
Merge pull request 'dev_views_ViewTitle' (#1) from dev_views_ViewTitle into dev_views
Reviewed-on: #1
|
11 months ago |
