nitta-lab-2022/IrisClient

Fork: 0

nitta-lab-2022 / IrisClient

2022-10-06	34dad93 Browse files » Merge pull request #136 from nitta-lab-2022/Listadd1006 ... Listadd1006 Nao Hirase committed on 6 Oct 2022
	e2c447e Browse files » Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2022/IrisClient into Listadd1006 ... Conflicts: app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java k-iwamoto committed on 6 Oct 2022
	3f97f62 Browse files » List追加（未完成）。エラーはなしです。 k-iwamoto committed on 6 Oct 2022
	d6bf1f3 Browse files » Merge pull request #135 from nitta-lab-2022/Game_Model ... GameのmodelとGameJsonの追加 okazaki takehiro committed on 6 Oct 2022
	759d295 Browse files » GameのmodelとGameJsonの追加 d-matsuura committed on 6 Oct 2022
	c007b22 Browse files » Merge pull request #134 from nitta-lab-2022/Okazaki0927 ... Okazaki0927 Nao Hirase committed on 6 Oct 2022
	bd69872 Browse files » DrawingStateViewModel変更しました。 k-suzuki committed on 6 Oct 2022
	ed10ae6 Browse files » Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2022/IrisClient into Okazaki0927 k-suzuki committed on 6 Oct 2022
	4207d24 Browse files » DrawingStateViewModel変更しました。 k-suzuki committed on 6 Oct 2022
	b01bbeb Browse files » DrawingStateViewModel変更しました。 k-suzuki committed on 6 Oct 2022
	f98374b Browse files » DrawingStateViewModel変更しました。 k-suzuki committed on 6 Oct 2022
	ed6a986 Browse files » Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2022/IrisClient into Okazaki0927 k-suzuki committed on 6 Oct 2022
	5b30e89 Browse files » DrawingStateViewModel変更しました。 k-suzuki committed on 6 Oct 2022
	4fd9f24 Browse files » Merge pull request #133 from nitta-lab-2022/GameMemberActivity-Add16Image ... 16個の画像レイアウトの追加 Okada Kenshin committed on 6 Oct 2022
	2e295b5 Browse files » レイアウトの制約の追加 yugo-asano committed on 6 Oct 2022
	3e9c385 Browse files » Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2022/IrisClient into Okazaki0927 k-suzuki committed on 6 Oct 2022
	d04185e Browse files » Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2022/IrisClient into Okazaki0927 k-suzuki committed on 6 Oct 2022
	1b07a3c Browse files » Merge pull request #132 from nitta-lab-2022/Game_Model ... GameのmodelとGameJsonの追加 RyuseiNishimura committed on 6 Oct 2022
	7f28d23 Browse files » GameのmodelとGameJsonの追加 d-matsuura committed on 6 Oct 2022
	6e7cdbe Browse files » DrawingStateViewModel変更しました。 k-suzuki committed on 6 Oct 2022
	577d14e Browse files » Merge pull request #131 from nitta-lab-2022/GameViewModel1006 ... GameViewModelの改良,TurnJsonの作成 Okada Kenshin committed on 6 Oct 2022
	5eaef79 Browse files » GameViewModelの改良,TurnJsonの作成 r-nishimura committed on 6 Oct 2022
	8183ca8 Browse files » Merge pull request #127 from nitta-lab-2022/DrawingActivity_test ... DrawingActivity test okazaki takehiro committed on 6 Oct 2022
	7664a42 Browse files » Merge pull request #129 from nitta-lab-2022/Okazaki0927 ... DrawingStateViewModel変更しました。 kohei kosuga committed on 6 Oct 2022
	c3b59ca Browse files » TurnのOpenListの変数を変更していくう d-matsuura committed on 6 Oct 2022
	48f5fe2 Browse files » putDrawingの引き数をBitmapのみに修正 m-mifune committed on 6 Oct 2022
	7f24c74 Browse files » Merge pull request #128 from nitta-lab-2022/Game_Model ... TurnのOpenListの変数を変更していくう RyuseiNishimura committed on 6 Oct 2022
	da0730c Browse files » putDrawingの引き数をBitmapのみに修正 m-mifune committed on 6 Oct 2022
	f814706 Browse files » Merge pull request #126 from nitta-lab-2022/DrawingActivity_test ... putDrawingの引数を追加 okazaki takehiro committed on 6 Oct 2022
	0efd3d7 Browse files » viewModelを呼び出す位置をonCreate内に変更． ... getKeyword()をコメントアウト m-mifune committed on 6 Oct 2022