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

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 Shimokawa 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
commit ad506a03f1a2a03102a600ef5cd7e58289ea52c5 2 parents 849e572 + 63ac8e2 g-akagi authored on 13 Oct 2022

Browse code

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

commit ad506a03f1a2a03102a600ef5cd7e58289ea52c5

2 parents 849e572 + 63ac8e2

g-akagi authored on 13 Oct 2022

Patch

Unified Split

Showing 2 changed files

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

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

Show line notes below