Browse Source

Merge pull request #104 from aaronfranke/unuse-legacy-names

Set use_legacy_names to false
Aaron Franke 4 years ago
parent
commit
4a5f84b5eb

+ 1 - 0
door/model/door.dae.import

@@ -16,6 +16,7 @@ nodes/root_name="DoorModel"
 nodes/root_scale=1.0
 nodes/custom_script=""
 nodes/storage=0
+nodes/use_legacy_names=false
 materials/location=1
 materials/storage=2
 materials/keep_on_reimport=true

+ 1 - 0
effects_shared/BlastMesh.glb.import

@@ -16,6 +16,7 @@ nodes/root_name="Scene Root"
 nodes/root_scale=1.0
 nodes/custom_script=""
 nodes/storage=0
+nodes/use_legacy_names=false
 materials/location=1
 materials/storage=0
 materials/keep_on_reimport=true

+ 2 - 1
enemies/red_robot/laser/BarrelSmoke.glb.import

@@ -16,12 +16,13 @@ nodes/root_name="Scene Root"
 nodes/root_scale=1.0
 nodes/custom_script=""
 nodes/storage=0
+nodes/use_legacy_names=false
 materials/location=1
 materials/storage=1
 materials/keep_on_reimport=true
 meshes/compress=true
 meshes/ensure_tangents=true
-meshes/storage=2
+meshes/storage=1
 meshes/light_baking=0
 meshes/lightmap_texel_size=0.1
 skins/use_named_skins=true

BIN
enemies/red_robot/laser/BarrelSmoke.mesh


File diff suppressed because it is too large
+ 0 - 9
enemies/red_robot/laser/BarrelSmoke.tres


+ 2 - 1
enemies/red_robot/laser/impact_effect/LightRaysMesh.glb.import

@@ -16,12 +16,13 @@ nodes/root_name="Scene Root"
 nodes/root_scale=1.0
 nodes/custom_script=""
 nodes/storage=0
+nodes/use_legacy_names=false
 materials/location=1
 materials/storage=1
 materials/keep_on_reimport=true
 meshes/compress=true
 meshes/ensure_tangents=true
-meshes/storage=2
+meshes/storage=1
 meshes/light_baking=0
 meshes/lightmap_texel_size=0.1
 skins/use_named_skins=true

BIN
enemies/red_robot/laser/impact_effect/Plane.mesh


+ 0 - 19
enemies/red_robot/laser/impact_effect/Plane.tres

@@ -1,19 +0,0 @@
-[gd_resource type="ArrayMesh" load_steps=2 format=2]
-
-[sub_resource type="SpatialMaterial" id=1]
-vertex_color_use_as_albedo = true
-
-[resource]
-resource_name = "Plane"
-surfaces/0 = {
-"aabb": AABB( -0.2, 0, -5, 0.4, 1e-05, 5.00001 ),
-"array_data": PoolByteArray( 204, 204, 76, 190, 0, 0, 0, 0, 0, 0, 0, 128, 0, 127, 0, 0, 126, 0, 0, 127, 0, 0, 0, 60, 204, 204, 76, 62, 0, 0, 0, 0, 0, 0, 0, 128, 0, 127, 0, 0, 127, 0, 0, 127, 0, 60, 0, 60, 204, 204, 76, 190, 0, 0, 0, 0, 0, 0, 160, 192, 0, 127, 0, 0, 127, 0, 0, 127, 0, 0, 0, 0, 204, 204, 76, 62, 0, 0, 0, 0, 0, 0, 160, 192, 0, 127, 0, 0, 126, 0, 0, 127, 0, 60, 0, 0 ),
-"array_index_data": PoolByteArray( 0, 0, 3, 0, 1, 0, 0, 0, 2, 0, 3, 0 ),
-"blend_shape_data": [  ],
-"format": 97559,
-"index_count": 6,
-"material": SubResource( 1 ),
-"primitive": 4,
-"skeleton_aabb": [  ],
-"vertex_count": 4
-}

+ 1 - 1
enemies/red_robot/laser/impact_effect/impact_effect.tscn

@@ -2,7 +2,7 @@
 
 [ext_resource path="res://effects_shared/BlastMesh.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.tres" type="ArrayMesh" id=3]
+[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/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]

+ 1 - 0
enemies/red_robot/model/red_robot.dae.import

@@ -16,6 +16,7 @@ nodes/root_name="RedRobotModel"
 nodes/root_scale=1.0
 nodes/custom_script=""
 nodes/storage=0
+nodes/use_legacy_names=false
 materials/location=1
 materials/storage=2
 materials/keep_on_reimport=true

+ 1 - 0
enemies/red_robot/parts/part_head.glb.import

@@ -16,6 +16,7 @@ nodes/root_name="Scene Root"
 nodes/root_scale=1.0
 nodes/custom_script=""
 nodes/storage=0
