Merge pull request godotengine#112 from aaronfranke/update-3.4

YouCannotBurnMyShadow · Nov 5, 2021 · e46542e · e46542e
2 parents a29d28f + 1df7ee9
commit e46542e
Show file tree

Hide file tree

Showing 15 changed files with 41 additions and 40 deletions.
diff --git a/effects_shared/BlastMesh.mesh b/effects_shared/BlastMesh.mesh
diff --git a/effects_shared/BlastMesh_Sphere.mesh b/effects_shared/BlastMesh_Sphere.mesh
diff --git a/enemies/red_robot/laser/BarrelSmoke.mesh → ...es/red_robot/laser/BarrelSmoke_Plane.mesh b/enemies/red_robot/laser/BarrelSmoke.mesh → ...es/red_robot/laser/BarrelSmoke_Plane.mesh
diff --git a/enemies/red_robot/laser/impact_effect/LightRaysMesh_Plane.mesh b/enemies/red_robot/laser/impact_effect/LightRaysMesh_Plane.mesh
diff --git a/enemies/red_robot/laser/impact_effect/Plane.mesh b/enemies/red_robot/laser/impact_effect/Plane.mesh
diff --git a/enemies/red_robot/laser/impact_effect/impact_effect.tscn b/enemies/red_robot/laser/impact_effect/impact_effect.tscn
@@ -1,8 +1,8 @@
 [gd_scene load_steps=26 format=2]
 
-[ext_resource path="res://effects_shared/BlastMesh.mesh" type="ArrayMesh" id=1]
+[ext_resource path="res://effects_shared/BlastMesh_Sphere.mesh" type="ArrayMesh" id=1]
 [ext_resource path="res://effects_shared/BlastTexture.png" type="Texture" id=2]
-[ext_resource path="res://enemies/red_robot/laser/impact_effect/Plane.mesh" type="ArrayMesh" id=3]
+[ext_resource path="res://enemies/red_robot/laser/impact_effect/LightRaysMesh_Plane.mesh" type="ArrayMesh" id=3]
 [ext_resource path="res://enemies/red_robot/laser/impact_effect/LightRays.png" type="Texture" id=4]
 [ext_resource path="res://enemies/red_robot/laser/impact_effect/blast.gd" type="Script" id=5]
 [ext_resource path="res://enemies/red_robot/laser/impact_effect/EmissionAlbedoParticle.shader" type="Shader" id=6]

diff --git a/...ot/parts/sparks_effect/SparkParticle.mesh → ...s/sparks_effect/SparkParticle_Sphere.mesh b/...ot/parts/sparks_effect/SparkParticle.mesh → ...s/sparks_effect/SparkParticle_Sphere.mesh
diff --git a/enemies/red_robot/red_robot.tscn b/enemies/red_robot/red_robot.tscn
@@ -14,9 +14,9 @@
 [ext_resource path="res://enemies/red_robot/audio/explosion.wav" type="AudioStream" id=17]
 [ext_resource path="res://enemies/red_robot/audio/hit.wav" type="AudioStream" id=18]
 [ext_resource path="res://enemies/red_robot/audio/walk.wav" type="AudioStream" id=19]
-[ext_resource path="res://enemies/red_robot/laser/BarrelSmoke.mesh" type="ArrayMesh" id=20]
+[ext_resource path="res://enemies/red_robot/laser/BarrelSmoke_Plane.mesh" type="ArrayMesh" id=20]
 [ext_resource path="res://enemies/red_robot/laser/BarrelSmokeTexture.png" type="Texture" id=21]
-[ext_resource path="res://enemies/red_robot/parts/sparks_effect/SparkParticle.mesh" type="ArrayMesh" id=22]
+[ext_resource path="res://enemies/red_robot/parts/sparks_effect/SparkParticle_Sphere.mesh" type="ArrayMesh" id=22]
 [ext_resource path="res://enemies/red_robot/parts/part.gd" type="Script" id=24]
 
 [sub_resource type="SpatialMaterial" id=1]

diff --git a/menu/menu.tscn b/menu/menu.tscn
@@ -560,12 +560,12 @@ custom_constants/separation = 50
 margin_right = 646.0
 margin_bottom = 57.0
 size_flags_horizontal = 3
-custom_styles/hover = ExtResource( 18 )
-custom_styles/pressed = ExtResource( 18 )
-custom_fonts/font = SubResource( 17 )
 custom_colors/font_color = Color( 1, 1, 1, 1 )
 custom_colors/font_color_hover = Color( 1, 1, 1, 1 )
 custom_colors/font_color_pressed = Color( 1, 1, 1, 1 )
+custom_fonts/font = SubResource( 17 )
+custom_styles/hover = ExtResource( 18 )
+custom_styles/pressed = ExtResource( 18 )
 text = "Apply"
 __meta__ = {
 "_edit_use_anchors_": false
@@ -576,12 +576,12 @@ margin_left = 696.0
 margin_right = 1342.0
 margin_bottom = 57.0
 size_flags_horizontal = 3
-custom_styles/hover = ExtResource( 18 )
-custom_styles/pressed = ExtResource( 18 )
-custom_fonts/font = SubResource( 17 )
 custom_colors/font_color = Color( 1, 1, 1, 1 )
 custom_colors/font_color_hover = Color( 1, 1, 1, 1 )
 custom_colors/font_color_pressed = Color( 1, 1, 1, 1 )
+custom_fonts/font = SubResource( 17 )
+custom_styles/hover = ExtResource( 18 )
+custom_styles/pressed = ExtResource( 18 )
 text = "Cancel"
 
 [node name="Loading" type="HBoxContainer" parent="UI"]

diff --git a/player/bullet/bullet.tscn b/player/bullet/bullet.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=63 format=2]
 
 [ext_resource path="res://player/bullet/bullet.gd" type="Script" id=1]
-[ext_resource path="res://effects_shared/BlastMesh.mesh" type="ArrayMesh" id=2]
+[ext_resource path="res://effects_shared/BlastMesh_Sphere.mesh" type="ArrayMesh" id=2]
 [ext_resource path="res://player/bullet/bullet_explode.wav" type="AudioStream" id=3]
 [ext_resource path="res://player/bullet/effect/BlastMaterial.tres" type="Material" id=4]
 [ext_resource path="res://player/bullet/effect/light_rays_material.tres" type="Material" id=5]

diff --git a/player/crosshair.png.import b/player/crosshair.png.import
@@ -28,6 +28,7 @@ process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=true

diff --git a/player/model/MuzzleFlashParticle.mesh b/player/model/MuzzleFlashParticle.mesh
diff --git a/player/model/muzzle_flash_particle_mesh_Cone.mesh b/player/model/muzzle_flash_particle_mesh_Cone.mesh
diff --git a/player/player.tscn b/player/player.tscn
@@ -9,7 +9,7 @@
 [ext_resource path="res://player/audio/shoot.wav" type="AudioStream" id=7]
 [ext_resource path="res://player/camera_noise_shake_effect.gd" type="Script" id=8]
 [ext_resource path="res://player/bullet/bullet_material.tres" type="Material" id=9]
-[ext_resource path="res://player/model/MuzzleFlashParticle.mesh" type="ArrayMesh" id=10]
+[ext_resource path="res://player/model/muzzle_flash_particle_mesh_Cone.mesh" type="ArrayMesh" id=10]
 [ext_resource path="res://player/bullet/effect/FlarePolar.png" type="Texture" id=11]
 
 [sub_resource type="ParticlesMaterial" id=1]

diff --git a/project.godot b/project.godot