Relintai/broken_seals
1
0
Fork 0
mirror of https://github.com/Relintai/broken_seals.git synced 2025-02-12 03:00:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Moved materials into the core module aswell.

Browse Source
This commit is contained in:
Relintai 2020-04-26 13:26:02 +02:00
parent 7723a03def
commit 37acb59dba
22 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
game/data/materials/1_standard_material.tres → game/data/core/materials/1_standard_material.tres
View File

File diff suppressed because one or more lines are too long

0
game/data/materials/2_simple_particle_billboard.tres → game/data/core/materials/2_simple_particle_billboard.tres
View File

0
game/data/materials/3_standard_character_material.tres → game/data/core/materials/3_standard_character_material.tres
View File

0
game/data/materials/4_standard_material_prop.tres → game/data/core/materials/4_standard_material_prop.tres
View File

4
game/data/materials/5_standard_material_nouv2.tres → game/data/core/materials/5_standard_material_nouv2.tres
View File

File diff suppressed because one or more lines are too long

0
game/data/materials/6_standard_material_prop_nouv2.tres → game/data/core/materials/6_standard_material_prop_nouv2.tres
View File

0
game/data/materials/7_standard_material_notex.tres → game/data/core/materials/7_standard_material_notex.tres
View File

0
game/data/materials/8_standard_material_prop_notex.tres → game/data/core/materials/8_standard_material_prop_notex.tres
View File

0
game/data/materials/9_standard_character_material_notex.tres → game/data/core/materials/9_standard_character_material_notex.tres
View File

0
game/data/materials/character_mat..tres → game/data/core/materials/character_mat..tres
View File

0
game/data/materials/character_mat.tres_off → game/data/core/materials/character_mat.tres_off
View File

0
game/data/materials/spatial_voxelman_mat.tres → game/data/core/materials/spatial_voxelman_mat.tres
View File

0
game/data/materials/voxelman.tres → game/data/core/materials/voxelman.tres
View File

0
game/data/materials/voxelman.tres_off → game/data/core/materials/voxelman.tres_off
View File

0
game/data/materials/voxelman2.tres → game/data/core/materials/voxelman2.tres
View File

0
game/data/materials/voxelman_shader.tres_off → game/data/core/materials/voxelman_shader.tres_off
View File

0
game/data/materials/world_material.tres → game/data/core/materials/world_material.tres
View File

3
game/data/entity_classes/naturalist/spell_effects/nature/NautreSwiftness.tscn
View File

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

7
game/data/planets/test_planet/voxel_library/1_main_lib_merger_empty.tres
View File

@ -1,12 +1,13 @@
[gd_resource type="VoxelmanLibraryMerger" load_steps=8 format=2]
[ext_resource path="res://data/materials/1_standard_material.tres" type="Material" id=1]
[ext_resource path="res://data/core/materials/1_standard_material.tres" type="Material" id=1]
[ext_resource path="res://data/planets/test_planet/voxel_library/surfaces/4_dungeon_stone.tres" type="VoxelSurfaceMerger" id=2]
[ext_resource path="res://data/planets/test_planet/voxel_library/surfaces/2_test.tres" type="VoxelSurfaceMerger" id=3]
[ext_resource path="res://data/planets/test_planet/voxel_library/surfaces/1_stone.tres" type="VoxelSurfaceMerger" id=4]
[ext_resource path="res://data/planets/test_planet/voxel_library/surfaces/3_test2.tres" type="VoxelSurfaceMerger" id=5]
[ext_resource path="res://data/materials/5_standard_material_nouv2.tres" type="Material" id=8]
[ext_resource path="res://data/materials/7_standard_material_notex.tres" type="Material" id=10]
[ext_resource path="res://data/core/materials/5_standard_material_nouv2.tres" type="Material" id=8]
[ext_resource path="res://data/core/materials/7_standard_material_notex.tres" type="Material" id=10]

5
game/data/species/Human/models/armature_model_orig_v2.tscn
View File

@ -2,15 +2,16 @@
[ext_resource path="res://data/core/item_visuals/test_base_v3.tres" type="ItemVisual" id=1]
[ext_resource path="res://player/CharacterSkeletonAttachPoint.gd" type="Script" id=2]
[ext_resource path="res://data/materials/3_standard_character_material.tres" type="Material" id=3]
[ext_resource path="res://data/core/materials/3_standard_character_material.tres" type="Material" id=3]
[ext_resource path="res://test_weapons/shield_d.mesh" type="ArrayMesh" id=4]
[ext_resource path="res://test_weapons/sword_i.mesh" type="ArrayMesh" id=5]
[ext_resource path="res://data/species/Human/models/armature.dae" type="PackedScene" id=6]
[ext_resource path="res://data/materials/9_standard_character_material_notex.tres" type="Material" id=7]
[ext_resource path="res://data/core/materials/9_standard_character_material_notex.tres" type="Material" id=7]
[ext_resource path="res://player/CharacterSkeletonGD.gd" type="Script" id=8]
[sub_resource type="Skin" id=1]
bind_count = 31
bind/0/name = ""

3
game/voxelman/TestScene.tscn
View File

@ -1,7 +1,7 @@
[gd_scene load_steps=16 format=2]
[ext_resource path="res://voxelman/debug/FreeLookCam.tscn" type="PackedScene" id=1]
[ext_resource path="res://data/materials/voxelman.tres" type="Material" id=2]
[ext_resource path="res://data/core/materials/voxelman.tres" type="Material" id=2]
[ext_resource path="res://voxelman/FPSCounter.gd" type="Script" id=3]
[ext_resource path="res://voxelman/cubic_mesher/CubicVoxelWorld.tscn" type="PackedScene" id=4]
[ext_resource path="res://data/planets/test_planet/voxel_library/textures/grass_mossy_albedo.png" type="Texture" id=5]
@ -12,6 +12,7 @@
[sub_resource type="Environment" id=1]
ambient_light_color = Color( 1, 1, 1, 1 )

3
game/voxelman/world/TVTestScene.tscn
View File

@ -1,7 +1,7 @@
[gd_scene load_steps=18 format=2]
[ext_resource path="res://voxelman/world/TVVoxelWorld.tscn" type="PackedScene" id=1]
[ext_resource path="res://data/materials/voxelman.tres" type="Material" id=2]
[ext_resource path="res://data/core/materials/voxelman.tres" type="Material" id=2]
[ext_resource path="res://voxelman/FPSCounter.gd" type="Script" id=3]
[ext_resource path="res://voxelman/debug/FreeLookCam.tscn" type="PackedScene" id=4]
[ext_resource path="res://data/planets/test_planet/voxel_library/textures/grass_mossy_albedo.png" type="Texture" id=5]
@ -17,6 +17,7 @@
[sub_resource type="Environment" id=1]
ambient_light_color = Color( 1, 1, 1, 1 )