+nodes/use_legacy_names=false
 materials/location=1
 materials/storage=2
 materials/keep_on_reimport=true

+ 1 - 0
enemies/red_robot/parts/part_shield.glb.import

@@ -16,6 +16,7 @@ nodes/root_name="Scene Root"
 nodes/root_scale=1.0
 nodes/custom_script=""
 nodes/storage=0
+nodes/use_legacy_names=false
 materials/location=1
 materials/storage=2
 materials/keep_on_reimport=true

+ 1 - 0
enemies/red_robot/parts/ray.glb.import

@@ -16,6 +16,7 @@ nodes/root_name="Scene Root"
 nodes/root_scale=1.0
 nodes/custom_script=""
 nodes/storage=0
+nodes/use_legacy_names=false
 materials/location=1
 materials/storage=0
 materials/keep_on_reimport=true

+ 1 - 0
enemies/red_robot/parts/sparks_effect/SparkParticle.glb.import

@@ -16,6 +16,7 @@ nodes/root_name="Scene Root"
 nodes/root_scale=1.0
 nodes/custom_script=""
 nodes/storage=0
+nodes/use_legacy_names=false
 materials/location=1
 materials/storage=2
 materials/keep_on_reimport=true

+ 1 - 1
enemies/red_robot/red_robot.tscn

@@ -14,7 +14,7 @@
 [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.tres" type="ArrayMesh" id=20]
+[ext_resource path="res://enemies/red_robot/laser/BarrelSmoke.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/part.gd" type="Script" id=24]

+ 1 - 0
level/forklift/flying_forklift.glb.import

@@ -16,6 +16,7 @@ nodes/root_name="FlyingForkliftModel"
 nodes/root_scale=1.0
 nodes/custom_script=""
 nodes/storage=0
+nodes/use_legacy_names=false
 materials/location=1
 materials/storage=2
 materials/keep_on_reimport=true

+ 1 - 0
level/geometry/models/core.glb.import

@@ -16,6 +16,7 @@ nodes/root_name="CoreModel"
 nodes/root_scale=1.0
 nodes/custom_script=""
 nodes/storage=0
+nodes/use_legacy_names=false
 materials/location=1
 materials/storage=2
 materials/keep_on_reimport=true

+ 1 - 0
level/geometry/models/lights.glb.import

@@ -16,6 +16,7 @@ nodes/root_name="LightsModel"
 nodes/root_scale=1.0
 nodes/custom_script=""
 nodes/storage=0
+nodes/use_legacy_names=false
 materials/location=1
 materials/storage=2
 materials/keep_on_reimport=true

+ 1 - 0
level/geometry/models/props.glb.import

@@ -16,6 +16,7 @@ nodes/root_name="PropsModel"
 nodes/root_scale=1.0
 nodes/custom_script=""
 nodes/storage=0
+nodes/use_legacy_names=false
 materials/location=1
 materials/storage=2
 materials/keep_on_reimport=true

+ 1 - 0
level/geometry/models/structure.glb.import

@@ -16,6 +16,7 @@ nodes/root_name="StructureModel"
 nodes/root_scale=1.0
 nodes/custom_script=""
 nodes/storage=0
+nodes/use_legacy_names=false
 materials/location=1
 materials/storage=2
 materials/keep_on_reimport=true

BIN
player/model/MuzzleFlashParticle.mesh


File diff suppressed because it is too large
+ 0 - 9
player/model/MuzzleFlashParticle.tres


+ 3 - 2
player/model/muzzle_flash_particle_mesh.glb.import

@@ -16,12 +16,13 @@ nodes/root_name="Scene Root"
 nodes/root_scale=1.0
 nodes/custom_script=""
 nodes/storage=0
+nodes/use_legacy_names=false
 materials/location=1
-materials/storage=1
+materials/storage=2
 materials/keep_on_reimport=true
 meshes/compress=true
 meshes/ensure_tangents=true
-meshes/storage=2
+meshes/storage=1
 meshes/light_baking=0
 meshes/lightmap_texel_size=0.1
 skins/use_named_skins=true

+ 1 - 0
player/model/player.glb.import

@@ -16,6 +16,7 @@ nodes/root_name="Scene Root"
 nodes/root_scale=1.0
 nodes/custom_script=""
 nodes/storage=0
+nodes/use_legacy_names=false
 materials/location=1
 materials/storage=2
 materials/keep_on_reimport=true

+ 1 - 1
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.tres" type="ArrayMesh" id=10]
+[ext_resource path="res://player/model/MuzzleFlashParticle.mesh" type="ArrayMesh" id=10]
 [ext_resource path="res://player/bullet/effect/FlarePolar.png" type="Texture" id=11]
 
 [sub_resource type="ParticlesMaterial" id=1]

Some files were not shown because too many files changed in this diff