Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
9731b54
Merge remote-tracking branch 'refs/remotes/Shun01a4/master'
ryo628 Sep 25, 2016
233467a
UI向上
ryo628 Sep 25, 2016
c65b161
Merge pull request #28 from ryo628/master
Shun01a4 Sep 25, 2016
7c831a6
Merge remote-tracking branch 'refs/remotes/Shun01a4/master'
ryo628 Sep 26, 2016
10a270a
いろいろ調整
Shun01a4 Sep 26, 2016
8dafc13
Merge remote-tracking branch 'refs/remotes/Shun01a4/master'
ryo628 Sep 26, 2016
6e1bb5a
3,4曲目
ryo628 Sep 26, 2016
4d848de
Merge pull request #29 from ryo628/master
Shun01a4 Sep 26, 2016
e9f2e49
データ受け渡し修正
Shun01a4 Sep 26, 2016
f4945ff
UI調整
ryo628 Sep 26, 2016
b3a415c
Merge pull request #30 from ryo628/master
Shun01a4 Sep 26, 2016
1cbfe6b
Merge remote-tracking branch 'refs/remotes/Shun01a4/master'
ryo628 Sep 26, 2016
53ea1e0
Merge remote-tracking branch 'refs/remotes/Shun01a4/master'
ryo628 Sep 26, 2016
d3cfd02
画像追加
ryo628 Sep 26, 2016
a7433d1
Merge branch 'master' of https://github.com/ryo628/Muse
ryo628 Sep 26, 2016
3d68814
Merge pull request #31 from ryo628/master
Shun01a4 Sep 26, 2016
b0ee07b
Merge remote-tracking branch 'refs/remotes/Shun01a4/master'
ryo628 Sep 27, 2016
a40de17
画像変更
ryo628 Sep 27, 2016
25f0d87
画像色変更
ryo628 Sep 27, 2016
b8fbce8
アプリアイコン画像変更
Shun01a4 Sep 27, 2016
0dd6ace
Merge pull request #32 from ryo628/master
Shun01a4 Sep 27, 2016
523dfb2
画像リスティング
ryo628 Sep 27, 2016
f4d54a6
Merge pull request #33 from ryo628/master
Shun01a4 Sep 27, 2016
c32e4ac
Merge remote-tracking branch 'refs/remotes/Shun01a4/master'
ryo628 Sep 27, 2016
972d253
微調整
ryo628 Sep 27, 2016
2df12bc
Merge pull request #34 from ryo628/master
Shun01a4 Sep 27, 2016
35ff8ab
Merge remote-tracking branch 'refs/remotes/Shun01a4/master'
ryo628 Sep 27, 2016
0415609
Merge remote-tracking branch 'refs/remotes/Shun01a4/master'
ryo628 Sep 27, 2016
f84d893
裏全消去ボタン修正
ryo628 Sep 27, 2016
9a13c61
デバッグ表示削除
ryo628 Sep 27, 2016
05c369c
Merge pull request #1 from Shun01a4/master
skeleton1998 Sep 27, 2016
07fa0b3
画像の追加と変更
skeleton1998 Sep 27, 2016
c70d08c
Delete fue.bmp
skeleton1998 Sep 27, 2016
52ba471
Delete guitar.bmp
skeleton1998 Sep 27, 2016
e3af97e
Merge pull request #35 from ryo628/master
Shun01a4 Sep 27, 2016
f023a4d
Merge pull request #36 from skeleton1998/master
Shun01a4 Sep 27, 2016
06bff2b
Merge remote-tracking branch 'refs/remotes/Shun01a4/master'
ryo628 Sep 27, 2016
c25704a
Merge pull request #2 from Shun01a4/master
skeleton1998 Sep 27, 2016
39efeb0
微修正
skeleton1998 Sep 27, 2016
91e39e1
デリート画像修正
skeleton1998 Sep 27, 2016
2aa4a2b
Merge pull request #37 from skeleton1998/master
Shun01a4 Sep 27, 2016
5068058
Merge remote-tracking branch 'refs/remotes/Shun01a4/master'
ryo628 Sep 27, 2016
0ba31e3
ドラムパート追加
ryo628 Sep 27, 2016
24093c4
Merge pull request #38 from ryo628/master
Shun01a4 Sep 27, 2016
a07c3a5
Add files via upload
skeleton1998 Sep 27, 2016
cf261a2
効果音修正
skeleton1998 Sep 27, 2016
85b122b
Delete flog1.mp3
skeleton1998 Sep 27, 2016
91bc682
Delete flog2.mp3
skeleton1998 Sep 27, 2016
e19bdf9
Delete flog3.mp3
skeleton1998 Sep 27, 2016
0ca0704
Delete flog4.mp3
skeleton1998 Sep 27, 2016
07b9c49
Merge pull request #39 from skeleton1998/master
Shun01a4 Sep 27, 2016
84295aa
Merge remote-tracking branch 'refs/remotes/Shun01a4/master'
ryo628 Sep 27, 2016
17503b5
Merge branch 'master' of https://github.com/ryo628/Muse
ryo628 Sep 27, 2016
3d58562
Merge remote-tracking branch 'refs/remotes/Shun01a4/master'
ryo628 Sep 27, 2016
7fc3daa
微調整
ryo628 Sep 27, 2016
14ccd17
画像削除
ryo628 Sep 27, 2016
c8edbef
画像削除
ryo628 Sep 27, 2016
deebbba
Merge pull request #40 from ryo628/master
Shun01a4 Sep 27, 2016
1ea6be5
タップ波微調整
ryo628 Sep 27, 2016
c57bbc0
Merge pull request #41 from ryo628/master
Shun01a4 Sep 27, 2016
c8f5aea
Merge remote-tracking branch 'refs/remotes/Shun01a4/master'
ryo628 Sep 27, 2016
476551c
Merge remote-tracking branch 'refs/remotes/Shun01a4/master'
ryo628 Sep 27, 2016
34b8510
Merge branch 'master' of https://github.com/ryo628/Muse
ryo628 Sep 28, 2016
d41e436
画像変更。
ryo628 Sep 28, 2016
8aa5df7
Merge pull request #42 from ryo628/master
Shun01a4 Sep 28, 2016
f8fdcb2
画像更新
ryo628 Sep 28, 2016
247c705
音修正
ryo628 Sep 28, 2016
f0800f2
Merge pull request #43 from ryo628/master
Shun01a4 Sep 28, 2016
bc567de
Merge pull request #44 from ka-zu/master
Shun01a4 Sep 30, 2016
000fa09
Merge remote-tracking branch 'refs/remotes/Shun01a4/master'
ryo628 Sep 30, 2016
83ae298
波を綺麗に
ryo628 Sep 30, 2016
e797c9f
楽器背景追加
ryo628 Sep 30, 2016
959dfd0
波アルゴリズム変更
ryo628 Oct 1, 2016
3cc467a
波紋アルゴリズム精査
ryo628 Oct 1, 2016
a2d9f80
カクつくの修正
ryo628 Oct 1, 2016
e813f07
GrafhicView大改造
ryo628 Oct 1, 2016
644e781
Merge pull request #45 from ryo628/master
Shun01a4 Oct 1, 2016
370a33a
Merge remote-tracking branch 'refs/remotes/Shun01a4/master'
ryo628 Oct 1, 2016
f6a239a
微調整
ryo628 Oct 2, 2016
e316f91
画像背景透過
ryo628 Oct 2, 2016
d166621
画像修正
ryo628 Oct 2, 2016
abf8b24
メモリ処理
ryo628 Oct 2, 2016
564ecb7
Merge pull request #46 from ryo628/master
Shun01a4 Oct 2, 2016
1c3a699
Merge remote-tracking branch 'refs/remotes/Shun01a4/master'
ryo628 Oct 2, 2016
c483068
画像更新
ryo628 Oct 2, 2016
6bc36c4
Merge pull request #47 from ryo628/master
Shun01a4 Oct 3, 2016
9c2d943
Merge remote-tracking branch 'refs/remotes/Shun01a4/master'
ryo628 Oct 3, 2016
70edb98
Merge branch 'master' of https://github.com/ryo628/Muse
ryo628 Oct 3, 2016
d1d1ca4
メモリ消費対策
Shun01a4 Oct 3, 2016
04e9120
Merge pull request #7 from Shun01a4/master
ryo628 Oct 3, 2016
20746dc
波修正
ryo628 Oct 3, 2016
3fbbbdd
画像更新
ryo628 Oct 3, 2016
b4d8d0d
Merge pull request #48 from ryo628/master
Shun01a4 Oct 3, 2016
e706832
プロトタイプを消去
Shun01a4 Oct 5, 2016
ce1c8e2
Update README.md
Shun01a4 Oct 5, 2016
7859456
いろいろ更新
Shun01a4 Oct 8, 2016
8c1cf3a
Update README.md
Shun01a4 Oct 15, 2016
0f65286
Update README.md
Shun01a4 Apr 12, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions Muse_performance/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:label="MUSE"
android:supportsRtl="true"
android:theme="@android:style/Theme.NoTitleBar">
android:theme="@android:style/Theme.NoTitleBar"
android:largeHeap="true">
<activity
android:name=".Starting"
android:screenOrientation="portrait">
Expand All @@ -32,11 +33,6 @@
android:label="@string/app_name"
android:screenOrientation="portrait">
</activity>
<activity
android:name=".Sound_Back"
android:label="@string/app_name"
android:screenOrientation="portrait">
</activity>
</application>

</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public void soundLoad(){
soundID[1] = soundPool.load(context,R.raw.hiyoko,1);
soundID[2] = soundPool.load(context,R.raw.semi,1);
soundID[3] = soundPool.load(context,R.raw.hand,1);
soundID[4] = soundPool.load(context,R.raw.flog2,1);
soundID[4] = soundPool.load(context,R.raw.drop,1);
}

//鳴らす
Expand Down
Loading