diff --git a/audio/titlescreen/cursor_change.wav b/audio/titlescreen/cursor_change.wav index 81be467..d9517d2 100644 Binary files a/audio/titlescreen/cursor_change.wav and b/audio/titlescreen/cursor_change.wav differ diff --git a/backgrounds/fallback/bg.lua b/backgrounds/fallback/bg.lua index 39f396f..038905b 100644 --- a/backgrounds/fallback/bg.lua +++ b/backgrounds/fallback/bg.lua @@ -221,11 +221,6 @@ local bgs = { Bg={Base={Tex={"anim/snow.jpg", "anim/snow-c.jpg"}}, u={Pivot=0.3}}, Particle={Tex="shines1.png", u={Speed=1.9, OffsetY=-0.3, Amount=8, Scale=0.4}}, }, - eye={ - Bg={Base={Tex="anim/eye.jpg"}, u={Pivot=0.38}}, - Particle={ Tex=pt.lightsPink, u={OffsetY=-0.02, Amount=9, Speed=2.0} }, - speed=0.4 - }, sky={ Bg={Base={Tex={bt.skyIv,bt.skyIv2}}}, Tunnel={Tex="clouds.png", u={Sides=16, Fog=15, Stretch=0.07, VortexEffect=true}}, diff --git a/backgrounds/fallback/textures/background/anim/eye.jpg b/backgrounds/fallback/textures/background/anim/eye.jpg deleted file mode 100644 index cc44e65..0000000 Binary files a/backgrounds/fallback/textures/background/anim/eye.jpg and /dev/null differ diff --git a/scripts/components/background.lua b/scripts/components/background.lua index 3250000..b100a7a 100644 --- a/scripts/components/background.lua +++ b/scripts/components/background.lua @@ -167,8 +167,8 @@ end local draw = function (deltaTime) gfx.Save() - resetLayoutInformation() - gfx.Scale(scale, scale) + -- resetLayoutInformation() + -- gfx.Scale(scale, scale) drawBackground(); diff --git a/scripts/gameplay/crit_line.lua b/scripts/gameplay/crit_line.lua index 250976f..b8f435f 100644 --- a/scripts/gameplay/crit_line.lua +++ b/scripts/gameplay/crit_line.lua @@ -8,10 +8,22 @@ local CRITBAR_H = 348 local scale; +local isLandscape = false; + local setUpTransforms = function (x,y,rotation) - local resx, resy = game.GetResolution() - local desw = 1080 - local desh = 1920 + local resx, resy = game.GetResolution(); + isLandscape = resx > resy; + + local desw, desh; + + if (isLandscape) then + desw = 1920; + desh = 1080; + else + desw = 1080; + desh = 1920; + end + scale = resx / desw gfx.Translate(x, y) diff --git a/scripts/gameplay/gauge.lua b/scripts/gameplay/gauge.lua index b3d1789..1dfa708 100644 --- a/scripts/gameplay/gauge.lua +++ b/scripts/gameplay/gauge.lua @@ -156,8 +156,7 @@ local render = function (deltaTime, gaugeType, gaugeValue, isArsEnabled) smallNumberX = gaugePosX-26; else bigNumber = '100'; - smallNumber = 0; - smallNumberX = -100; -- yeet it out of existance + smallNumber = ''; end gfx.TextAlign(gfx.TEXT_ALIGN_LEFT + gfx.TEXT_ALIGN_MIDDLE) diff --git a/textures/challenge_end/bar_glow_3.png b/textures/challenge_end/bar_glow_3.png deleted file mode 100644 index df0bcf0..0000000 Binary files a/textures/challenge_end/bar_glow_3.png and /dev/null differ diff --git a/textures/challenge_end/bar_glow_3_white.png b/textures/challenge_end/bar_glow_3_white.png deleted file mode 100644 index 41ea8eb..0000000 Binary files a/textures/challenge_end/bar_glow_3_white.png and /dev/null differ diff --git a/textures/challenge_end/bg.png b/textures/challenge_end/bg.png deleted file mode 100644 index e6ed946..0000000 Binary files a/textures/challenge_end/bg.png and /dev/null differ diff --git a/textures/challenge_end/header/title.png b/textures/challenge_end/header/title.png deleted file mode 100644 index 8961717..0000000 Binary files a/textures/challenge_end/header/title.png and /dev/null differ diff --git a/textures/challenge_end/pass_states/fail.png b/textures/challenge_end/pass_states/fail.png deleted file mode 100644 index 9091a88..0000000 Binary files a/textures/challenge_end/pass_states/fail.png and /dev/null differ diff --git a/textures/challenge_end/pass_states/pass.png b/textures/challenge_end/pass_states/pass.png deleted file mode 100644 index 3a51589..0000000 Binary files a/textures/challenge_end/pass_states/pass.png and /dev/null differ diff --git a/textures/challenge_end/player_info_overlay_bg.png b/textures/challenge_end/player_info_overlay_bg.png deleted file mode 100644 index d088d64..0000000 Binary files a/textures/challenge_end/player_info_overlay_bg.png and /dev/null differ diff --git a/textures/challenge_end/track _text2.png b/textures/challenge_end/track _text2.png deleted file mode 100644 index 28d2097..0000000 Binary files a/textures/challenge_end/track _text2.png and /dev/null differ diff --git a/textures/challenge_end/track_text.png b/textures/challenge_end/track_text.png deleted file mode 100644 index da8aeb3..0000000 Binary files a/textures/challenge_end/track_text.png and /dev/null differ diff --git a/textures/challenge_end/white_bars.png b/textures/challenge_end/white_bars.png deleted file mode 100644 index 0dc88b1..0000000 Binary files a/textures/challenge_end/white_bars.png and /dev/null differ diff --git a/textures/challenge_end/yellow_bar.png b/textures/challenge_end/yellow_bar.png deleted file mode 100644 index b62ab30..0000000 Binary files a/textures/challenge_end/yellow_bar.png and /dev/null differ diff --git a/textures/font-large/0.png b/textures/font-large/0.png deleted file mode 100644 index a6187e3..0000000 Binary files a/textures/font-large/0.png and /dev/null differ diff --git a/textures/font-large/1.png b/textures/font-large/1.png deleted file mode 100644 index b67c29f..0000000 Binary files a/textures/font-large/1.png and /dev/null differ diff --git a/textures/font-large/2.png b/textures/font-large/2.png deleted file mode 100644 index 5e77dfe..0000000 Binary files a/textures/font-large/2.png and /dev/null differ diff --git a/textures/font-large/3.png b/textures/font-large/3.png deleted file mode 100644 index a56a6d2..0000000 Binary files a/textures/font-large/3.png and /dev/null differ diff --git a/textures/font-large/4.png b/textures/font-large/4.png deleted file mode 100644 index 47aecb4..0000000 Binary files a/textures/font-large/4.png and /dev/null differ diff --git a/textures/font-large/5.png b/textures/font-large/5.png deleted file mode 100644 index bfa9df3..0000000 Binary files a/textures/font-large/5.png and /dev/null differ diff --git a/textures/font-large/6.png b/textures/font-large/6.png deleted file mode 100644 index 3e2903f..0000000 Binary files a/textures/font-large/6.png and /dev/null differ diff --git a/textures/font-large/7.png b/textures/font-large/7.png deleted file mode 100644 index 822f184..0000000 Binary files a/textures/font-large/7.png and /dev/null differ diff --git a/textures/font-large/8.png b/textures/font-large/8.png deleted file mode 100644 index 1f2068b..0000000 Binary files a/textures/font-large/8.png and /dev/null differ diff --git a/textures/font-large/9.png b/textures/font-large/9.png deleted file mode 100644 index 2893020..0000000 Binary files a/textures/font-large/9.png and /dev/null differ diff --git a/textures/font-level/0.png b/textures/font-level/0.png deleted file mode 100644 index 936df6c..0000000 Binary files a/textures/font-level/0.png and /dev/null differ diff --git a/textures/font-level/1.png b/textures/font-level/1.png deleted file mode 100644 index 1d79c96..0000000 Binary files a/textures/font-level/1.png and /dev/null differ diff --git a/textures/font-level/2.png b/textures/font-level/2.png deleted file mode 100644 index ebcc07c..0000000 Binary files a/textures/font-level/2.png and /dev/null differ diff --git a/textures/font-level/3.png b/textures/font-level/3.png deleted file mode 100644 index e2c55d1..0000000 Binary files a/textures/font-level/3.png and /dev/null differ diff --git a/textures/font-level/4.png b/textures/font-level/4.png deleted file mode 100644 index 18bde3d..0000000 Binary files a/textures/font-level/4.png and /dev/null differ diff --git a/textures/font-level/5.png b/textures/font-level/5.png deleted file mode 100644 index 7aefa15..0000000 Binary files a/textures/font-level/5.png and /dev/null differ diff --git a/textures/font-level/6.png b/textures/font-level/6.png deleted file mode 100644 index 59d70bc..0000000 Binary files a/textures/font-level/6.png and /dev/null differ diff --git a/textures/font-level/7.png b/textures/font-level/7.png deleted file mode 100644 index 38866d5..0000000 Binary files a/textures/font-level/7.png and /dev/null differ diff --git a/textures/font-level/8.png b/textures/font-level/8.png deleted file mode 100644 index 5cefcd5..0000000 Binary files a/textures/font-level/8.png and /dev/null differ diff --git a/textures/font-level/9.png b/textures/font-level/9.png deleted file mode 100644 index 5eef13c..0000000 Binary files a/textures/font-level/9.png and /dev/null differ diff --git a/textures/gameplay/crit_line/cursor glow bottom/blue.png b/textures/gameplay/crit_line/cursor glow bottom/blue.png new file mode 100644 index 0000000..1b9406e Binary files /dev/null and b/textures/gameplay/crit_line/cursor glow bottom/blue.png differ diff --git a/textures/gameplay/crit_line/cursor glow bottom/green.png b/textures/gameplay/crit_line/cursor glow bottom/green.png new file mode 100644 index 0000000..f2085be Binary files /dev/null and b/textures/gameplay/crit_line/cursor glow bottom/green.png differ diff --git a/textures/gameplay/crit_line/cursor glow bottom/red.png b/textures/gameplay/crit_line/cursor glow bottom/red.png new file mode 100644 index 0000000..ef3359a Binary files /dev/null and b/textures/gameplay/crit_line/cursor glow bottom/red.png differ diff --git a/textures/gameplay/crit_line/cursor glow bottom/yellow.png b/textures/gameplay/crit_line/cursor glow bottom/yellow.png new file mode 100644 index 0000000..dc4ea2c Binary files /dev/null and b/textures/gameplay/crit_line/cursor glow bottom/yellow.png differ diff --git a/textures/gameplay/crit_line/cursor glow top/blue.png b/textures/gameplay/crit_line/cursor glow top/blue.png new file mode 100644 index 0000000..b088724 Binary files /dev/null and b/textures/gameplay/crit_line/cursor glow top/blue.png differ diff --git a/textures/gameplay/crit_line/cursor glow top/green.png b/textures/gameplay/crit_line/cursor glow top/green.png new file mode 100644 index 0000000..87f2179 Binary files /dev/null and b/textures/gameplay/crit_line/cursor glow top/green.png differ diff --git a/textures/gameplay/crit_line/cursor glow top/red.png b/textures/gameplay/crit_line/cursor glow top/red.png new file mode 100644 index 0000000..401f56e Binary files /dev/null and b/textures/gameplay/crit_line/cursor glow top/red.png differ diff --git a/textures/gameplay/crit_line/cursor glow top/yellow.png b/textures/gameplay/crit_line/cursor glow top/yellow.png new file mode 100644 index 0000000..bbe7448 Binary files /dev/null and b/textures/gameplay/crit_line/cursor glow top/yellow.png differ diff --git a/textures/gameplay/crit_line/cursor.png b/textures/gameplay/crit_line/cursor.png index 924ba71..db19d21 100644 Binary files a/textures/gameplay/crit_line/cursor.png and b/textures/gameplay/crit_line/cursor.png differ diff --git a/textures/gameplay/crit_line/cursor_top.png b/textures/gameplay/crit_line/cursor_top.png new file mode 100644 index 0000000..eac9d44 Binary files /dev/null and b/textures/gameplay/crit_line/cursor_top.png differ diff --git a/textures/laser_tail.png b/textures/laser_tail.png deleted file mode 100644 index 1e48fb3..0000000 Binary files a/textures/laser_tail.png and /dev/null differ diff --git a/textures/laser_top_wave.png b/textures/laser_top_wave.png deleted file mode 100644 index be1daef..0000000 Binary files a/textures/laser_top_wave.png and /dev/null differ diff --git a/textures/pointer.png b/textures/pointer.png deleted file mode 100644 index 7201beb..0000000 Binary files a/textures/pointer.png and /dev/null differ diff --git a/textures/pointer_bottom.png b/textures/pointer_bottom.png deleted file mode 100644 index 959b9cd..0000000 Binary files a/textures/pointer_bottom.png and /dev/null differ diff --git a/textures/pointer_glow.png b/textures/pointer_glow.png deleted file mode 100644 index 783af48..0000000 Binary files a/textures/pointer_glow.png and /dev/null differ diff --git a/textures/pointer_overlay.png b/textures/pointer_overlay.png deleted file mode 100644 index 559c3c1..0000000 Binary files a/textures/pointer_overlay.png and /dev/null differ diff --git a/textures/pointer_overlay2.png b/textures/pointer_overlay2.png deleted file mode 100644 index 3f3655a..0000000 Binary files a/textures/pointer_overlay2.png and /dev/null differ diff --git a/textures/pointer_shine.png b/textures/pointer_shine.png deleted file mode 100644 index 19d8c71..0000000 Binary files a/textures/pointer_shine.png and /dev/null differ diff --git a/textures/song_back.png b/textures/song_back.png deleted file mode 100644 index d779c54..0000000 Binary files a/textures/song_back.png and /dev/null differ diff --git a/textures/titlescreen/bg.png b/textures/titlescreen/bg.png deleted file mode 100644 index dae0d7c..0000000 Binary files a/textures/titlescreen/bg.png and /dev/null differ diff --git a/textures/titlescreen/bg_old.png b/textures/titlescreen/bg_old.png deleted file mode 100644 index fc39f36..0000000 Binary files a/textures/titlescreen/bg_old.png and /dev/null differ diff --git a/textures/titlescreen/bg_ref.png b/textures/titlescreen/bg_ref.png deleted file mode 100644 index 3147d6d..0000000 Binary files a/textures/titlescreen/bg_ref.png and /dev/null differ diff --git a/textures/titlescreen/bg_withbars.png b/textures/titlescreen/bg_withbars.png deleted file mode 100644 index 39af954..0000000 Binary files a/textures/titlescreen/bg_withbars.png and /dev/null differ diff --git a/textures/volforce.png b/textures/volforce.png deleted file mode 100644 index e0891e2..0000000 Binary files a/textures/volforce.png and /dev/null differ