Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2022/IrisClient into Game

Fork: 0

nitta-lab-2022 / IrisClient

Browse code Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2022/IrisClient into Game_Model Conflicts: app/src/main/AndroidManifest.xml DrawingActivity GameActivity_Shimokawa GameView1110 GameViewActivity1108 GameViewActivity1115 GameViewModel1020 GameViewModel1117 List1025 Okazaki0927 Owner10/27 Owner1101 OwnerRoomActivity cardfragment_bug1105 cardfragment_bug1108 drawingCardFragment_ConnectViewModel drawingCard_endlogic drawingFragment_outputDrawImage drawingcardbug_1110 drawingcardfragment-1101error drawingcardfragment-connectVM2 fragment-urlToImage master o_game ok_home output_log test01
commit 49edc9def96f2e07abf568de98da97dcffb50100 2 parents abf16fd + b739aaa d-matsuura authored on 4 Oct 2022

Browse code

Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2022/IrisClient into Game_Model

Conflicts:
	app/src/main/AndroidManifest.xml

DrawingActivity GameActivity_Shimokawa GameView1110 GameViewActivity1108 GameViewActivity1115 GameViewModel1020 GameViewModel1117 List1025 Okazaki0927 Owner10/27 Owner1101 OwnerRoomActivity cardfragment_bug1105 cardfragment_bug1108 drawingCardFragment_ConnectViewModel drawingCard_endlogic drawingFragment_outputDrawImage drawingcardbug_1110 drawingcardfragment-1101error drawingcardfragment-connectVM2 fragment-urlToImage master o_game ok_home output_log test01

commit 49edc9def96f2e07abf568de98da97dcffb50100

2 parents abf16fd + b739aaa

d-matsuura authored on 4 Oct 2022

Patch

Unified Split

Showing 3 changed files

Ignore Space Show notes View app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java

Ignore Space Show notes View app/src/main/java/org/ntlab/irisclient/viewmodels/DrawingStateViewModel.java

Ignore Space Show notes View app/src/main/java/org/ntlab/irisclient/viewmodels/RoomViewModel.java

Show line notes below