sin365/AxibugEmuOnline
1
0
Fork 1
Code Issues Pull Requests 1 Projects Releases Wiki Activity

master #75

Closed
Alienjack wants to merge 510 commits from Alienjack/AxibugEmuOnline_old:master into master
pull from: Alienjack/AxibugEmuOnline_old:master
merge into: sin365:master
Conversation 0 Commits 510 Files Changed 5 +2 -2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 56f2953a99 - Show all commits

4
AxibugEmuOnline.Client/Assets/Script/UI/XMBBackGroundPreview.shader
View File

@ -165,8 +165,8 @@
float waveCol2 = waveColor(uv, waveHeight2, maxHeight2, frequency2, power2);
float3 col = bg;
col = lerp(col, waveCol1 * col, step(uv.y, waveHeight1));
col = lerp(col, waveCol2 * col, step(uv.y, waveHeight2));
col = lerp(col, col/waveCol1, step(uv.y, waveHeight1));
col = lerp(col, col/waveCol2, step(uv.y, waveHeight2));
// Output to screen
fixed4 fragColor = float4(col,1.0);