 Rayhân HASSOU
|
049d2a0703
|
Merge pull request 'dev_views_stats' (#13) from dev_views_stats into dev_views
Reviewed-on: #13
|
11 months ago |
|
Rayhân HASSOU
|
91f4157c10
|
add assets 🍱
|
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
|
425a7fbea6
|
Merge branch 'dev_views' of https://codefirst.iut.uca.fr/git/remi.regnault/DouShouQi_App into dev_views
|
11 months ago |
|
Rémi REGNAULT
|
095c1a5305
|
🔀 merging
|
11 months ago |
|
Rayhân HASSOU
|
002b3ec04a
|
merge dev_views_players 🔀
|
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 |
|
Rayhân HASSOU
|
a8e9418b35
|
fix conflict 🔀
|
11 months ago |
|
Rayhân HASSOU
|
b2b0298a7b
|
add animation
|
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 |
|
étudiant
|
f5bfeaad29
|
a
|
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
|
a6ac8ae804
|
🙈 removing /Dependencies folder from .gitignore
|
11 months ago |
|
Rémi REGNAULT
|
847cfdd96f
|
⬆️ Upgrade dependency to DouShouQiModel
|
11 months ago |
|
Rémi REGNAULT
|
f80d4d1709
|
🚚 removing assets folder in folder DouShouQi_App and moving contained files to /Assets
|
11 months ago |
 Nathan VERDIER
|
a03d069197
|
🔀 merging to get main button
|
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 |
|
Nathan VERDIER
|
cf73760067
|
🔀 dev_views
|
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
|
64a31f9c62
|
✨ Add: TitlePageFrame
|
11 months ago |
|
Rémi REGNAULT
|
98bde61ae5
|
🏷️ completing TextStyles with a structure for all text styles
|
11 months ago |
|
Rémi REGNAULT
|
3dac28a58e
|
🏷️ adding TextStyles and ViewTitleTextStyle
|
11 months ago |
|
Rémi REGNAULT
|
18f245e45a
|
🏷️ commit struct AppImages
|
11 months ago |
|
Rémi REGNAULT
|
5a1f8ce600
|
🏷️ Introducing struct AppImages and Assets Dictionary for Images in the app
|
11 months ago |
|
Rémi REGNAULT
|
d38ae83a74
|
🏷️ Introducing struct Colors and Assets Dictionary for Colors
|
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 |
