Merge branch 'master' into sqc-20_audiobullet

2023-10-16 17:43:32 -04:00
parent 9cbf20ba21 81240c6f70
commit 18a5d98c57
19 changed files with 483 additions and 134 deletions
--- a/SQCSim2021/media/menu_items/BasicPlay.png
+++ b/SQCSim2021/media/menu_items/BasicPlay.png
--- a/SQCSim2021/media/menu_items/BasicQuit.png
+++ b/SQCSim2021/media/menu_items/BasicQuit.png
--- a/SQCSim2021/media/menu_items/test.png
+++ b/SQCSim2021/media/menu_items/test.png
--- 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;
+   texel.a = 255.;
    gl_FragColor = texel;
   
 }