Merge pull request #23 from JiroCab/experimental

V1.7

Author: JiroCab

.github/workflows/autoMainRelease.yml

@@ -43,7 +43,7 @@ jobs:
           mv build/libs/Olupis-but-a-jar.jar build/libs/${{ github.event.repository.name }}-${{ steps.version.outputs.prop }}.jar
 
       - name: Upload built jar file
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ github.event.repository.name }}-${{ steps.version.outputs.prop }}
           path: build/libs/${{ github.event.repository.name }}-${{ steps.version.outputs.prop }}.jar

.github/workflows/deploy.yml

@@ -24,7 +24,7 @@ jobs:
         run: ./gradlew deploy
 
       - name: Upload built jar file
-        uses: actions/upload-artifact@v3.1.1
+        uses: actions/upload-artifact@v4
         with:
           name: Olupis-but-a-jar.jar
           path: build/libs/Olupis-but-a-jar.jar

README.md

@@ -0,0 +1,33 @@
+#define HIGHP
+
+#define NSCALE 180.0 / 2.0
+
+uniform sampler2D u_texture;
+uniform sampler2D u_noise;
+
+uniform vec2 u_campos;
+uniform vec2 u_resolution;
+uniform float u_time;
+
+varying vec2 v_texCoords;
+
+void main(){
+    vec2 c = v_texCoords.xy;
+    vec2 coords = vec2(c.x * u_resolution.x + u_campos.x, c.y * u_resolution.y + u_campos.y);
+
+    float btime = u_time / 24000.0;
+    float noise = (texture2D(u_noise, (coords) / NSCALE + vec2(btime) * vec2(-0.9, 0.8)).r + texture2D(u_noise, (coords) / NSCALE + vec2(btime * 1.1) * vec2(-0.8, -1.0)).r) / 2.0;
+    vec4 color = texture2D(u_texture, c);
+
+    if(noise > 0.44 && noise < 0.48){
+        color.rgb *= vec3(0.3, 0.15, 0.3);
+    }
+	if(noise > 0.54 && noise < 0.58){
+        color.rgb *= vec3(0.2, 0.05, 0.35);
+    } 
+	if(noise > 0.14 && noise < 0.18){
+        color.rgb *= vec3(0.8, 0.05, 0.2);
+    }
+
+    gl_FragColor = color;
+}

assets-raw/MrApple/abandoned-train-station.msav

@@ -1,3 +1,7 @@
 as2_plasma_shot.wav -> Alien shooter 2
 as2_broke_armor.wav -> Alien shooter 2
-space.ogg -> Command and Conquer: Red alert 2
+space.ogg -> Command and Conquer: Red alert 3
+cnc_zh_battlemaster_weapon.wav -> Command and Conquer: Generals/Zero Hour
+sawblades -> ota (custom recorded and made :3)
+warning sound -> ota
+funi rainbow music -> https://youtu.be/6-8E4Nirh9s