 Nathan VERDIER
|
a492de1e8e
|
Merge branch 'dev_vm_Players'
|
11 months ago |
étudiant
|
4bb2045fe9
|
players save work
|
11 months ago |
|
Nathan VERDIER
|
28841d2a83
|
Merge branch 'dev_vm_Players'
Conflicts:
DouShouQi_App/DouShouQi_App.xcodeproj/project.pbxproj
DouShouQi_App/DouShouQi_App/Views/Menu/MainMenuView.swift
|
11 months ago |
|
Nathan VERDIER
|
cacf6d85d6
|
🚧 Update param function
|
11 months ago |
|
Nathan VERDIER
|
a790d1e26c
|
🚧 Update call fonction ShowAllPlayer
|
11 months ago |
|
Nathan VERDIER
|
77ce09091a
|
🐛 Update: Call AddPlayerView
|
11 months ago |
|
Nathan VERDIER
|
7eaa6049c2
|
➕ Update: Depency
|
11 months ago |
|
Nathan VERDIER
|
b4a98873a8
|
🚧 Update: SelectPlayerButtonView for call ShowAllPlayer sheet
|
11 months ago |
|
Nathan VERDIER
|
581d2a5a2d
|
🚧 Update: ShowAllPlayer for list all player
|
11 months ago |
|
Nathan VERDIER
|
626f32c605
|
🚧 Update: SelectPlayerView for call ShowAllPlayer sheet
|
11 months ago |
|
Nathan VERDIER
|
30b3d43e92
|
🚧 Update: SpriteMeeple move for add vm
|
11 months ago |
|
Nathan VERDIER
|
befb5e731d
|
🚧 Update: SpriteMeeple move for add vm
|
11 months ago |
|
étudiant
|
1aa2c5318b
|
players binding works
|
11 months ago |
 Rayhân HASSOU
|
6173e63ce7
|
Merge pull request '♻️ separate the enum language in another file' (#14) from dev_vm into dev_vm_Players
Reviewed-on: #14
|
11 months ago |
 Rémi REGNAULT
|
c2eb19e912
|
♻️ separate the enum language in another file
|
11 months ago |
|
Rémi REGNAULT
|
3a6632c289
|
🐛 fixing previous merge
|
11 months ago |
|
Rémi REGNAULT
|
9696158863
|
🔀 merging views branch into viewmodel branch
|
11 months ago |
|
Nathan VERDIER
|
ff2f0be545
|
🔥 Remove: unused code
|
11 months ago |
|
Nathan VERDIER
|
4e4b928431
|
✨ Add: navigation for selectPlayer
|
11 months ago |
|
Nathan VERDIER
|
0b9c8f1581
|
✨ Add: navigation for selectPlayerView
|
11 months ago |
|
Rémi REGNAULT
|
97a3af9dce
|
Merge branch 'dev_views'
Conflicts:
DouShouQi_App/DouShouQi_App.xcodeproj/project.pbxproj
|
11 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 |
|
Rayhân HASSOU
|
91f4157c10
|
add assets 🍱
|
11 months ago |
|
Nathan VERDIER
|
d478658435
|
🔥 Remove: code useless
|
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 |
|
Nathan VERDIER
|
12ebaee8a4
|
✨ Add: Position for spawn meeples
|
11 months ago |
|
Nathan VERDIER
|
fa5fb12e8c
|
✨ Add: update height, width and zPosition on touche begin and touche ended
|
11 months ago |
|
Rémi REGNAULT
|
f3ed7c87aa
|
🔀 merging
|
11 months ago |
|
Rayhân HASSOU
|
3c42f5c42a
|
add stat for players
|
11 months ago |
|
Nathan VERDIER
|
457b8ff3d7
|
✨ Update: SpriteMeeple for width and height assets
|
11 months ago |
|
Nathan VERDIER
|
7f804f6c62
|
✨ Update: GameScene for width and height assets
|
11 months ago |
|
Nathan VERDIER
|
3ca451a3c2
|
🍱 Update: AppImages for add new assets
|
11 months ago |
|
Nathan VERDIER
|
ca3deffd83
|
🍱 Add: Meeples assets
|
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 |
|
Nathan VERDIER
|
d10ffdcf4a
|
📝 SpriteMeeple and GameScene
|
11 months ago |
|
Rayhân HASSOU
|
b2b0298a7b
|
add animation
|
11 months ago |
|
Nathan VERDIER
|
bc6ead80e9
|
🔊 Add: Musique
|
11 months ago |
|
Nathan VERDIER
|
4daa6239de
|
✨ Update: touchesEnded
|
11 months ago |
|
Nathan VERDIER
|
19156a0be7
|
✨ Add: initializeBoard
|
11 months ago |
|
Nathan VERDIER
|
151847ddd7
|
🔧 Update: project
|
11 months ago |
