Merge origin/main into camera2

resources/config/explosion_config.json

@@ -0,0 +1,15 @@
+{
+    "emissionPoints": [
+      { "position": [0.0, 0.0, 0.0] }
+    ],
+    "texture": "resources/spark_white.png",
+    "speedRange": [10.0, 30.0],
+    "zSpeedRange": [-1.0, 1.0],
+    "scaleRange": [0.5, 1.0],
+    "lifeTimeRange": [200.0, 800.0],
+    "emissionRate": 50.0,
+    "maxParticles": 5,
+    "particleSize": 0.5,
+    "biasX": 0.1,
+    "shaderProgramName": "default"
+  }

resources/config/game_over.json

@@ -0,0 +1,55 @@
+{
+  "root": {
+    "type": "LinearLayout",
+    "orientation": "vertical",
+    "align": "center",
+    "x": 0,
+    "y": 0,
+    "width": 1920,
+    "height": 1080,
+    "background": {
+      "color": [0, 0, 0, 0.7]
+    },
+    "children": [
+      {
+        "type": "Button",
+        "name": "gameOverText",
+        "x": 350,
+        "y": 400,
+        "width": 600,
+        "height": 150,
+        "textures": {
+          "normal": "resources/gameover.png",
+          "hover": "resources/gameover.png",
+          "pressed": "resources/gameover.png"
+        }
+      },
+      {
+        "type": "Button",
+        "name": "restartButton",
+        "x": 350,
+        "y": 300,
+        "width": 300,
+        "height": 80,
+        "textures": {
+          "normal": "resources/shoot_normal.png",
+          "hover": "resources/shoot_normal.png",
+          "pressed": "resources/shoot_normal.png"
+        }
+      },
+      {
+        "type": "Button",
+        "name": "gameOverExitButton",
+        "x": 650,
+        "y": 300,
+        "width": 300,
+        "height": 80,
+        "textures": {
+          "normal": "resources/sand2.png",
+          "hover": "resources/sand2.png",
+          "pressed": "resources/sand2.png"
+        }
+      }
+    ]
+  }
+}

resources/config/ui.json

@@ -27,7 +27,7 @@
 				{
 				  "type": "Button",
 				  "name": "playButton",
-				  "x": 100,
+				  "x": -1000,
 				  "y": 500,
 				  "width": 200,
 				  "height": 50,
@@ -56,7 +56,7 @@
 				{
 				  "type": "Button",
 				  "name": "settingsButton",
-				  "x": 100,
+				  "x": -1000,
 				  "y": 400,
 				  "width": 200,
 				  "height": 50,
@@ -89,7 +89,7 @@
 				{
 				  "type": "Button",
 				  "name": "exitButton",
-				  "x": 100,
+				  "x": -1000,
 				  "y": 300,
 				  "width": 200,
 				  "height": 50,