DouShouQi_App

Commit Graph

Select branches

Hide Pull Requests

Ar_Kit

Ar_kit

dev

dev_ARKit

dev_save_game

dev_views

dev_views_Game

dev_views_GameResume

dev_views_Historic

dev_views_MainPage

dev_views_PlayerResume

dev_views_PlayerScoreResume

dev_views_Players

dev_views_ScoreBoard

dev_views_SelectPlayer

dev_views_Settings

dev_views_SplashScreen

dev_views_ViewTitle

dev_views_stats

dev_vm

dev_vm_Game

dev_vm_Players

dev_vm_Settings

dev_vm_saveHistorique

master

readMe

#1

#10

#13

#14

#15

#16

#17

#2

#3

#4

#5

#6

#7

#8

#9

fb42ad759b Add License master Rémi REGNAULT 2024-06-30 17:47:21 +0200
298b855851 :heavy_plus: add dependency Nathan VERDIER 2024-06-28 15:03:40 +0200
6ba2dcf881 ✚ Add: Framework DoushouQi Nathan VERDIER 2024-06-28 14:55:15 +0200
94c0f012d8 ✨ Add: AssetARkit Nathan VERDIER 2024-06-24 21:46:20 +0200
62ce99ebda ✨ Update: navigation Nathan VERDIER 2024-06-24 21:45:38 +0200
a951fff464 🚧 Add: ARViews Nathan VERDIER 2024-06-24 21:45:09 +0200
30b9bdeeba 💄 Update: PlayersView Nathan VERDIER 2024-06-24 21:44:22 +0200
ae9c6c3728 🔥 Move: AR assets in ARObjects Nathan VERDIER 2024-06-24 21:43:47 +0200
e8d7133896 Mise à jour de 'README.md' Rayhân HASSOU 2024-06-24 21:39:45 +0200
97e828d2e3 add images Rayhân HASSOU 2024-06-24 21:31:53 +0200
57e3bd04cf 🔀 Merge: with dev_ARKit dev_vm Nathan VERDIER 2024-06-24 20:33:21 +0200
950cfe3546 Merge branch 'dev_ARKit' Nathan VERDIER 2024-06-24 20:31:53 +0200
1b693e584c 🔀 merging to get NavigationStack dev_ARKit Nathan VERDIER 2024-06-24 18:37:15 +0200
5ade5fc25f fix bug Rayhân HASSOU 2024-06-24 18:26:21 +0200
806840e84e 🚧 commit before merge Nathan VERDIER 2024-06-24 18:06:01 +0200
4e691bfd5f now historic are sort by date Rayhân HASSOU 2024-06-24 17:50:58 +0200
2f8b6b92b9 fix button problem Rayhân HASSOU 2024-06-24 17:07:52 +0200
d3884adda3 readd song Rayhân HASSOU 2024-06-24 17:01:00 +0200
2927a0d285 solve merge conflict Rayhân HASSOU 2024-06-24 16:48:17 +0200
f5428fdb18 Merge branch 'dev_vm_saveHistorique' Rayhân HASSOU 2024-06-24 16:33:02 +0200
86c4c79767 timer is save now #17 dev_vm_saveHistorique Rayhân HASSOU 2024-06-24 16:28:48 +0200
76cf1d9145 ✨ Go back on screen menu at the end of the game Rémi REGNAULT 2024-06-24 16:28:36 +0200
a171478e2c historic is well saved Rayhân HASSOU 2024-06-24 16:08:03 +0200
36e5be8c4a Merge branch 'dev_vm' of https://codefirst.iut.uca.fr/git/remi.regnault/DouShouQi_App into dev_vm Rémi REGNAULT 2024-06-24 15:06:26 +0200
315d60bdf9 ⚰️ removing dead code Rémi REGNAULT 2024-06-24 15:06:03 +0200
dcdc6113d1 moove sounds Rayhân HASSOU 2024-06-24 14:25:08 +0200
cf25c7e139 add musics Rayhân HASSOU 2024-06-24 14:24:08 +0200
631ae89c11 Merge branch 'dev_views_Game' Nathan VERDIER 2024-06-24 10:46:36 +0200
d4362cdf91 ✨ Update: SelectPlayerView for create players dev_views_Game Nathan VERDIER 2024-06-24 10:40:13 +0200
1e6db55be4 ✨ Add: EndGame view Nathan VERDIER 2024-06-24 10:38:16 +0200
239782ec60 ✨ Add: log for endgame Nathan VERDIER 2024-06-24 10:36:49 +0200
7a18273be9 ✨ Add: listener Nathan VERDIER 2024-06-24 10:34:41 +0200
205c4723e4 💄 Add: new colors Nathan VERDIER 2024-06-24 10:25:43 +0200
73830f8ab2 🚧 resolving conflicts reregnault 2024-06-24 07:55:53 +0200
10ac1a8a25 score board is done Rayhân HASSOU 2024-06-22 18:55:05 +0200
d5baa35e50 now we can see rank of player Rayhân HASSOU 2024-06-22 18:47:02 +0200
3e85b7d6d0 🚧 tp meeple back on invalid move reregnault 2024-06-21 18:06:19 +0200
780488deac change ui/ux select player dev_save_game Rayhân HASSOU 2024-06-21 17:57:35 +0200
df25251a09 ✨ adding colours of maple for P2 reregnault 2024-06-21 17:56:58 +0200
60711f4897 Merge branch 'dev_views_Game' Rayhân HASSOU 2024-06-21 17:46:23 +0200
aa4236091f 💄 Update: style for button selection joueur Nathan VERDIER 2024-06-21 17:42:01 +0200
3aa50d654b 💄 Update: style for button slection perso Nathan VERDIER 2024-06-21 17:41:31 +0200
1eba7c0638 ✨ when you are playing a game, the name and last move change every turn reregnault 2024-06-21 17:41:19 +0200
4a440238cf ✨ Add: Creation for AI Nathan VERDIER 2024-06-21 17:40:21 +0200
e12c7b4143 🐛 Fix: popup selectPlayer Nathan VERDIER 2024-06-21 17:39:10 +0200
81a6d20a10 Merge branch 'Ar_kit' Rayhân HASSOU 2024-06-21 17:33:35 +0200
82a2129b4c add some changes and add arkit project #16 Ar_kit étudiant 2024-06-21 17:27:14 +0200
e5b2109b23 ✨ now, no invalid move Rémi REGNAULT 2024-06-21 17:11:38 +0200
67b86d0085 Merge branch 'dev_views_Game' of https://codefirst.iut.uca.fr/git/remi.regnault/DouShouQi_App into dev_views_Game Rémi REGNAULT 2024-06-21 12:15:32 +0200
588e1c1830 🚧 Rémi REGNAULT 2024-06-21 12:14:50 +0200
1fc38e8e28 merge étudiant 2024-06-21 11:23:49 +0200
33f66bcc8a 🐛 Fix: call SelectPlayerButtonView with PlayerVm Nathan VERDIER 2024-06-21 10:44:23 +0200
63650920d2 Merge branch 'dev_views_Game' étudiant 2024-06-21 10:36:35 +0200
a95cb5a93a Merge pull request 'dev_vm_Players' (#15) from dev_vm_Players into dev_vm Ar_Kit Rayhân HASSOU 2024-06-21 10:34:19 +0200
4d7ca429f8 fix somes bug #15 dev_vm_Players étudiant 2024-06-21 10:30:21 +0200
3b7d4f410b delete function work étudiant 2024-06-18 11:29:42 +0200
a93d4e26b2 🚧 Add: comment Nathan VERDIER 2024-06-17 15:23:26 +0200
d28d25f150 🐛 Update: Binding to observableObject Nathan VERDIER 2024-06-17 15:22:48 +0200
94b49e99cb 🚧 Add: comment Nathan VERDIER 2024-06-17 15:22:19 +0200
3a569bea57 🐛 Update: Binding to Published Nathan VERDIER 2024-06-17 15:21:14 +0200
86912bf1ff ✨ Update: Show button and affiche all player Nathan VERDIER 2024-06-17 15:17:14 +0200
df0f29331e 🐛 Update: call ShowAllPlayer Nathan VERDIER 2024-06-17 15:16:03 +0200
fb1a4e9466 ✨ Update: AddPlayerView Nathan VERDIER 2024-06-17 15:07:16 +0200
6ea7146860 players display well when they have been added étudiant 2024-06-17 14:42:17 +0200
a492de1e8e Merge branch 'dev_vm_Players' Nathan VERDIER 2024-06-14 15:05:56 +0200
4bb2045fe9 players save work étudiant 2024-06-14 15:04:20 +0200
28841d2a83 Merge branch 'dev_vm_Players' Nathan VERDIER 2024-06-14 14:47:13 +0200
cacf6d85d6 🚧 Update param function Nathan VERDIER 2024-06-14 14:40:08 +0200
a790d1e26c 🚧 Update call fonction ShowAllPlayer Nathan VERDIER 2024-06-14 14:38:33 +0200
77ce09091a 🐛 Update: Call AddPlayerView Nathan VERDIER 2024-06-14 13:49:19 +0200
7eaa6049c2 ➕ Update: Depency Nathan VERDIER 2024-06-14 09:43:34 +0200
b4a98873a8 🚧 Update: SelectPlayerButtonView for call ShowAllPlayer sheet Nathan VERDIER 2024-06-14 09:41:31 +0200
581d2a5a2d 🚧 Update: ShowAllPlayer for list all player Nathan VERDIER 2024-06-14 09:39:18 +0200
626f32c605 🚧 Update: SelectPlayerView for call ShowAllPlayer sheet Nathan VERDIER 2024-06-14 09:36:49 +0200
30b3d43e92 🚧 Update: SpriteMeeple move for add vm Nathan VERDIER 2024-06-14 09:36:08 +0200
befb5e731d 🚧 Update: SpriteMeeple move for add vm Nathan VERDIER 2024-06-14 09:35:46 +0200
1aa2c5318b players binding works étudiant 2024-06-14 09:32:33 +0200
d771a3daaf 💄 Text color for player name now set to be the same as the color of the title dev_views Rémi REGNAULT 2024-06-04 17:25:00 +0200
b8e08a1c36 💄 AddPlayerView now use a custom background colour Rémi REGNAULT 2024-06-04 17:23:49 +0200
5608b2e6a4 💄 remove the override background color Rémi REGNAULT 2024-06-04 17:22:37 +0200
333985ed36 💄 adding colors for the popup background when adding player Rémi REGNAULT 2024-06-04 17:21:53 +0200
6173e63ce7 Merge pull request '♻️ separate the enum language in another file' (#14) from dev_vm into dev_vm_Players Rayhân HASSOU 2024-06-04 17:12:17 +0200
ec168e3155 Merge remote-tracking branch 'refs/remotes/origin/dev_views_Game' Rémi REGNAULT 2024-06-04 16:56:28 +0200
0456325767 Merge remote-tracking branch 'refs/remotes/origin/dev_views_stats' Rémi REGNAULT 2024-06-04 16:53:09 +0200
ce222566f7 💄 changing title sag image Rémi REGNAULT 2024-06-04 16:52:40 +0200
d774dfe491 💄 Rémi REGNAULT 2024-06-04 16:52:07 +0200
c2eb19e912 ♻️ separate the enum language in another file #14 Rémi REGNAULT 2024-06-04 16:33:44 +0200
3a6632c289 🐛 fixing previous merge Rémi REGNAULT 2024-06-04 16:06:14 +0200
a8e37fa1f6 correct a problem dev_views_stats Rayhân HASSOU 2024-06-04 16:00:38 +0200
9696158863 🔀 merging views branch into viewmodel branch Rémi REGNAULT 2024-06-04 15:59:02 +0200
ff2f0be545 🔥 Remove: unused code Nathan VERDIER 2024-06-04 15:56:36 +0200
4e4b928431 ✨ Add: navigation for selectPlayer Nathan VERDIER 2024-06-04 15:54:30 +0200
0b9c8f1581 ✨ Add: navigation for selectPlayerView Nathan VERDIER 2024-06-04 15:53:44 +0200
97a3af9dce Merge branch 'dev_views' Rémi REGNAULT 2024-06-04 15:51:54 +0200
16261de6e7 Merge remote-tracking branch 'refs/remotes/origin/dev_views_Game' Rémi REGNAULT 2024-06-04 15:46:02 +0200
049d2a0703 Merge pull request 'dev_views_stats' (#13) from dev_views_stats into dev_views Rayhân HASSOU 2024-06-04 15:37:12 +0200
91f4157c10 add assets 🍱 #13 Rayhân HASSOU 2024-06-04 10:44:26 +0200
d478658435 🔥 Remove: code useless Nathan VERDIER 2024-06-02 19:32:00 +0200
3c3be0b548 🔀 Merge: dev_views Nathan VERDIER 2024-06-02 19:30:32 +0200
89dd5450ba Merge branch 'dev_views' Nathan VERDIER 2024-06-02 18:23:19 +0200