Moved the materials to a new folder.

This commit is contained in:
Relintai 2022-02-12 18:46:03 +01:00
parent e9b0e5629c
commit 73e37907e6
25 changed files with 15 additions and 17 deletions

View File

@ -2,8 +2,6 @@
[ext_resource path="res://modules/core/shaders/6_standard_shader_notex.tres" type="Shader" id=1]
[resource]
shader = ExtResource( 1 )
shader_param/albedo = Color( 1, 1, 1, 1 )

View File

@ -1,8 +1,8 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://models/weapons/cethiels_weapons_3d/props/TestOnehander.tres" type="PropData" id=1]
[ext_resource path="res://modules/core/materials/8_standard_material_prop_notex.tres" type="Material" id=2]
[ext_resource path="res://modules/core/materials/6_standard_material_prop_nouv2.tres" type="Material" id=3]
[ext_resource path="res://materials/8_standard_material_prop_notex.tres" type="Material" id=2]
[ext_resource path="res://materials/6_standard_material_prop_nouv2.tres" type="Material" id=3]
[node name="PropInstanceMerger" type="PropInstanceMerger"]
transform = Transform( 0.0566189, -0.496784, 0, 0.386499, 0.0440496, 0.314131, -0.31211, -0.0355715, 0.389001, 0, 0, 0 )

View File

@ -1,8 +1,8 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://models/weapons/cethiels_weapons_3d/props/TestOnehander2.tres" type="PropData" id=1]
[ext_resource path="res://modules/core/materials/8_standard_material_prop_notex.tres" type="Material" id=2]
[ext_resource path="res://modules/core/materials/6_standard_material_prop_nouv2.tres" type="Material" id=3]
[ext_resource path="res://materials/8_standard_material_prop_notex.tres" type="Material" id=2]
[ext_resource path="res://materials/6_standard_material_prop_nouv2.tres" type="Material" id=3]
[node name="PropInstanceMerger" type="PropInstanceMerger"]
transform = Transform( 0.0566189, -0.496784, 0, 0.386499, 0.0440496, 0.314131, -0.31211, -0.0355715, 0.389001, 0, 0, 0 )

View File

@ -1,8 +1,8 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://models/weapons/cethiels_weapons_3d/props/test_shield.tres" type="PropData" id=1]
[ext_resource path="res://modules/core/materials/8_standard_material_prop_notex.tres" type="Material" id=2]
[ext_resource path="res://modules/core/materials/6_standard_material_prop_nouv2.tres" type="Material" id=3]
[ext_resource path="res://materials/8_standard_material_prop_notex.tres" type="Material" id=2]
[ext_resource path="res://materials/6_standard_material_prop_nouv2.tres" type="Material" id=3]
[node name="PropInstanceMerger" type="PropInstanceMerger"]
transform = Transform( -0.430642, 0.00290663, 0.130534, -0.130445, 0.00984939, -0.430566, -0.00563817, -0.449883, -0.00858312, 0, 0, 0 )

View File

@ -2,7 +2,7 @@
[ext_resource path="res://modules/entity_classes/naturalist/spell_effects/textures/arrows.png" type="Texture" id=1]
[ext_resource path="res://modules/core/shaders/3_simple_y_billboard.shader" type="Shader" id=2]
[ext_resource path="res://modules/core/materials/2_simple_particle_billboard.tres" type="Material" id=3]
[ext_resource path="res://materials/2_simple_particle_billboard.tres" type="Material" id=3]

View File

@ -369,7 +369,7 @@ enums/skeletons_bones=PoolStringArray( "", "root,pelvis,spine,spine_1,spine_2,ne
enums/skeletons_bone_attachment_points=PoolStringArray( "", "left_hand,right_hand,torso,root,right_hip,left_hip,spine_2,weapon_left,weapon_right,weapon_left_back,weapon_right_back,weapon_shield_left" )
xp/character_xps=PoolIntArray( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 )
material_cache/texture_flags=1
material_cache/material_paths=PoolStringArray( "res://modules/core/materials/3_standard_character_material.tres", "res://modules/core/materials/3_standard_character_material.tres", "res://modules/core/materials/9_standard_character_material_notex.tres" )
material_cache/material_paths=PoolStringArray( "res://materials/3_standard_character_material.tres", "res://materials/3_standard_character_material.tres", "res://materials/9_standard_character_material_notex.tres" )
profiles/automatic_save=true
data/ess_entity_spawner_path="res://player/bs_entity_spawner.tres"
level/max_character_level=60
@ -824,7 +824,7 @@ limits/message_queue/max_size_kb=2048
[props]
texture_flags=1
material_paths=PoolStringArray( "res://modules/core/materials/6_standard_material_prop_nouv2.tres", "res://modules/core/materials/6_standard_material_prop_nouv2.tres", "res://modules/core/materials/8_standard_material_prop_notex.tres" )
material_paths=PoolStringArray( "res://materials/6_standard_material_prop_nouv2.tres", "res://materials/6_standard_material_prop_nouv2.tres", "res://materials/8_standard_material_prop_notex.tres" )
[rendering]

View File

@ -3,8 +3,8 @@
[ext_resource path="res://modules/planets/test_planet/voxel_library/textures/grass_mossy_albedo.png" type="Texture" id=1]
[ext_resource path="res://modules/planets/test_planet/voxel_library/textures/stone_1_albedo.png" type="Texture" id=2]
[ext_resource path="res://modules/planets/test_planet/voxel_library/textures/dirt_albedo.png" type="Texture" id=3]
[ext_resource path="res://modules/core/materials/7_standard_material_notex.tres" type="Material" id=4]
[ext_resource path="res://modules/core/materials/5_standard_material_nouv2.tres" type="Material" id=5]
[ext_resource path="res://materials/7_standard_material_notex.tres" type="Material" id=4]
[ext_resource path="res://materials/5_standard_material_nouv2.tres" type="Material" id=5]
[sub_resource type="TerrainSurfaceMerger" id=1]
texture_top = ExtResource( 1 )

View File

@ -3,10 +3,10 @@
[ext_resource path="res://modules/planets/test_planet/voxel_library/textures/grass_mossy_albedo.png" type="Texture" id=1]
[ext_resource path="res://modules/planets/test_planet/voxel_library/textures/stone_1_albedo.png" type="Texture" id=2]
[ext_resource path="res://modules/planets/test_planet/voxel_library/textures/dirt_albedo.png" type="Texture" id=3]
[ext_resource path="res://modules/core/materials/7_standard_material_notex.tres" type="Material" id=4]
[ext_resource path="res://modules/core/materials/5_standard_material_nouv2.tres" type="Material" id=5]
[ext_resource path="res://modules/core/materials/6_standard_material_prop_nouv2.tres" type="Material" id=6]
[ext_resource path="res://modules/core/materials/8_standard_material_prop_notex.tres" type="Material" id=7]
[ext_resource path="res://materials/7_standard_material_notex.tres" type="Material" id=4]
[ext_resource path="res://materials/5_standard_material_nouv2.tres" type="Material" id=5]
[ext_resource path="res://materials/6_standard_material_prop_nouv2.tres" type="Material" id=6]
[ext_resource path="res://materials/8_standard_material_prop_notex.tres" type="Material" id=7]
[sub_resource type="TerrainSurfaceMerger" id=1]
texture_top = ExtResource( 1 )