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

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}},

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();
 

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)

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)