Merge branch 'master' into SQC19_Booster

2023-11-20 15:43:01 -05:00
parent 8769aa9e38 547772b2f9
commit 3a38753d8e
12 changed files with 69 additions and 19 deletions
--- a/SQCSim2021/media/shaders/shader01.frag
+++ b/SQCSim2021/media/shaders/shader01.frag
@@ -7,7 +7,7 @@ void main()
    texel = texture2D(tex,gl_TexCoord[0].st);

    texel *= light;
-   texel.a = 255.;
+   
    gl_FragColor = texel;
   
 }
--- a/SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumping/BlueBackJumpLeft.png
+++ b/SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumping/BlueBackJumpLeft.png
--- a/SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumping/BlueFrontJumpLeft.png
+++ b/SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGJumping/BlueFrontJumpLeft.png
--- a/SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGStanding/BlueBackLeft.png
+++ b/SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGStanding/BlueBackLeft.png
--- a/SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGStanding/BlueFrontLeft.png
+++ b/SQCSim2021/media/textures/AssetOtherPlayer/FinalPNGStanding/BlueFrontLeft.png