Merge branch 'master' of https://github.com/FajsiEx/exceed

2021-08-10 16:48:08 +02:00 · 2021-08-10 16:48:08 +02:00 · aecbe0ec53
parent fec0d1d8a1 03537ec4d1
commit aecbe0ec53
453 changed files with 1 additions and 1 deletions
--- a/audio/song_transition_screen/Bangin'
+++ b/audio/song_transition_screen/Bangin'
--- a/audio/song_transition_screen/Everlasting
+++ b/audio/song_transition_screen/Everlasting
--- a/audio/song_transition_screen/For
+++ b/audio/song_transition_screen/For
--- a/audio/song_transition_screen/HE4VEN.wav
+++ b/audio/song_transition_screen/HE4VEN.wav
--- a/audio/song_transition_screen/I.wav
+++ b/audio/song_transition_screen/I.wav
--- a/audio/song_transition_screen/Lachryma.wav
+++ b/audio/song_transition_screen/Lachryma.wav
--- a/audio/song_transition_screen/Max
+++ b/audio/song_transition_screen/Max
--- a/audio/song_transition_screen/iLLness
+++ b/audio/song_transition_screen/iLLness
--- a/scripts/songselect/songwheel.lua
+++ b/scripts/songselect/songwheel.lua
@ -532,7 +532,7 @@ function tickTransitions(deltaTime)
    else
        animationHeaderGlowAlpha = 1-((animationHeaderGlowScale-0.5) * 2);
    end
-    animationHeaderGlowAlpha = animationHeaderGlowAlpha*0.3
+    animationHeaderGlowAlpha = animationHeaderGlowAlpha*0.4
 end


--- a/textures/gameplay/hit_animation_frames/critical_taps/1.png
+++ b/textures/gameplay/hit_animation_frames/critical_taps/1.png
--- a/textures/gameplay/hit_animation_frames/critical_taps/10.png
+++ b/textures/gameplay/hit_animation_frames/critical_taps/10.png
--- a/textures/gameplay/hit_animation_frames/critical_taps/11.png
+++ b/textures/gameplay/hit_animation_frames/critical_taps/11.png
--- a/textures/gameplay/hit_animation_frames/critical_taps/12.png
+++ b/textures/gameplay/hit_animation_frames/critical_taps/12.png
--- a/textures/gameplay/hit_animation_frames/critical_taps/13.png
+++ b/textures/gameplay/hit_animation_frames/critical_taps/13.png
--- a/textures/gameplay/hit_animation_frames/critical_taps/14.png
+++ b/textures/gameplay/hit_animation_frames/critical_taps/14.png
--- a/textures/gameplay/hit_animation_frames/critical_taps/15.png
+++ b/textures/gameplay/hit_animation_frames/critical_taps/15.png
--- a/textures/gameplay/hit_animation_frames/critical_taps/16.png
+++ b/textures/gameplay/hit_animation_frames/critical_taps/16.png
--- a/textures/gameplay/hit_animation_frames/critical_taps/17.png
+++ b/textures/gameplay/hit_animation_frames/critical_taps/17.png
--- a/textures/gameplay/hit_animation_frames/critical_taps/18.png
+++ b/textures/gameplay/hit_animation_frames/critical_taps/18.png
--- a/textures/gameplay/hit_animation_frames/critical_taps/2.png
+++ b/textures/gameplay/hit_animation_frames/critical_taps/2.png
--- a/textures/gameplay/hit_animation_frames/critical_taps/3.png
+++ b/textures/gameplay/hit_animation_frames/critical_taps/3.png
--- a/textures/gameplay/hit_animation_frames/critical_taps/4.png
+++ b/textures/gameplay/hit_animation_frames/critical_taps/4.png
--- a/textures/gameplay/hit_animation_frames/critical_taps/5.png
+++ b/textures/gameplay/hit_animation_frames/critical_taps/5.png
--- a/textures/gameplay/hit_animation_frames/critical_taps/6.png
+++ b/textures/gameplay/hit_animation_frames/critical_taps/6.png
--- a/textures/gameplay/hit_animation_frames/critical_taps/7.png
+++ b/textures/gameplay/hit_animation_frames/critical_taps/7.png
--- a/textures/gameplay/hit_animation_frames/critical_taps/8.png
+++ b/textures/gameplay/hit_animation_frames/critical_taps/8.png
--- a/textures/gameplay/hit_animation_frames/critical_taps/9.png
+++ b/textures/gameplay/hit_animation_frames/critical_taps/9.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0000.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0000.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0001.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0001.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0002.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0002.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0003.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0003.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0004.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0004.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0005.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0005.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0006.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0006.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0007.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0007.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0008.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0008.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0009.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0009.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0010.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0010.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0011.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0011.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0012.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0012.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0013.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0013.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0014.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0014.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0015.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0015.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0016.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0016.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0017.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0017.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0018.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0018.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0019.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0019.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0020.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0020.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0021.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0021.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0022.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0022.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0023.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0023.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0024.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0024.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0025.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0025.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0026.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0026.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0027.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0027.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0028.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0028.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0029.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0029.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0030.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0030.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0031.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0031.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0032.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0032.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0033.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0033.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0034.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0034.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0035.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0035.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0036.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0036.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0037.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0037.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0038.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0038.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0039.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0039.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0040.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0040.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0041.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0041.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0042.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0042.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0043.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0043.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0044.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0044.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0045.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0045.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0046.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0046.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0047.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0047.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0048.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0048.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0049.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0049.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0050.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0050.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0051.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0051.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0052.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0052.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0053.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0053.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0054.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0054.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0055.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0055.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0056.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0056.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0057.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0057.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0058.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0058.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0059.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0059.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0060.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0060.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0061.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0061.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0062.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0062.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0063.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0063.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0064.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0064.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0065.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0065.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0066.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0066.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0067.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0067.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0068.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0068.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0069.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0069.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0070.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0070.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0071.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0071.png
--- a/textures/gameplay/hit_animation_frames/hold_critical/0072.png
+++ b/textures/gameplay/hit_animation_frames/hold_critical/0072.png
--- a/Show More
+++ b/Show More