Merge branch 'master' into PlplupLearnedBulletSeed

Fork: 0

n-konishi / Cactus-CleanArchitecture

Browse code Merge branch 'master' into PlplupLearnedBulletSeed # Conflicts: # .idea/caches/build_file_checksums.ser # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnPlayer.java # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/PlayerFragment.java # app/src/main/res/layout/ui_fragment.xml 弾の向きの修正 CleanArchitecture chenge_design correct_design master onResponse update update2
1 parent 157b472 commit 20065ceb335707142f63ecbdc34e2127df7cf44b a-matsumoto authored on 8 Nov 2018

Browse code

# Conflicts:
#	.idea/caches/build_file_checksums.ser
#	app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnPlayer.java
#	app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/PlayerFragment.java
#	app/src/main/res/layout/ui_fragment.xml

弾の向きの修正

CleanArchitecture chenge_design correct_design master onResponse update update2

1 parent 157b472 commit 20065ceb335707142f63ecbdc34e2127df7cf44b

a-matsumoto authored on 8 Nov 2018

Patch

Unified Split

Showing 1 changed file

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/MyBullet.java

Show line notes below