Merge branch 'master' of github.com:FajsiEx/exceed
|
@ -221,11 +221,6 @@ local bgs = {
|
||||||
Bg={Base={Tex={"anim/snow.jpg", "anim/snow-c.jpg"}}, u={Pivot=0.3}},
|
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}},
|
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={
|
sky={
|
||||||
Bg={Base={Tex={bt.skyIv,bt.skyIv2}}},
|
Bg={Base={Tex={bt.skyIv,bt.skyIv2}}},
|
||||||
Tunnel={Tex="clouds.png", u={Sides=16, Fog=15, Stretch=0.07, VortexEffect=true}},
|
Tunnel={Tex="clouds.png", u={Sides=16, Fog=15, Stretch=0.07, VortexEffect=true}},
|
||||||
|
|
Before Width: | Height: | Size: 9.8 MiB |
|
@ -167,8 +167,8 @@ end
|
||||||
|
|
||||||
local draw = function (deltaTime)
|
local draw = function (deltaTime)
|
||||||
gfx.Save()
|
gfx.Save()
|
||||||
resetLayoutInformation()
|
-- resetLayoutInformation()
|
||||||
gfx.Scale(scale, scale)
|
-- gfx.Scale(scale, scale)
|
||||||
|
|
||||||
drawBackground();
|
drawBackground();
|
||||||
|
|
||||||
|
|
|
@ -8,10 +8,22 @@ local CRITBAR_H = 348
|
||||||
|
|
||||||
local scale;
|
local scale;
|
||||||
|
|
||||||
|
local isLandscape = false;
|
||||||
|
|
||||||
local setUpTransforms = function (x,y,rotation)
|
local setUpTransforms = function (x,y,rotation)
|
||||||
local resx, resy = game.GetResolution()
|
local resx, resy = game.GetResolution();
|
||||||
local desw = 1080
|
isLandscape = resx > resy;
|
||||||
local desh = 1920
|
|
||||||
|
local desw, desh;
|
||||||
|
|
||||||
|
if (isLandscape) then
|
||||||
|
desw = 1920;
|
||||||
|
desh = 1080;
|
||||||
|
else
|
||||||
|
desw = 1080;
|
||||||
|
desh = 1920;
|
||||||
|
end
|
||||||
|
|
||||||
scale = resx / desw
|
scale = resx / desw
|
||||||
|
|
||||||
gfx.Translate(x, y)
|
gfx.Translate(x, y)
|
||||||
|
|
|
@ -156,8 +156,7 @@ local render = function (deltaTime, gaugeType, gaugeValue, isArsEnabled)
|
||||||
smallNumberX = gaugePosX-26;
|
smallNumberX = gaugePosX-26;
|
||||||
else
|
else
|
||||||
bigNumber = '100';
|
bigNumber = '100';
|
||||||
smallNumber = 0;
|
smallNumber = '';
|
||||||
smallNumberX = -100; -- yeet it out of existance
|
|
||||||
end
|
end
|
||||||
|
|
||||||
gfx.TextAlign(gfx.TEXT_ALIGN_LEFT + gfx.TEXT_ALIGN_MIDDLE)
|
gfx.TextAlign(gfx.TEXT_ALIGN_LEFT + gfx.TEXT_ALIGN_MIDDLE)
|
||||||
|
|
Before Width: | Height: | Size: 663 B |
Before Width: | Height: | Size: 418 B |
Before Width: | Height: | Size: 324 KiB |
Before Width: | Height: | Size: 8.2 KiB |
Before Width: | Height: | Size: 18 KiB |
Before Width: | Height: | Size: 16 KiB |
Before Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 8.0 KiB |
Before Width: | Height: | Size: 7.3 KiB |
Before Width: | Height: | Size: 555 B |
Before Width: | Height: | Size: 705 B |
Before Width: | Height: | Size: 319 B |
Before Width: | Height: | Size: 202 B |
Before Width: | Height: | Size: 309 B |
Before Width: | Height: | Size: 415 B |
Before Width: | Height: | Size: 307 B |
Before Width: | Height: | Size: 366 B |
Before Width: | Height: | Size: 384 B |
Before Width: | Height: | Size: 301 B |
Before Width: | Height: | Size: 449 B |
Before Width: | Height: | Size: 366 B |
Before Width: | Height: | Size: 316 B |
Before Width: | Height: | Size: 186 B |
Before Width: | Height: | Size: 287 B |
Before Width: | Height: | Size: 357 B |
Before Width: | Height: | Size: 288 B |
Before Width: | Height: | Size: 318 B |
Before Width: | Height: | Size: 317 B |
Before Width: | Height: | Size: 262 B |
Before Width: | Height: | Size: 332 B |
Before Width: | Height: | Size: 288 B |
After Width: | Height: | Size: 157 KiB |
After Width: | Height: | Size: 164 KiB |
After Width: | Height: | Size: 156 KiB |
After Width: | Height: | Size: 156 KiB |
After Width: | Height: | Size: 131 KiB |
After Width: | Height: | Size: 135 KiB |
After Width: | Height: | Size: 130 KiB |
After Width: | Height: | Size: 129 KiB |
Before Width: | Height: | Size: 169 KiB After Width: | Height: | Size: 141 KiB |
After Width: | Height: | Size: 109 KiB |
Before Width: | Height: | Size: 19 KiB |
Before Width: | Height: | Size: 16 KiB |
Before Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 27 KiB |
Before Width: | Height: | Size: 8.1 KiB |
Before Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 35 KiB |
Before Width: | Height: | Size: 2.9 KiB |
Before Width: | Height: | Size: 22 KiB |
Before Width: | Height: | Size: 1.4 MiB |
Before Width: | Height: | Size: 1.2 MiB |
Before Width: | Height: | Size: 422 KiB |
Before Width: | Height: | Size: 1.3 MiB |
Before Width: | Height: | Size: 16 KiB |